Added T-REX support to noptilus aux CPUs.

.gitignore

@@ -10,3 +10,4 @@
 /lauv-aux-rpi
 /ntnu-b2xx
 /stamp9g20
+/lctr-rpi

functions.bash

@@ -1,6 +1,6 @@
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

mkconfig.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

mkdisk.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

mkpackage.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

mksystem.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2013 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

pkrootfs.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

pktoolchain.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2014 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

rules/base/host.bash

@@ -26,5 +26,4 @@ requires=\
     'parted/host'
     'dosfstools/host'
     'e2fsprogs/host'
-    'cmake/host'
 )

rules/escc/default.bash

@@ -1,6 +1,6 @@
 version=\
 (
-    '1.0.6'
+    '1.0.7'
 )
 
 url=\
@@ -10,7 +10,7 @@ url=\
 
 md5=\
 (
-    '07783e66e27601ab0a8250c328b3d6bf'
+    '4e18a516249256e2dad4d79ae56c913d'
 )
 
 if [ -d "$cfg_dir_builds/linux/linux-"* ]; then

rules/htop/default.bash

@@ -0,0 +1,37 @@
+version=\
+(
+    '2.0.2'
+)
+
+url=\
+(
+    "https://hisham.hm/htop/releases/$version/htop-$version.tar.gz"
+)
+
+md5=\
+(
+    '7d354d904bad591a931ad57e99fea84a'
+)
+
+maintainer=\
+(
+    'Jose Pinto <zepinto@lsts.pt>'
+)
+
+build()
+{
+    $cmd_make
+}
+
+configure()
+{
+    cd "../htop-$version"
+    ./configure --disable-unicode --prefix="${cfg_dir_rootfs}"
+}
+
+target_install()
+{
+    cd "../htop-$version"
+    $cmd_make install
+}
+

rules/linux/rpi.bash

@@ -2,19 +2,21 @@
 
 version=\
 (
-    '4.4_2017-01-27'
+    '3.18_2015-06-03'
 )
 
 url=\
 (
-    "http://lsts.pt/glued/rpi-linux-$version.zip"
+    "https://github.com/rasmartins/rpi-linux/archive/rpi-linux-$version.tar.gz"
 )
 
 md5=\
 (
-    'f31d48a9d2c93509b35e750be489b44c'
+    '0b0255e50ca358b619bb78653ac2db2e'
 )
 
-build_dir="rpi-linux-rpi-linux-$version"
+post_unpack()
-
+{
-find_patches
+    rmdir "../linux-$version" &&
+        mv "../rpi-linux-rpi-linux-$version" "../linux-$version"
+}

rules/raspicam/default.bash

@@ -1,54 +0,0 @@
-version=\
-(
-    "1.0.0"
-)
-
-url=\
-(
-    "http://lsts.pt/glued/raspicam-$version.zip"
-)
-
-md5=\
-(
-  "169e62fd17d41455a42711a2f9c54fd1"
-)
-
-maintainer=\
-(
-    'Pedro Gonçalves <pedro@lsts.pt>'
-)
-
-configure()
-{
-    LINKER_ADDED_FLAGS="-Wl,-rpath,${cfg_dir_rootfs}/usr/lib"
-
-    ${cfg_dir_toolchain}/usr/local/bin/cmake \
-        -DCMAKE_SYSTEM_NAME="Linux" \
-        -DCMAKE_SYSTEM_VERSION="1" \
-        -DCMAKE_FIND_ROOT_PATH="${cfg_dir_toolchain_sysroot}/usr ${cfg_dir_rootfs}/usr" \
-        -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY \
-        -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY \
-        -DCMAKE_C_COMPILER="${cmd_target_cc}" \
-        -DCMAKE_CXX_COMPILER="${cmd_target_cxx}" \
-        -DCMAKE_C_FLAGS="${cfg_target_gcc_flags}" \
-	.
-}
-
-build()
-{
-    $cmd_make VERBOSE=1
-}
-
-host_install()
-{
-    cd build/
-    $cmd_cp -r "lib/"* "$cfg_dir_toolchain_sysroot/usr/lib/"
-    $cmd_cp -r "inc/"* "$cfg_dir_toolchain_sysroot/usr/include/"
-}
-
-target_install()
-{
-    cd build/
-    $cmd_cp -r "lib/"* "$cfg_dir_rootfs/usr/lib/"
-    $cmd_cp -r "bin/"* "$cfg_dir_rootfs/usr/bin/"
-}

rules/rpi-boot-firmware/default.bash

@@ -1,29 +1,31 @@
 version=\
 (
-    '2017-02-02'
+    '2015-06-03'
 )
 
 url=\
 (
-    "http://lsts.pt/glued/rpi-boot-firmware-$version.zip"
+    "https://github.com/rasmartins/rpi-boot-firmware/archive/rpi-boot-firmware-$version.tar.gz"
 )
 
 maintainer=\
 (
     'Ricardo Martins <rasm@fe.up.pt>'
-    'Pedro Gonçalves <pedro@lsts.pt>'
 )
 
 md5=\
 (
-    'eb42664fce4d73f167064e697dfacb76'
+    'a80ee36b66cccda4e9ccb7eb26bd6bb8'
 )
 
 target_install()
 {
-    $cmd_mkdir "$cfg_dir_rootfs/boot"
+    $cmd_mkdir \
+        "$cfg_dir_rootfs/boot" &&
 
-    $cmd_cp "../$pkg-$version/"* "$cfg_dir_rootfs/boot/"
+    for f in bootcode.bin fixup.dat start.elf; do
+        $cmd_cp -r "../$pkg-$pkg-$version/$f" "$cfg_dir_rootfs/boot"
+    done &&
 
     tar -C "$pkg_dir/fs" -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
 }

rules/rpi-boot-firmware/fs/boot/cmdline.txt

@@ -1 +1 @@
-dwc_otg.lpm_enable=0 console=tty1 root=/dev/mmcblk0p2 elevator=deadline rootwait quiet
+dwc_otg.lpm_enable=0 console=ttyAMA0,115200,8n1 root=/dev/mmcblk0p2 elevator=deadline rootwait quiet

rules/uv4l/default.bash

@@ -1,45 +0,0 @@
-version=\
-(
-  "1.0.0"
-)
-
-url=\
-(
-  "http://lsts.pt/glued/uv4l.$version.tar.bz2"
-)
-
-md5=\
-(
-  "869e884accbfa9c2356e2fd9307dd71c"
-)
-
-maintainer=\
-(
-    'Pedro Gonçalves <pedro@lsts.pt>'
-)
-
-post_unpack()
-{
-    mv "../etc" "../uv4l-$version/"
-    mv "../usr" "../uv4l-$version/"
-    touch startStreamRaspiCam.sh
-    echo "#!/bin/sh" >> startStreamRaspiCam.sh
-    echo "killall uv4l" >> startStreamRaspiCam.sh
-    echo "modprobe cuse" >> startStreamRaspiCam.sh
-    echo "uv4l -nopreview --auto-video_nr --driver raspicam --encoding h264 --width 1080 --height 720 --framerate 20 --quality 10 --server-option '--port=9090' --server-option '--max-queued-connections=30' --server-option '--max-streams=25' --server-option '--max-threads=29'" >> startStreamRaspiCam.sh
-}
-
-host_install()
-{
-  $cmd_cp -r "usr/lib/"*    "$cfg_dir_toolchain_sysroot/usr/lib/"
-  $cmd_cp -r "usr/include/"* "$cfg_dir_toolchain_sysroot/usr/include/"
-}
-
-target_install()
-{
-    $cmd_cp -r "usr/lib/"* "$cfg_dir_rootfs/usr/lib/"
-    $cmd_cp -r "usr/bin/"* "$cfg_dir_rootfs/usr/bin/"
-    $cmd_cp -r "startStreamRaspiCam.sh" "$cfg_dir_rootfs/usr/bin/"
-}
-
-

systems/lauv-aux-rpi/config

@@ -6,12 +6,13 @@ cfg_services1='lauv-storage-server'
 cfg_services2='dune'
 cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils rpi-boot-firmware linux/rpi'
 cfg_target_linux_kernel='arch/arm/boot/zImage'
+cfg_target_linux_dtb='arch/arm/boot/dts/bcm2709-rpi-2-b.dtb'
 cfg_ptpd_interface='eth0'
 cfg_terminal='ttyAMA0'
 cfg_lauv_storage_dir='/opt/lsts/dune/log'
 cfg_partitions=\
 (
-    rpi-boot BOOT0  512B    32MiB
+    rpi-boot boot0  512B    32MiB
     root     root0  32MiB   544MiB
     data     data0  544MiB  -1
 )

systems/lauv-aux-rpi/fs/boot/config.txt

@@ -1,9 +1 @@
-# Core.
 arm_freq=1000
-
-# Disable BT on Rpi3.
-dtoverlay=pi3-disable-bt
-
-# Enable RasPicam
-start_x=1
-gpu_mem=128

systems/lauv-aux-rpi/lauv-arpao-aux.cfg

@@ -0,0 +1,2 @@
+cfg_hostname='lauv-arpao-aux'
+cfg_eth_ext_ip='10.0.10.63'

systems/lauv-aux-rpi/lauv-aux-rpi-testbed.cfg

@@ -3,4 +3,3 @@ cfg_eth_ext_ip='10.0.200.24'
 cfg_eth_ext_mk='255.255.0.0'
 cfg_eth_ext_gw='10.0.0.1'
 cfg_ptpd_interface='eth0'
-cfg_services1=''

systems/lauv-aux-rpi/test-rpi.cfg

@@ -1,10 +0,0 @@
-cfg_hostname='test-rpi'
-cfg_eth_ext_ip='10.0.10.116'
-cfg_eth_ext_mk='255.255.0.0'
-cfg_eth_ext_gw='10.0.0.1'
-cfg_ptpd_interface='eth0'
-cfg_services1=''
-cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd ntp rpcbind nfs-utils rpi-boot-firmware linux/rpi raspicam libjpeg-turbo v4l-utils uv4l'
-cfg_modules="$cfg_modules ftdi_sio"
-cfg_terminal='tty1'
-

systems/lctr-a6xx/cfg/linux-3.14.63.cfg

@@ -136,7 +136,7 @@ CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_EXPERT=y
 # CONFIG_UID16 is not set
 # CONFIG_SYSCTL_SYSCALL is not set
-# CONFIG_KALLSYMS is not set
+CONFIG_KALLSYMS=y
 CONFIG_PRINTK=y
 CONFIG_BUG=y
 CONFIG_ELF_CORE=y
@@ -1900,7 +1900,7 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 #
 # Compile-time checks and compiler options
 #
-# CONFIG_DEBUG_INFO is not set
+CONFIG_DEBUG_INFO=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=2048

systems/lctr-a6xx/config

@@ -12,5 +12,5 @@ cfg_ptpd_interface='eth0'
 cfg_eth_ext_mk='255.255.0.0'
 cfg_eth_ext_gw='10.0.0.1'
 cfg_eth_prv_ip='192.168.0.1'
-cfg_escc_script='/etc/escc/hg1700.sh'
+cfg_escc_script=''
 cfg_kernel_extra_args='panic=5 quiet'

systems/lctr-a6xx/lauv-arpao.cfg

@@ -0,0 +1,2 @@
+cfg_hostname='lauv-arpao'
+cfg_eth_ext_ip='10.0.10.60'

systems/lctr-a6xx/lauv-xplore-1.cfg

@@ -1,2 +1,3 @@
 cfg_hostname='lauv-xplore-1'
 cfg_eth_ext_ip='10.0.10.120'
+cfg_modules="$cfg_modules ftdi_sio"

systems/lctr-a9xx/x8-00.cfg

@@ -1,2 +0,0 @@
-cfg_hostname='x8-00'
-cfg_eth_ext_ip='10.0.20.95'

systems/lctr-a9xx/x8-02.cfg

@@ -1,3 +1,3 @@
 cfg_hostname='x8-02'
-cfg_eth_ext_ip='10.0.20.105'
+cfg_eth_ext_ip='10.0.20.100'
 cfg_packages='u-boot dropbear rsync busybox linux uswitch ppp iptables socat bridge-utils ntp e2fsprogs i2c-tools iperf dnsmasq libav'

systems/lctr-b2xx/aero-01.cfg

@@ -1,6 +1,6 @@
 cfg_hostname='aero-01'
 cfg_storage='data0:ext4:/opt'
-cfg_eth_ext_ip='10.0.20.120'
+cfg_eth_ext_ip='10.0.20.80'
 cfg_eth_ext_mk='255.255.0.0'
 cfg_eth_ext_gw='10.0.0.1'
 cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libav'

systems/lctr-b2xx/lauv-noptilus-1-aux.cfg

@@ -0,0 +1,7 @@
+cfg_hostname='lauv-noptilus-1-aux'
+cfg_storage='data0:ext4:/opt data1:ext4:/opt/lsts/dune/log'
+cfg_eth_ext_ip='10.0.10.83'
+cfg_eth_ext_mk='255.255.0.0'
+cfg_eth_ext_gw='10.0.0.1'
+cfg_ptpd_interface='eth0'
+cfg_packages="$cfg_packages ptpd rpcbind nfs-utils libantlr3c boost europa"

systems/lctr-b2xx/lauv-noptilus-2-aux.cfg

@@ -0,0 +1,7 @@
+cfg_hostname='lauv-noptilus-2-aux'
+cfg_storage='data0:ext4:/opt data1:ext4:/opt/lsts/dune/log'
+cfg_eth_ext_ip='10.0.10.93'
+cfg_eth_ext_mk='255.255.0.0'
+cfg_eth_ext_gw='10.0.0.1'
+cfg_ptpd_interface='eth0'
+cfg_packages="$cfg_packages ptpd rpcbind nfs-utils libantlr3c boost europa"

systems/lctr-b2xx/lauv-noptilus-3-aux.cfg

@@ -4,3 +4,5 @@ cfg_eth_ext_ip='10.0.10.103'
 cfg_eth_ext_mk='255.255.0.0'
 cfg_eth_ext_gw='10.0.0.1'
 cfg_ptpd_interface='eth0'
+cfg_packages="$cfg_packages ptpd rpcbind nfs-utils libantlr3c boost europa"
+

systems/lctr-b2xx/patches/linux/3.14.63/01-lctr-b2xx-dts.patch

@@ -0,0 +1,31 @@
+diff -Nru linux-3.14.63/arch/arm/boot/dts/am335x-lctr-b2xx.dts linux-3.14.63.mc/arch/arm/boot/dts/am335x-lctr-b2xx.dts
+--- linux-3.14.63/arch/arm/boot/dts/am335x-lctr-b2xx.dts	2017-01-17 14:12:07.019022866 +0000
++++ linux-3.14.63.mc/arch/arm/boot/dts/am335x-lctr-b2xx.dts	2017-01-17 14:26:45.657383756 +0000
+@@ -60,6 +60,16 @@
+ 			0x154 (PIN_OUTPUT_PULLDOWN | MUX_MODE1)
+ 		>;
+ 	};
++
++	/* UART4. */
++	uart4_pins: pinmux_uart4_pins {
++		pinctrl-single,pins = <
++			/* uart4_rxd */
++			0x70 (PIN_INPUT_PULLUP | MUX_MODE6)
++			/* uart4_txd */
++			0x74 (PIN_OUTPUT_PULLDOWN | MUX_MODE6)
++		>;
++	};
+ };
+ 
+ /* Enable UART1. */
+@@ -75,3 +85,10 @@
+ 	pinctrl-0 = <&uart2_pins>;
+ 	status = "okay";
+ };
++
++/* Enable UART4. */
++&uart4 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart4_pins>;
++	status = "okay";
++};

systems/lctr-b2xx/pixhawk-testbed.cfg

@@ -0,0 +1,6 @@
+cfg_hostname='pixhawk-testbed'
+cfg_storage='data0:ext4:/opt'
+cfg_eth_ext_ip='10.0.200.50'
+cfg_eth_ext_mk='255.255.0.0'
+cfg_eth_ext_gw='10.0.0.1'
+cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libav'

systems/lctr-b2xx/x8-06.cfg

@@ -1,6 +1,6 @@
 cfg_hostname='x8-06'
 cfg_storage='data0:ext4:/opt'
-cfg_eth_ext_ip='10.0.20.115'
+cfg_eth_ext_ip='10.0.20.105'
 cfg_eth_ext_mk='255.255.0.0'
 cfg_eth_ext_gw='10.0.0.1'
 cfg_packages='u-boot dropbear rsync busybox e2fsprogs ptpd i2c-tools am33xx-cm3/host linux libav'

systems/lctr-b2xx/x8-07.cfg

@@ -1,4 +1,4 @@
-cfg_hostname='x8-05'
+cfg_hostname='x8-07'
 cfg_storage='data0:ext4:/opt'
 cfg_eth_ext_ip='10.0.20.110'
 cfg_eth_ext_mk='255.255.0.0'

systems/lctr-rpi/config

@@ -0,0 +1,18 @@
+cfg_architecture='cortex-a8-hardfp'
+cfg_storage='data0:ext4:/opt'
+cfg_modules=''
+cfg_services0='network dropbear storage upgrade syslog ptpd'
+cfg_services2='dune'
+cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind rpi-boot-firmware linux/rpi'
+cfg_target_linux_kernel='arch/arm/boot/zImage'
+cfg_target_linux_dtb='arch/arm/boot/dts/bcm2709-rpi-2-b.dtb'
+cfg_ptpd_interface='eth0'
+cfg_eth_ext_mk='255.255.0.0'
+cfg_eth_ext_gw='10.0.0.1'
+cfg_terminal='ttyAMA0'
+cfg_partitions=\
+(
+    rpi-boot boot0  512B    32MiB
+    root     root0  32MiB   544MiB
+    data     data0  544MiB  -1
+)

systems/lctr-rpi/fs/boot/config.txt

@@ -0,0 +1 @@
+arm_freq=1000

systems/lctr-rpi/fs/etc/mdev.conf

@@ -0,0 +1,2 @@
+ttyAMA0         root:root  660  >terminal
+ttyUSB[0-9]*    root:root  660  */sbin/mdev-ttyusb

systems/lctr-rpi/nest-1.cfg

@@ -0,0 +1,4 @@
+cfg_hostname='nest-1'
+cfg_eth_ext_ip='10.0.200.40'
+cfg_packages="$cfg_packages ppp iptables"
+

utils/glued-check-sources.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2015 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #

utils/glued-download-sources.bash

@@ -1,7 +1,7 @@
 #! /bin/bash
 ###########################################################################
 # GLUED: GNU/Linux Uniform Environment Distribution                       #
-# Copyright (C) 2007-2013 Universidade do Porto - Faculdade de Engenharia #
+# Copyright (C) 2007-2017 Universidade do Porto - Faculdade de Engenharia #
 # Laboratório de Sistemas e Tecnologia Subaquática (LSTS)                 #
 ###########################################################################
 # This program is free software; you can redistribute it and/or modify    #