Merge branch 'master' into feature/aries
This commit is contained in:
commit
c59222722e
@ -46,3 +46,4 @@ RUN apt-get install -y nasm
|
|||||||
RUN apt-get install -y build-essential
|
RUN apt-get install -y build-essential
|
||||||
RUN apt-get install -y make
|
RUN apt-get install -y make
|
||||||
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5
|
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-5 60 --slave /usr/bin/g++ g++ /usr/bin/g++-5
|
||||||
|
RUN apt-get install -y kmod
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
###########################################################################
|
###########################################################################
|
||||||
|
|
||||||
# Config: GLUED version.
|
# Config: GLUED version.
|
||||||
cfg_glued_version='2016.05'
|
cfg_glued_version='2017.11'
|
||||||
# Config: GLUED vendor.
|
# Config: GLUED vendor.
|
||||||
cfg_glued_vendor='lsts'
|
cfg_glued_vendor='lsts'
|
||||||
|
|
||||||
|
@ -72,7 +72,7 @@ download()
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# First try LSTS mirror.
|
# First try LSTS mirror.
|
||||||
lsts_url="http://lsts.pt/glued/$(basename $u)"
|
lsts_url="https://lsts.pt/glued/$(basename $u)"
|
||||||
download_tool "$lsts_url" "$cfg_dir_downloads/$file"
|
download_tool "$lsts_url" "$cfg_dir_downloads/$file"
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
# Then try OceanScan-MST mirror.
|
# Then try OceanScan-MST mirror.
|
||||||
|
@ -128,14 +128,12 @@ build()
|
|||||||
$cmd_make \
|
$cmd_make \
|
||||||
CROSS_COMPILE=$cfg_target_canonical- \
|
CROSS_COMPILE=$cfg_target_canonical- \
|
||||||
ARCH=$cfg_target_linux \
|
ARCH=$cfg_target_linux \
|
||||||
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
|
|
||||||
modules || return 1
|
modules || return 1
|
||||||
|
|
||||||
if [ "$(basename $cfg_target_linux_kernel)" = 'uImage' ]; then
|
if [ "$(basename $cfg_target_linux_kernel)" = 'uImage' ]; then
|
||||||
$cmd_make \
|
$cmd_make \
|
||||||
CROSS_COMPILE=$cfg_target_canonical- \
|
CROSS_COMPILE=$cfg_target_canonical- \
|
||||||
ARCH=$cfg_target_linux \
|
ARCH=$cfg_target_linux \
|
||||||
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
|
|
||||||
uImage || return 1
|
uImage || return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -144,7 +142,6 @@ build()
|
|||||||
$cmd_make \
|
$cmd_make \
|
||||||
CROSS_COMPILE=$cfg_target_canonical- \
|
CROSS_COMPILE=$cfg_target_canonical- \
|
||||||
ARCH=$cfg_target_linux \
|
ARCH=$cfg_target_linux \
|
||||||
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
|
|
||||||
zImage || return 1
|
zImage || return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -153,7 +150,6 @@ build()
|
|||||||
$cmd_make \
|
$cmd_make \
|
||||||
CROSS_COMPILE=$cfg_target_canonical- \
|
CROSS_COMPILE=$cfg_target_canonical- \
|
||||||
ARCH=$cfg_target_linux \
|
ARCH=$cfg_target_linux \
|
||||||
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
|
|
||||||
dtbs || return 1
|
dtbs || return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -198,7 +194,6 @@ target_install()
|
|||||||
ARCH="$cfg_target_linux" \
|
ARCH="$cfg_target_linux" \
|
||||||
INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
|
INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
|
||||||
KBUILD_VERBOSE=1 \
|
KBUILD_VERBOSE=1 \
|
||||||
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
|
|
||||||
modules_install
|
modules_install
|
||||||
|
|
||||||
$cmd_make \
|
$cmd_make \
|
||||||
@ -206,6 +201,5 @@ target_install()
|
|||||||
ARCH="$cfg_target_linux" \
|
ARCH="$cfg_target_linux" \
|
||||||
INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
|
INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
|
||||||
KBUILD_VERBOSE=1 \
|
KBUILD_VERBOSE=1 \
|
||||||
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
|
|
||||||
firmware_install
|
firmware_install
|
||||||
}
|
}
|
||||||
|
@ -129,14 +129,12 @@ build()
|
|||||||
$cmd_make \
|
$cmd_make \
|
||||||
CROSS_COMPILE=$cfg_target_canonical- \
|
CROSS_COMPILE=$cfg_target_canonical- \
|
||||||
ARCH=$cfg_target_linux \
|
ARCH=$cfg_target_linux \
|
||||||
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
|
|
||||||
modules || return 1
|
modules || return 1
|
||||||
|
|
||||||
if [ "$(basename $cfg_target_linux_kernel)" = 'uImage' ]; then
|
if [ "$(basename $cfg_target_linux_kernel)" = 'uImage' ]; then
|
||||||
$cmd_make \
|
$cmd_make \
|
||||||
CROSS_COMPILE=$cfg_target_canonical- \
|
CROSS_COMPILE=$cfg_target_canonical- \
|
||||||
ARCH=$cfg_target_linux \
|
ARCH=$cfg_target_linux \
|
||||||
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
|
|
||||||
uImage || return 1
|
uImage || return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -145,7 +143,6 @@ build()
|
|||||||
$cmd_make \
|
$cmd_make \
|
||||||
CROSS_COMPILE=$cfg_target_canonical- \
|
CROSS_COMPILE=$cfg_target_canonical- \
|
||||||
ARCH=$cfg_target_linux \
|
ARCH=$cfg_target_linux \
|
||||||
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
|
|
||||||
zImage || return 1
|
zImage || return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -154,7 +151,6 @@ build()
|
|||||||
$cmd_make \
|
$cmd_make \
|
||||||
CROSS_COMPILE=$cfg_target_canonical- \
|
CROSS_COMPILE=$cfg_target_canonical- \
|
||||||
ARCH=$cfg_target_linux \
|
ARCH=$cfg_target_linux \
|
||||||
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
|
|
||||||
dtbs || return 1
|
dtbs || return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -199,7 +195,6 @@ target_install()
|
|||||||
ARCH="$cfg_target_linux" \
|
ARCH="$cfg_target_linux" \
|
||||||
INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
|
INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
|
||||||
KBUILD_VERBOSE=1 \
|
KBUILD_VERBOSE=1 \
|
||||||
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
|
|
||||||
modules_install
|
modules_install
|
||||||
|
|
||||||
$cmd_make \
|
$cmd_make \
|
||||||
@ -207,6 +202,5 @@ target_install()
|
|||||||
ARCH="$cfg_target_linux" \
|
ARCH="$cfg_target_linux" \
|
||||||
INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
|
INSTALL_MOD_PATH="$cfg_dir_rootfs/usr" \
|
||||||
KBUILD_VERBOSE=1 \
|
KBUILD_VERBOSE=1 \
|
||||||
DEPMOD="$cfg_dir_toolchain/sbin/depmod" \
|
|
||||||
firmware_install
|
firmware_install
|
||||||
}
|
}
|
||||||
|
@ -10,7 +10,13 @@ url=\
|
|||||||
|
|
||||||
md5=\
|
md5=\
|
||||||
(
|
(
|
||||||
"beb0f3b8be474868b074dca66ced5b48"
|
"d71e2f282372a5cb1021d9e457a3d53f"
|
||||||
|
)
|
||||||
|
|
||||||
|
requires=\
|
||||||
|
(
|
||||||
|
'bison/host'
|
||||||
|
'flex/host'
|
||||||
)
|
)
|
||||||
|
|
||||||
configure()
|
configure()
|
||||||
@ -20,7 +26,10 @@ configure()
|
|||||||
|
|
||||||
build()
|
build()
|
||||||
{
|
{
|
||||||
$cmd_make
|
$cmd_make \
|
||||||
|
BISON="$cfg_dir_toolchain/bin/bison" \
|
||||||
|
FLEX="$cfg_dir_toolchain/bin/flex"
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
target_install()
|
target_install()
|
||||||
|
32
rules/memtest86+/default.bash
Normal file
32
rules/memtest86+/default.bash
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
version=\
|
||||||
|
(
|
||||||
|
"5.01"
|
||||||
|
)
|
||||||
|
|
||||||
|
url=\
|
||||||
|
(
|
||||||
|
"http://www.lsts.pt/glued/memtest86+-$version.tar.gz"
|
||||||
|
)
|
||||||
|
|
||||||
|
md5=\
|
||||||
|
(
|
||||||
|
"035b85f2edabc9b4a6b0cf6c9c3acf50"
|
||||||
|
)
|
||||||
|
|
||||||
|
maintainer=\
|
||||||
|
(
|
||||||
|
'Tiago Sá Marques <tsmarques@fe.up.pt>'
|
||||||
|
)
|
||||||
|
|
||||||
|
build()
|
||||||
|
{
|
||||||
|
$cmd_make \
|
||||||
|
CC=$cmd_target_cc \
|
||||||
|
CXX=$cmd_target_cxx
|
||||||
|
}
|
||||||
|
|
||||||
|
target_install()
|
||||||
|
{
|
||||||
|
$cmd_cp ./memtest.bin $cfg_dir_rootfs/boot/
|
||||||
|
tar -C "$pkg_dir/fs" --exclude .svn -c -f - . | tar -C "$cfg_dir_rootfs" -x -v -f -
|
||||||
|
}
|
14
rules/memtest86+/fs/usr/bin/start-memtest
Normal file
14
rules/memtest86+/fs/usr/bin/start-memtest
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
#! /bin/sh
|
||||||
|
|
||||||
|
echo "Starting memtest in 10 seconds (requires reboot), Ctrl-C to cancel..."
|
||||||
|
for r in 0 1 2 3 4 5 6 7 8 9; do
|
||||||
|
printf "."
|
||||||
|
sleep 1
|
||||||
|
done
|
||||||
|
|
||||||
|
mount -o remount,rw /
|
||||||
|
extlinux -o "memtest" /boot/extlinux/
|
||||||
|
mount -o remount,ro /
|
||||||
|
|
||||||
|
echo "* Rebooting now"
|
||||||
|
reboot
|
@ -1,3 +1,6 @@
|
|||||||
LABEL linux
|
LABEL linux
|
||||||
KERNEL /boot/kernel
|
KERNEL /boot/kernel
|
||||||
APPEND rootwait root=$cfg_kernel_boot_dev rootfstype=ext2 ro $cfg_kernel_extra_args
|
APPEND rootwait root=$cfg_kernel_boot_dev rootfstype=ext2 ro $cfg_kernel_extra_args
|
||||||
|
|
||||||
|
LABEL memtest
|
||||||
|
LINUX /boot/memtest.bin
|
10
systems/lauv-aux-rpi/lauv-xplore-3-aux.cfg
Normal file
10
systems/lauv-aux-rpi/lauv-xplore-3-aux.cfg
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
cfg_hostname='lauv-xplore-3-aux'
|
||||||
|
cfg_eth_ext_ip='10.0.10.143'
|
||||||
|
cfg_eth_ext_mk='255.255.0.0'
|
||||||
|
cfg_eth_ext_gw='10.0.0.1'
|
||||||
|
cfg_ptpd_interface='eth0'
|
||||||
|
cfg_services0='network dropbear storage upgrade syslog ptpd'
|
||||||
|
cfg_services1=''
|
||||||
|
cfg_services2='trex'
|
||||||
|
cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils rpi-boot-firmware linux/rpi libantlr3c boost europa'
|
||||||
|
|
10
systems/lauv-aux-rpi/lauv-xplore-4-aux.cfg
Normal file
10
systems/lauv-aux-rpi/lauv-xplore-4-aux.cfg
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
cfg_hostname='lauv-xplore-4-aux'
|
||||||
|
cfg_eth_ext_ip='10.0.10.153'
|
||||||
|
cfg_eth_ext_mk='255.255.0.0'
|
||||||
|
cfg_eth_ext_gw='10.0.0.1'
|
||||||
|
cfg_ptpd_interface='eth0'
|
||||||
|
cfg_services0='network dropbear storage upgrade syslog ptpd'
|
||||||
|
cfg_services1=''
|
||||||
|
cfg_services2='trex'
|
||||||
|
cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils rpi-boot-firmware linux/rpi libantlr3c boost europa'
|
||||||
|
|
10
systems/lauv-aux-rpi/lauv-xplore-5-aux.cfg
Normal file
10
systems/lauv-aux-rpi/lauv-xplore-5-aux.cfg
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
cfg_hostname='lauv-xplore-5-aux'
|
||||||
|
cfg_eth_ext_ip='10.0.10.163'
|
||||||
|
cfg_eth_ext_mk='255.255.0.0'
|
||||||
|
cfg_eth_ext_gw='10.0.0.1'
|
||||||
|
cfg_ptpd_interface='eth0'
|
||||||
|
cfg_services0='network dropbear storage upgrade syslog ptpd'
|
||||||
|
cfg_services1=''
|
||||||
|
cfg_services2='trex'
|
||||||
|
cfg_packages='dropbear rsync busybox e2fsprogs dosfstools ptpd rpcbind nfs-utils rpi-boot-firmware linux/rpi libantlr3c boost europa'
|
||||||
|
|
@ -1182,7 +1182,7 @@ CONFIG_SCx200_ACB=y
|
|||||||
# PPS support
|
# PPS support
|
||||||
#
|
#
|
||||||
CONFIG_PPS=y
|
CONFIG_PPS=y
|
||||||
CONFIG_PPS_DEBUG=y
|
# CONFIG_PPS_DEBUG is not set
|
||||||
CONFIG_NTP_PPS=y
|
CONFIG_NTP_PPS=y
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -2030,8 +2030,6 @@ CONFIG_NLS_UTF8=y
|
|||||||
# Kernel hacking
|
# Kernel hacking
|
||||||
#
|
#
|
||||||
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
|
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
|
||||||
CONFIG_HAVE_KVM_IRQFD=y
|
|
||||||
CONFIG_VFIO_VIRQFD=y
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# printk and dmesg options
|
# printk and dmesg options
|
||||||
|
@ -4,7 +4,7 @@ cfg_services0='dropbear network storage upgrade syslog escc ptpd setserial'
|
|||||||
cfg_services1=''
|
cfg_services1=''
|
||||||
cfg_services2='dune'
|
cfg_services2='dune'
|
||||||
cfg_modules=''
|
cfg_modules=''
|
||||||
cfg_packages='coreboot-lsts emm-8p-xt-eeprom zlib dropbear rsync busybox flashrom e2fsprogs socat linux escc syslinux syslinux/host ptpd ntp uswitch pciutils bzip2'
|
cfg_packages='coreboot-lsts emm-8p-xt-eeprom zlib dropbear rsync busybox flashrom e2fsprogs socat linux escc syslinux syslinux/host ptpd ntp uswitch pciutils bzip2 memtest86+'
|
||||||
cfg_terminal='ttyS0'
|
cfg_terminal='ttyS0'
|
||||||
cfg_target_linux_kernel='arch/x86/boot/bzImage'
|
cfg_target_linux_kernel='arch/x86/boot/bzImage'
|
||||||
cfg_ptpd_master='true'
|
cfg_ptpd_master='true'
|
||||||
|
2
systems/lctr-a6xx/lauv-xplore-3.cfg
Normal file
2
systems/lctr-a6xx/lauv-xplore-3.cfg
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
cfg_hostname='lauv-xplore-3'
|
||||||
|
cfg_eth_ext_ip='10.0.10.140'
|
2
systems/lctr-a6xx/lauv-xplore-4.cfg
Normal file
2
systems/lctr-a6xx/lauv-xplore-4.cfg
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
cfg_hostname='lauv-xplore-4'
|
||||||
|
cfg_eth_ext_ip='10.0.10.150'
|
2
systems/lctr-a6xx/lauv-xplore-5.cfg
Normal file
2
systems/lctr-a6xx/lauv-xplore-5.cfg
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
cfg_hostname='lauv-xplore-5'
|
||||||
|
cfg_eth_ext_ip='10.0.10.160'
|
@ -1,14 +1,13 @@
|
|||||||
diff -Nru linux-3.13.1/arch/arm/boot/dts/Makefile linux-3.13.1.rasm/arch/arm/boot/dts/Makefile
|
--- linux-4.4.66/arch/arm/boot/dts/Makefile 2017-09-25 13:07:10.353013618 +0100
|
||||||
--- linux-3.13.1/arch/arm/boot/dts/Makefile 2014-01-29 13:06:37.000000000 +0000
|
+++ linux-4.4.66.tsm/arch/arm/boot/dts/Makefile 2017-09-25 13:11:13.523693878 +0100
|
||||||
+++ linux-3.13.1.rasm/arch/arm/boot/dts/Makefile 2014-02-01 06:53:43.968486026 +0000
|
@@ -463,6 +463,7 @@
|
||||||
@@ -198,6 +198,7 @@
|
am335x-evm.dtb \
|
||||||
am335x-evmsk.dtb \
|
am335x-evmsk.dtb \
|
||||||
am335x-bone.dtb \
|
|
||||||
am335x-boneblack.dtb \
|
|
||||||
+ am335x-lctr-b2xx.dtb \
|
|
||||||
am335x-nano.dtb \
|
am335x-nano.dtb \
|
||||||
am335x-base0033.dtb \
|
+ am335x-lctr-b2xx.dtb \
|
||||||
am3517-evm.dtb \
|
am335x-pepper.dtb \
|
||||||
|
am335x-lxm.dtb \
|
||||||
|
am335x-chiliboard.dtb \
|
||||||
diff -Nru linux-3.13.1/arch/arm/boot/dts/am335x-lctr-b2xx.dts linux-3.13.1.rasm/arch/arm/boot/dts/am335x-lctr-b2xx.dts
|
diff -Nru linux-3.13.1/arch/arm/boot/dts/am335x-lctr-b2xx.dts linux-3.13.1.rasm/arch/arm/boot/dts/am335x-lctr-b2xx.dts
|
||||||
--- linux-3.13.1/arch/arm/boot/dts/am335x-lctr-b2xx.dts 1970-01-01 01:00:00.000000000 +0100
|
--- linux-3.13.1/arch/arm/boot/dts/am335x-lctr-b2xx.dts 1970-01-01 01:00:00.000000000 +0100
|
||||||
+++ linux-3.13.1.rasm/arch/arm/boot/dts/am335x-lctr-b2xx.dts 2014-02-01 06:51:48.273816483 +0000
|
+++ linux-3.13.1.rasm/arch/arm/boot/dts/am335x-lctr-b2xx.dts 2014-02-01 06:51:48.273816483 +0000
|
Reference in New Issue
Block a user