libre-testing/uboot4extlinux-*: new versions and configs

also patch old u-boot tarballs to build with gcc7

4 files changed, 462 insertions, 0 deletions

diff --git a/libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch b/libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
new file mode 100644
index 000000000..17f067484
--- /dev/null
+++ b/libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
@@ -0,0 +1,50 @@
+diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
+index 94275a7..ed1aac6 100644
+--- a/include/configs/sunxi-common.h
++++ b/include/configs/sunxi-common.h
+@@ -467,6 +467,9 @@ extern int soft_i2c_gpio_scl;
+ #define BOOTENV_DEV_NAME_FEL(devtypeu, devtypel, instance) \
+ 	"fel "
+ 
++/* Enable Extlinux boot support */
++#define CONFIG_CMD_PXE
++#define CONFIG_MENU
+ #define BOOT_TARGET_DEVICES(func) \
+ 	func(FEL, fel, na) \
+ 	BOOT_TARGET_DEVICES_MMC(func) \
+@@ -475,6 +478,7 @@ extern int soft_i2c_gpio_scl;
+ 	BOOT_TARGET_DEVICES_USB(func) \
+ 	func(PXE, pxe, na) \
+ 	func(DHCP, dhcp, na)
++#include <config_distro_bootcmd.h>
+ 
+ #ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT
+ #define BOOTCMD_SUNXI_COMPAT \
+@@ -492,8 +496,6 @@ extern int soft_i2c_gpio_scl;
+ #define BOOTCMD_SUNXI_COMPAT
+ #endif
+ 
+-#include <config_distro_bootcmd.h>
+-
+ #ifdef CONFIG_USB_KEYBOARD
+ #define CONSOLE_STDIN_SETTINGS \
+ 	"preboot=usb start\0" \
+@@ -518,13 +520,13 @@ extern int soft_i2c_gpio_scl;
+ 	CONSOLE_STDOUT_SETTINGS
+ 
+ #define CONFIG_EXTRA_ENV_SETTINGS \
++	BOOTENV \
+ 	CONSOLE_ENV_SETTINGS \
+ 	MEM_LAYOUT_ENV_SETTINGS \
+ 	DFU_ALT_INFO_RAM \
+ 	"fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
+ 	"console=ttyS0,115200\0" \
+-	BOOTCMD_SUNXI_COMPAT \
+-	BOOTENV
++	BOOTCMD_SUNXI_COMPAT
+ 
+ #else /* ifndef CONFIG_SPL_BUILD */
+ #define CONFIG_EXTRA_ENV_SETTINGS
+-- 
+2.8.3
+
diff --git a/libre-testing/uboot4extlinux-sunxi/PKGBUILD b/libre-testing/uboot4extlinux-sunxi/PKGBUILD
new file mode 100644
index 000000000..461d5aff7
--- /dev/null
+++ b/libre-testing/uboot4extlinux-sunxi/PKGBUILD
@@ -0,0 +1,330 @@
+# U-Boot: sunXi
+# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>
+# Contributor: André Silva <emulatorman@parabola.nu>
+# Contributor: Timothy Redaelli <timothy.redaelli@gmail.com>
+
+pkgbase=uboot4extlinux-sunxi
+pkgname=('uboot4extlinux-a10-olinuxino-lime'
+         'uboot4extlinux-a10s-olinuxino-m'
+         'uboot4extlinux-a13-olinuxino'
+         'uboot4extlinux-a13-olinuxinom'
+         'uboot4extlinux-a20-olinuxino-lime'
+         'uboot4extlinux-a20-olinuxino-lime2'
+         'uboot4extlinux-a20-olinuxino_micro'
+         'uboot4extlinux-bananapi'
+         'uboot4extlinux-bananapro'
+         'uboot4extlinux-chip'
+         'uboot4extlinux-cubieboard'
+         'uboot4extlinux-cubieboard2'
+         'uboot4extlinux-cubietruck'
+         'uboot4extlinux-linksprite_pcduino'
+         'uboot4extlinux-linksprite_pcduino3'
+         'uboot4extlinux-linksprite_pcduino3_nano'
+         'uboot4extlinux-orangepi_2'
+         'uboot4extlinux-orangepi_one'
+         'uboot4extlinux-orangepi_pc'
+         'uboot4extlinux-orangepi_plus')
+pkgver=2017.01
+pkgrel=1
+arch=('armv7h')
+url="http://git.denx.de/u-boot.git/"
+license=('GPL')
+makedepends=('bc' 'dtc' 'python2')
+backup=(boot/extlinux/extlinux.conf)
+source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
+        '0001-parabola-arm-modifications.patch'
+        'extlinux.conf')
+
+
+
+boards=('A10-OLinuXino-Lime'
+        'A10s-OLinuXino-M'
+        'A13-OLinuXino'
+        'A13-OLinuXinoM'
+        'A20-OLinuXino-Lime'
+        'A20-OLinuXino-Lime2'
+        'A20-OLinuXino_MICRO'
+        'Bananapi'
+        'Bananapro'
+        'CHIP'
+        'Cubieboard'
+        'Cubieboard2'
+        'Cubietruck'
+        'Linksprite_pcDuino'
+        'Linksprite_pcDuino3'
+        'Linksprite_pcDuino3_Nano'
+        'orangepi_2'
+        'orangepi_one'
+        'orangepi_pc'
+        'orangepi_plus')
+
+prepare() {
+  cd u-boot-${pkgver}
+
+  patch -Np1 -i ../0001-parabola-arm-modifications.patch
+  sed -i 's/env python$/&2/' tools/binman/binman{,.py}
+}
+
+build() {
+  cd u-boot-${pkgver}
+
+  unset CFLAGS CXXFLAGS LDFLAGS
+
+  for i in ${boards[@]}; do
+    mkdir ../bin_${i}
+    make distclean
+    make ${i}_config
+    echo 'CONFIG_IDENT_STRING=" Parabola GNU/Linux-libre"' >> .config
+    make EXTRAVERSION=-${pkgrel}
+    mv u-boot-sunxi-with-spl.bin ../bin_${i}
+  done
+}
+
+package_uboot4extlinux-a10-olinuxino-lime() {
+  pkgdesc="U-Boot with Extlinux support for A10 OLinuXino Lime"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_A10-OLinuXino-Lime/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-a10s-olinuxino-m() {
+  pkgdesc="U-Boot with Extlinux support for A10s OLinuXino Micro"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+  replaces=('uboot4extlinux-a10s-olinuxino-micro')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_A10s-OLinuXino-M/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-a13-olinuxino() {
+  pkgdesc="U-Boot with Extlinux support for A13 OLinuXino"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_A13-OLinuXino/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-a13-olinuxinom() {
+  pkgdesc="U-Boot with Extlinux support for A13 OLinuXino Micro"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+  replaces=('uboot4extlinux-a13-olinuxino-micro')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_A13-OLinuXinoM/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-a20-olinuxino-lime() {
+  pkgdesc="U-Boot with Extlinux support for A20 OLinuXino Lime"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_A20-OLinuXino-Lime/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-a20-olinuxino-lime2() {
+  pkgdesc="U-Boot with Extlinux support for A20 OLinuXino Lime2"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_A20-OLinuXino-Lime2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-a20-olinuxino_micro() {
+  pkgdesc="U-Boot with Extlinux support for A20 OLinuXino Micro"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+  replaces=('uboot-a20-olinuxino-micro')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_A20-OLinuXino_MICRO/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-bananapi() {
+  pkgdesc="U-Boot with Extlinux support for Banana Pi"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_Bananapi/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-bananapro() {
+  pkgdesc="U-Boot with Extlinux support for Banana Pro"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_Bananapro/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-chip() {
+  pkgdesc="U-Boot with Extlinux support for C.H.I.P"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_CHIP/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-cubieboard() {
+  pkgdesc="U-Boot with Extlinux support for Cubieboard"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_Cubieboard/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-cubieboard2() {
+  pkgdesc="U-Boot with Extlinux support for Cubieboard 2"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_Cubieboard2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-cubietruck() {
+  pkgdesc="U-Boot with Extlinux support for Cubietruck"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_Cubietruck/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-linksprite_pcduino() {
+  pkgdesc="U-Boot with Extlinux support for pcDuino"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+  replaces=('uboot4extlinux-pcduino')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_Linksprite_pcDuino/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-linksprite_pcduino3() {
+  pkgdesc="U-Boot with Extlinux support for pcDuino3"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+  replaces=('uboot4extlinux-pcduino3')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_Linksprite_pcDuino3/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-linksprite_pcduino3_nano() {
+  pkgdesc="U-Boot with Extlinux support for pcDuino3 Nano"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+  replaces=('uboot4extlinux-pcduino3-nano')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_Linksprite_pcDuino3_Nano/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-orangepi_2() {
+  pkgdesc="U-Boot with Extlinux for Orange Pi 2"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_orangepi_2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-orangepi_one() {
+  pkgdesc="U-Boot with Extlinux for Orange Pi One"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_orangepi_one/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-orangepi_pc() {
+  pkgdesc="U-Boot with Extlinux for Orange Pi PC"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_orangepi_pc/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+
+package_uboot4extlinux-orangepi_plus() {
+  pkgdesc="U-Boot with Extlinux for Orange Pi Plus"
+  install=${pkgbase}.install
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
+
+  install -d "${pkgdir}"/boot/extlinux
+  install -Dm644 bin_orangepi_plus/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
+
+  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
+}
+md5sums=('ad2d82d5b4fa548b2b95bbc26c9bad79'
+         '013cf497657009ed87f8527114e4d7ee'
+         '889524ea1958f32c1bd19f6454ffd23d')
diff --git a/libre-testing/uboot4extlinux-sunxi/extlinux.conf b/libre-testing/uboot4extlinux-sunxi/extlinux.conf
new file mode 100644
index 000000000..34b2ebc97
--- /dev/null
+++ b/libre-testing/uboot4extlinux-sunxi/extlinux.conf
@@ -0,0 +1,58 @@
+menu title Welcome to U-Boot with Extlinux support!
+
+timeout 50
+
+label Parabola GNU/Linux-libre, linux-libre kernel
+	kernel /boot/vmlinuz-linux-libre
+	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	fdtdir /boot/dtbs/linux-libre
+
+label Parabola GNU/Linux-libre, linux-libre-lts kernel
+	kernel /boot/vmlinuz-linux-libre-lts
+	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	fdtdir /boot/dtbs/linux-libre-lts
+
+label Parabola GNU/Linux-libre, linux-libre-knock kernel
+	kernel /boot/vmlinuz-linux-libre-knock
+	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	fdtdir /boot/dtbs/linux-libre-knock
+
+label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
+	kernel /boot/vmlinuz-linux-libre-lts-knock
+	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	fdtdir /boot/dtbs/linux-libre-lts-knock
+
+label Parabola GNU/Linux-libre, linux-libre-hardened kernel
+	kernel /boot/vmlinuz-linux-libre-hardened
+	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	fdtdir /boot/dtbs/linux-libre-hardened
+
+label Parabola GNU/Linux-libre, linux-libre-apparmor kernel
+	kernel /boot/vmlinuz-linux-libre-apparmor
+	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	fdtdir /boot/dtbs/linux-libre-apparmor
+
+label Parabola GNU/Linux-libre, linux-libre-lts-apparmor kernel
+	kernel /boot/vmlinuz-linux-libre-lts-apparmor
+	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	fdtdir /boot/dtbs/linux-libre-lts-apparmor
+
+label Parabola GNU/Linux-libre, linux-libre-audit kernel
+	kernel /boot/vmlinuz-linux-libre-audit
+	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	fdtdir /boot/dtbs/linux-libre-audit
+
+label Parabola GNU/Linux-libre, linux-libre-pck kernel
+	kernel /boot/vmlinuz-linux-libre-pck
+	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	fdtdir /boot/dtbs/linux-libre-pck
+
+label Parabola GNU/Linux-libre, linux-libre-rt kernel
+	kernel /boot/vmlinuz-linux-libre-rt
+	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	fdtdir /boot/dtbs/linux-libre-rt
+
+label Parabola GNU/Linux-libre, linux-libre-xen kernel
+	kernel /boot/vmlinuz-linux-libre-xen
+	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
+	fdtdir /boot/dtbs/linux-libre-xen
diff --git a/libre-testing/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install b/libre-testing/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install
new file mode 100644
index 000000000..51b209923
--- /dev/null
+++ b/libre-testing/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install
@@ -0,0 +1,24 @@
+extlinux_warning() {
+  echo "==> WARNING: Remember to set up your kernels in /boot/extlinux/extlinux.conf"
+}
+
+flash_uboot() {
+  echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0."
+  echo "Do you want to do this now? [y|N]"
+  read -r shouldwe
+  if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
+    dd if=/boot/u-boot-sunxi-with-spl.bin of=/dev/mmcblk0 bs=1024 seek=8
+  else
+    echo "You can do this later by running:"
+    echo "# dd if=/boot/u-boot-sunxi-with-spl.bin of=/dev/mmcblk0 bs=1024 seek=8"
+  fi
+  extlinux_warning
+}
+
+post_install() {
+  flash_uboot
+}
+
+post_upgrade() {
+  flash_uboot
+}