libre-testing: remove outdated u-boot packages

All these u-boot pakcages were consolidated in SOC specific packages
instead of board specific pakcages in libre.

In addition the libre packages are more recent and in sync with the
Parabola armv7h installation manual.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

5 files changed, 0 insertions, 336 deletions

diff --git a/libre-testing/uboot4extlinux-wandboard/0001-parabola-arm-modifications.patch b/libre-testing/uboot4extlinux-wandboard/0001-parabola-arm-modifications.patch
deleted file mode 100644
index c50ca9e00..000000000
--- a/libre-testing/uboot4extlinux-wandboard/0001-parabola-arm-modifications.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-diff -Nur u-boot-2015.10.orig/include/configs/mx6_common.h u-boot-2015.10/include/configs/mx6_common.h
---- u-boot-2015.10.orig/include/configs/mx6_common.h	2015-10-19 20:59:38.000000000 -0300
-+++ u-boot-2015.10/include/configs/mx6_common.h	2016-02-26 20:52:16.196805960 -0300
-@@ -68,7 +68,7 @@
- #define CONFIG_SYS_LOAD_ADDR	CONFIG_LOADADDR
- 
- #ifndef CONFIG_BOOTDELAY
--#define CONFIG_BOOTDELAY	3
-+#define CONFIG_BOOTDELAY	1
- #endif
- 
- /* allow to overwrite serial and ethaddr */
-@@ -82,6 +82,8 @@
- #define CONFIG_SUPPORT_RAW_INITRD
- #define CONFIG_CMD_FS_GENERIC
- #define CONFIG_DOS_PARTITION
-+#define CONFIG_CMD_PART
-+#define CONFIG_PARTITION_UUIDS
- #define CONFIG_CMD_EXT2
- #define CONFIG_CMD_EXT4
- #define CONFIG_CMD_EXT4_WRITE
-diff -Nur u-boot-2015.10.orig/include/configs/wandboard.h u-boot-2015.10/include/configs/wandboard.h
---- u-boot-2015.10.orig/include/configs/wandboard.h	2015-10-19 20:59:38.000000000 -0300
-+++ u-boot-2015.10/include/configs/wandboard.h	2016-02-26 20:55:20.041265918 -0300
-@@ -86,19 +86,33 @@
- #define CONFIG_IMX_HDMI
- #define CONFIG_IMX_VIDEO_SKIP
- 
-+#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre"
-+
-+/* Enable Extlinux boot support */
-+#define CONFIG_CMD_PXE
-+#define CONFIG_MENU
-+#define BOOT_TARGET_DEVICES(func)
-+#include <config_distro_bootcmd.h>
-+
- #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
- #define CONFIG_EXTRA_ENV_SETTINGS \
-+	BOOTENV \
- 	"script=boot.scr\0" \
- 	"image=zImage\0" \
-+	"bootdir=/boot\0" \
- 	"console=ttymxc0\0" \
- 	"splashpos=m,m\0" \
- 	"fdtfile=undefined\0" \
-+	"fdtdir=/boot/dtbs\0" \
- 	"fdt_high=0xffffffff\0" \
- 	"initrd_high=0xffffffff\0" \
- 	"fdt_addr=0x18000000\0" \
-+	"rdaddr=0x12A00000\0" \
-+	"rdfile=initramfs-linux.img\0" \
- 	"boot_fdt=try\0" \
-+	"optargs=\0" \
- 	"ip_dyn=yes\0" \
--	"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
-+	"mmcdev=0\0" \
- 	"mmcpart=1\0" \
- 	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
- 	"update_sd_firmware_filename=u-boot.imx\0" \
-@@ -116,7 +130,9 @@
- 			"fi; "	\
- 		"fi\0" \
- 	"mmcargs=setenv bootargs console=${console},${baudrate} " \
--		"root=${mmcroot}; run videoargs\0" \
-+		"${optargs} " \
-+		"root=${root} " \
-+		"video=${video}\0" \
- 	"videoargs=" \
- 		"setenv nextcon 0; " \
- 		"if hdmidet; then " \
-@@ -143,27 +159,44 @@
- 			"echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';" \
- 		"fi; " \
- 		"setenv bootargs ${bootargs} ${fbmem}\0" \
--	"loadbootscript=" \
--		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
--	"bootscript=echo Running bootscript from mmc ...; " \
--		"source\0" \
--	"loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
--	"loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \
--	"mmcboot=echo Booting from mmc ...; " \
--		"run mmcargs; " \
--		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
--			"if run loadfdt; then " \
--				"bootz ${loadaddr} - ${fdt_addr}; " \
--			"else " \
--				"if test ${boot_fdt} = try; then " \
--					"bootz; " \
-+	"loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${image}\0" \
-+	"loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \
-+	"loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdt_addr} ${fdtdir}/${fdtfile}\0" \
-+	"mmcboot=usb start;" \
-+		"for devtype in mmc usb; do " \
-+			"setenv devnum 0;" \
-+			"while ${devtype} dev ${devnum}; do " \
-+				"echo ${devtype} found on device ${devnum};" \
-+				"setenv bootpart ${devnum}:1;" \
-+				"part uuid ${devtype} ${bootpart} uuid;" \
-+				"setenv root PARTUUID=${uuid} rw rootwait;" \
-+				"echo Checking for: ${bootdir}/uEnv.txt ...;" \
-+				"if test -e ${devtype} ${bootpart} ${bootdir}/uEnv.txt; then " \
-+					"load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/uEnv.txt;" \
-+					"env import -t ${loadaddr} ${filesize};" \
-+					"echo Loaded environment from ${bootdir}/uEnv.txt;" \
-+					"echo Checking if uenvcmd is set ...;" \
-+					"if test -n ${uenvcmd}; then " \
-+						"echo Running uenvcmd ...;" \
-+						"run uenvcmd;" \
-+					"fi;" \
-+				"fi;" \
-+				"run scan_dev_for_boot;" \
-+				"if run loadimage; then " \
-+					"run mmcargs;" \
-+					"if run loadfdt; then " \
-+						"if run loadrd; then " \
-+							"bootz ${loadaddr} ${rdaddr}:${filesize} ${fdt_addr};" \
-+						"else " \
-+							"bootz ${loadaddr} - ${fdt_addr};" \
-+						"fi;" \
-+					"fi;" \
- 				"else " \
--					"echo WARN: Cannot load the DT; " \
--				"fi; " \
--			"fi; " \
--		"else " \
--			"bootz; " \
--		"fi;\0" \
-+					"echo No kernel found;" \
-+				"fi;" \
-+				"setexpr devnum ${devnum} + 1;" \
-+			"done;" \
-+		"done;\0" \
- 	"netargs=setenv bootargs console=${console},${baudrate} " \
- 		"root=/dev/nfs " \
- 	"ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
-@@ -202,16 +235,7 @@
- 
- #define CONFIG_BOOTCOMMAND \
- 	   "run findfdt; " \
--	   "mmc dev ${mmcdev}; if mmc rescan; then " \
--		   "if run loadbootscript; then " \
--			   "run bootscript; " \
--		   "else " \
--			   "if run loadimage; then " \
--				   "run mmcboot; " \
--			   "else run netboot; " \
--			   "fi; " \
--		   "fi; " \
--	   "else run netboot; fi"
-+	   "run mmcboot;"
- 
- /* Physical Memory Map */
- #define CONFIG_NR_DRAM_BANKS		1
diff --git a/libre-testing/uboot4extlinux-wandboard/0002-kernel-add-support-for-gcc-7.patch b/libre-testing/uboot4extlinux-wandboard/0002-kernel-add-support-for-gcc-7.patch
deleted file mode 100644
index ca59b159a..000000000
--- a/libre-testing/uboot4extlinux-wandboard/0002-kernel-add-support-for-gcc-7.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/include/linux/compiler-gcc7.h b/include/linux/compiler-gcc7.h
-new file mode 100644
-index 0000000..ba064fa
---- /dev/null
-+++ b/include/linux/compiler-gcc7.h
-@@ -0,0 +1,59 @@
-+#ifndef __LINUX_COMPILER_H
-+#error "Please don't include <linux/compiler-gcc7.h> directly, include <linux/compiler.h> instead."
-+#endif
-+
-+#define __used				__attribute__((__used__))
-+#define __must_check			__attribute__((warn_unused_result))
-+#define __compiler_offsetof(a, b)	__builtin_offsetof(a, b)
-+
-+/* Mark functions as cold. gcc will assume any path leading to a call
-+   to them will be unlikely.  This means a lot of manual unlikely()s
-+   are unnecessary now for any paths leading to the usual suspects
-+   like BUG(), printk(), panic() etc. [but let's keep them for now for
-+   older compilers]
-+
-+   gcc also has a __attribute__((__hot__)) to move hot functions into
-+   a special section, but I don't see any sense in this right now in
-+   the kernel context */
-+#define __cold			__attribute__((__cold__))
-+
-+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
-+
-+#ifndef __CHECKER__
-+# define __compiletime_warning(message) __attribute__((warning(message)))
-+# define __compiletime_error(message) __attribute__((error(message)))
-+#endif /* __CHECKER__ */
-+
-+/*
-+ * Mark a position in code as unreachable.  This can be used to
-+ * suppress control flow warnings after asm blocks that transfer
-+ * control elsewhere.
-+ */
-+#define unreachable() __builtin_unreachable()
-+
-+/* Mark a function definition as prohibited from being cloned. */
-+#define __noclone	__attribute__((__noclone__))
-+
-+/*
-+ * Tell the optimizer that something else uses this function or variable.
-+ */
-+#define __visible __attribute__((externally_visible))
-+
-+/*
-+ * GCC 'asm goto' miscompiles certain code sequences:
-+ *
-+ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
-+ *
-+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
-+ *
-+ * (asm goto is automatically volatile - the naming reflects this.)
-+ */
-+#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
-+
-+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
-+#define __HAVE_BUILTIN_BSWAP32__
-+#define __HAVE_BUILTIN_BSWAP64__
-+#define __HAVE_BUILTIN_BSWAP16__
-+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
-+
-+#define KASAN_ABI_VERSION 4
--- 
-2.1.4
-
diff --git a/libre-testing/uboot4extlinux-wandboard/PKGBUILD b/libre-testing/uboot4extlinux-wandboard/PKGBUILD
deleted file mode 100644
index 2d9fd9911..000000000
--- a/libre-testing/uboot4extlinux-wandboard/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# U-Boot: Wandboard
-# Maintainer: Isaac David <isacdaavid@at@isacdaavid@dot@info>
-# Contributor: André Silva <emulatorman@hyperbola.info>
-
-pkgname=uboot4extlinux-wandboard
-pkgver=2015.10
-pkgrel=4.1
-pkgdesc="U-Boot with Extlinux support for Wandboard"
-arch=('armv7h')
-url="http://git.denx.de/u-boot.git/"
-license=('GPL')
-makedepends=('bc')
-conflicts=('uboot-wandboard' 'uboot4grub-wandboard')
-install=${pkgname}.install
-source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
-        '0001-parabola-arm-modifications.patch'
-        '0002-kernel-add-support-for-gcc-7.patch'
-        'extlinux.conf')
-sha256sums=('bdc68d5f9455ad933b059c735d983f2c8b6b552dafb062e5ff1444f623021955'
-            'a49c942b3cd676ce3550d0f2cdb80086b5df0f74c669b11ba2420ebfc878dc8c'
-            '9e80aa27cccdb07b03d56a970f247c91d586d0b936868c076c20acc2e68a3968'
-            '6423fe8e131298f9827fecd48da5859bc876c27c7ed1e11bf95844f258c04626')
-
-prepare() {
-  cd u-boot-${pkgver}
-  patch -Np1 -i ../0001-parabola-arm-modifications.patch
-  patch -Np1 -i ../0002-kernel-add-support-for-gcc-7.patch
-}
-
-build() {
-  cd u-boot-${pkgver}
-
-  unset LDFLAGS
-
-  make distclean
-  make wandboard_defconfig
-  make
-}
-
-package() {
-  cd u-boot-${pkgver}
-
-  mkdir -p "${pkgdir}"/boot/extlinux
-  cp SPL u-boot.img "${pkgdir}"/boot
-  cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux
-}
diff --git a/libre-testing/uboot4extlinux-wandboard/extlinux.conf b/libre-testing/uboot4extlinux-wandboard/extlinux.conf
deleted file mode 100644
index 9ab822b7e..000000000
--- a/libre-testing/uboot4extlinux-wandboard/extlinux.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-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/mmcblk0p2 rw console=ttymxc0
-	fdtdir /boot/dtbs/linux-libre
-
-label Parabola GNU/Linux-libre, linux-libre-lts kernel
-	kernel /boot/vmlinuz-linux-libre-lts
-	append root=/dev/mmcblk0p2 rw console=ttymxc0
-	fdtdir /boot/dtbs/linux-libre-lts
-
-label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
-	kernel /boot/vmlinuz-linux-libre-lts-knock
-	append root=/dev/mmcblk0p2 rw console=ttymxc0
-	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/mmcblk0p2 rw console=ttymxc0
-	fdtdir /boot/dtbs/linux-libre-hardened
-
-label Parabola GNU/Linux-libre, linux-libre-lts-apparmor kernel
-	kernel /boot/vmlinuz-linux-libre-lts-apparmor
-	append root=/dev/mmcblk0p2 rw console=ttymxc0
-	fdtdir /boot/dtbs/linux-libre-lts-apparmor
-
-label Parabola GNU/Linux-libre, linux-libre-pck kernel
-	kernel /boot/vmlinuz-linux-libre-pck
-	append root=/dev/mmcblk0p2 rw console=ttymxc0
-	fdtdir /boot/dtbs/linux-libre-pck
-
-label Parabola GNU/Linux-libre, linux-libre-rt kernel
-	kernel /boot/vmlinuz-linux-libre-rt
-	append root=/dev/mmcblk0p2 rw console=ttymxc0
-	fdtdir /boot/dtbs/linux-libre-rt
-
-label Parabola GNU/Linux-libre, linux-libre-xtreme kernel
-	kernel /boot/vmlinuz-linux-libre-xtreme
-	append root=/dev/mmcblk0p2 rw console=ttymxc0
-	fdtdir /boot/dtbs/linux-libre-xtreme
diff --git a/libre-testing/uboot4extlinux-wandboard/uboot4extlinux-wandboard.install b/libre-testing/uboot4extlinux-wandboard/uboot4extlinux-wandboard.install
deleted file mode 100644
index 65196758e..000000000
--- a/libre-testing/uboot4extlinux-wandboard/uboot4extlinux-wandboard.install
+++ /dev/null
@@ -1,26 +0,0 @@
-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 this now? [y|N]"
-  read -r shouldwe
-  if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
-    dd if=/boot/SPL of=/dev/mmcblk0 seek=1 bs=1k
-    dd if=/boot/u-boot.img of=/dev/mmcblk0 seek=69 bs=1k
-  else
-    echo "You can do this later by running:"
-    echo "# dd if=/boot/SPL of=/dev/mmcblk0 seek=1 bs=1k"
-    echo "# dd if=/boot/u-boot.img of=/dev/mmcblk0 seek=69 bs=1k"
-  fi
-  extlinux_warning
-}
-
-post_install() {
-  flash_uboot
-}
-
-post_upgrade() {
-  flash_uboot
-}