move uboot4extlinux packages to [libre-testing] since it aren't stable yet

author: André Fabian Silva Delgado <emulatorman@parabola.nu> 2016-03-02 00:23:43 -0300
committer: André Fabian Silva Delgado <emulatorman@parabola.nu> 2016-03-02 00:28:07 -0300
commit: 11467233d8b439275ce1e1db650a4c6f91a9db1f (patch)
tree: 62cc14ffe05dcc5541210d2073a4c119e6a125c2 /libre
parent: a44772df880c7bcf6ba114a6e4d86ba4ff6b4adc (diff)
download: abslibre-11467233d8b439275ce1e1db650a4c6f91a9db1f.tar.gz
abslibre-11467233d8b439275ce1e1db650a4c6f91a9db1f.tar.bz2
abslibre-11467233d8b439275ce1e1db650a4c6f91a9db1f.zip
38 files changed, 0 insertions, 4900 deletions
diff --git a/libre/uboot4extlinux-am335x_bone/0001-parabola-arm-modifications.patch b/libre/uboot4extlinux-am335x_bone/0001-parabola-arm-modifications.patch
deleted file mode 100644
index 0f1c145da..000000000
--- a/libre/uboot4extlinux-am335x_bone/0001-parabola-arm-modifications.patch
+++ /dev/null
@@ -1,243 +0,0 @@
-diff -Nur u-boot-2015.04.orig/configs/am335x_evm_defconfig u-boot-2015.04/configs/am335x_evm_defconfig
---- u-boot-2015.04.orig/configs/am335x_evm_defconfig	2015-04-13 11:53:03.000000000 -0300
-+++ u-boot-2015.04/configs/am335x_evm_defconfig	2016-02-24 12:05:57.627551576 -0300
-@@ -1,7 +1,6 @@
- CONFIG_SPL=y
- CONFIG_SPL_STACK_R=y
- CONFIG_SPL_STACK_R_ADDR=0x82000000
--CONFIG_SYS_EXTRA_OPTIONS="NAND"
--CONFIG_CONS_INDEX=1
-+CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
- CONFIG_ARM=y
- CONFIG_TARGET_AM335X_EVM=y
-diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/include/configs/am335x_evm.h
---- u-boot-2015.04.orig/include/configs/am335x_evm.h	2015-04-13 11:53:03.000000000 -0300
-+++ u-boot-2015.04/include/configs/am335x_evm.h	2016-02-24 12:09:41.983016704 -0300
-@@ -17,6 +17,7 @@
- #define __CONFIG_AM335X_EVM_H
- 
- #include <configs/ti_am335x_common.h>
-+#define CONFIG_ENV_IS_NOWHERE
- 
- #ifndef CONFIG_SPL_BUILD
- #ifndef CONFIG_FIT
-@@ -45,6 +46,9 @@
- /* Enhance our eMMC support / experience. */
- #define CONFIG_CMD_GPT
- #define CONFIG_EFI_PARTITION
-+#define CONFIG_CMD_PART
-+#define CONFIG_PARTITION_UUIDS
-+#define CONFIG_CMD_SETEXPR
- 
- #ifdef CONFIG_NAND
- #define NANDARGS \
-@@ -67,113 +71,90 @@
- 
- #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
- 
-+/* Enable Extlinux boot support */
-+#define CONFIG_CMD_PXE
-+#define CONFIG_MENU
-+#define BOOT_TARGET_DEVICES(func)
-+#include <config_distro_bootcmd.h>
-+
- #ifndef CONFIG_SPL_BUILD
- #define CONFIG_EXTRA_ENV_SETTINGS \
-+	BOOTENV \
- 	DEFAULT_LINUX_BOOT_ENV \
--	"boot_fdt=try\0" \
--	"bootpart=0:2\0" \
-+	"bootpart=0:1\0" \
- 	"bootdir=/boot\0" \
-+	"fdtdir=/boot/dtbs\0" \
- 	"bootfile=zImage\0" \
- 	"fdtfile=undefined\0" \
-+	"rdfile=initramfs-linux.img\0" \
- 	"console=ttyO0,115200n8\0" \
- 	"partitions=" \
- 		"uuid_disk=${uuid_gpt_disk};" \
- 		"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
- 	"optargs=\0" \
--	"mmcdev=0\0" \
--	"mmcroot=/dev/mmcblk0p2 ro\0" \
--	"mmcrootfstype=ext4 rootwait\0" \
--	"rootpath=/export/rootfs\0" \
--	"nfsopts=nolock\0" \
--	"static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \
--		"::off\0" \
--	"ramroot=/dev/ram0 rw\0" \
--	"ramrootfstype=ext2\0" \
-+	"cape_disable=\0" \
-+	"cape_enable=\0" \
-+	"cmdline=\0" \
- 	"mmcargs=setenv bootargs console=${console} " \
- 		"${optargs} " \
--		"root=${mmcroot} " \
--		"rootfstype=${mmcrootfstype}\0" \
--	"spiroot=/dev/mtdblock4 rw\0" \
--	"spirootfstype=jffs2\0" \
--	"spisrcaddr=0xe0000\0" \
--	"spiimgsize=0x362000\0" \
--	"spibusno=0\0" \
--	"spiargs=setenv bootargs console=${console} " \
--		"${optargs} " \
--		"root=${spiroot} " \
--		"rootfstype=${spirootfstype}\0" \
--	"netargs=setenv bootargs console=${console} " \
--		"${optargs} " \
--		"root=/dev/nfs " \
--		"nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
--		"ip=dhcp\0" \
--	"bootenv=uEnv.txt\0" \
--	"loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
--	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
--		"source ${loadaddr}\0" \
--	"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
--	"importbootenv=echo Importing environment from mmc ...; " \
--		"env import -t -r $loadaddr $filesize\0" \
--	"ramargs=setenv bootargs console=${console} " \
--		"${optargs} " \
--		"root=${ramroot} " \
--		"rootfstype=${ramrootfstype}\0" \
--	"loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
--	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
--	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
--	"mmcloados=run mmcargs; " \
--		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
--			"if run loadfdt; then " \
--				"bootz ${loadaddr} - ${fdtaddr}; " \
--			"else " \
--				"if test ${boot_fdt} = try; then " \
--					"bootz; " \
--				"else " \
--					"echo WARN: Cannot load the DT; " \
--				"fi; " \
--			"fi; " \
--		"else " \
--			"bootz; " \
--		"fi;\0" \
--	"mmcboot=mmc dev ${mmcdev}; " \
--		"if mmc rescan; then " \
--			"echo SD/MMC found on device ${mmcdev};" \
--			"if run loadbootscript; then " \
--				"run bootscript;" \
--			"else " \
--				"if run loadbootenv; then " \
--					"echo Loaded environment from ${bootenv};" \
--					"run importbootenv;" \
-+		"${cape_disable} " \
-+		"${cape_enable} " \
-+		"root=${root} " \
-+		"${cmdline}\0" \
-+	"loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-+	"loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \
-+	"loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
-+	"mmcboot=usb start;" \
-+		"for devtype in mmc usb; do " \
-+			"for devnum in 0 1; do " \
-+				"if ${devtype} dev ${devnum}; then " \
-+					"echo ${devtype} found on device ${devnum};" \
-+					"setenv bootpart ${devnum}:1;" \
-+					"part uuid ${devtype} ${bootpart} uuid;" \
-+					"setenv root PARTUUID=${uuid} rw rootwait fixrtc;" \
-+					"echo Checking for: ${bootdir}/uEnv.txt ...;" \
-+					"gpio set 54;" \
-+					"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;" \
-+						"if test -n ${cape}; then " \
-+							"if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtbase}-${cape}.dtb; then " \
-+								"setenv fdtfile ${fdtbase}-${cape}.dtb; " \
-+							"fi; " \
-+							"echo using: $fdtfile...; " \
-+						"fi; " \
-+						"echo Checking if uenvcmd is set ...;" \
-+						"if test -n ${uenvcmd}; then " \
-+							"echo Running uenvcmd ...;" \
-+							"run uenvcmd;" \
-+						"fi;" \
-+					"fi;" \
-+					"gpio set 55;" \
-+					"run scan_dev_for_boot;" \
-+					"if run loadimage; then " \
-+						"run mmcargs;" \
-+						"if run loadfdt; then " \
-+							"gpio set 56;" \
-+							"if run loadrd; then " \
-+								"bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \
-+							"else " \
-+								"bootz ${loadaddr} - ${fdtaddr};" \
-+							"fi;" \
-+						"fi;" \
-+					"else " \
-+						"echo No kernel found;" \
-+					"fi;" \
-+					"gpio clear 54; gpio clear 55;" \
-+					"setexpr devnum ${devnum} + 1;" \
- 				"fi;" \
--				"if test -n $uenvcmd; then " \
--					"echo Running uenvcmd ...;" \
--					"run uenvcmd;" \
--				"fi;" \
--				"if run loadimage; then " \
--					"run mmcloados;" \
--				"fi;" \
--			"fi ;" \
--		"fi;\0" \
--	"spiboot=echo Booting from spi ...; " \
--		"run spiargs; " \
--		"sf probe ${spibusno}:0; " \
--		"sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \
--		"bootz ${loadaddr}\0" \
--	"netboot=echo Booting from network ...; " \
--		"setenv autoload no; " \
--		"dhcp; " \
--		"tftp ${loadaddr} ${bootfile}; " \
--		"tftp ${fdtaddr} ${fdtfile}; " \
--		"run netargs; " \
--		"bootz ${loadaddr} - ${fdtaddr}\0" \
--	"ramboot=echo Booting from ramdisk ...; " \
--		"run ramargs; " \
--		"bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
-+			"done;" \
-+		"done;\0" \
- 	"findfdt="\
- 		"if test $board_name = A335BONE; then " \
--			"setenv fdtfile am335x-bone.dtb; fi; " \
-+			"setenv fdtfile am335x-bone.dtb; setenv fdtbase am335x-bone; fi; " \
- 		"if test $board_name = A335BNLT; then " \
--			"setenv fdtfile am335x-boneblack.dtb; fi; " \
-+			"setenv fdtfile am335x-boneblack.dtb; setenv fdtbase am335x-boneblack; setenv umsmedia 1; fi; " \
- 		"if test $board_name = A33515BB; then " \
- 			"setenv fdtfile am335x-evm.dtb; fi; " \
- 		"if test $board_name = A335X_SK; then " \
-@@ -185,12 +166,11 @@
- #endif
- 
- #define CONFIG_BOOTCOMMAND \
--	"run findfdt; " \
--	"run mmcboot;" \
--	"setenv mmcdev 1; " \
--	"setenv bootpart 1:2; " \
-+	"gpio set 53;" \
-+	"run findfdt;" \
- 	"run mmcboot;" \
--	"run nandboot;"
-+	"gpio clear 54; gpio clear 55;" \
-+	"gpio set 56"
- 
- /* NS16550 Configuration */
- #define CONFIG_SYS_NS16550_COM1		0x44e09000	/* Base EVM has UART0 */
-@@ -329,9 +309,8 @@
- #endif
- 
- #ifdef CONFIG_MUSB_GADGET
--#define CONFIG_USB_ETHER
--#define CONFIG_USB_ETH_RNDIS
--#define CONFIG_USBNET_HOST_ADDR	"de:ad:be:af:00:00"
-+#define CONFIG_CMD_USB_MASS_STORAGE
-+#define CONFIG_USB_GADGET_MASS_STORAGE
- 
- /* USB TI's IDs */
- #define CONFIG_G_DNL_VENDOR_NUM 0x0451
diff --git a/libre/uboot4extlinux-am335x_bone/PKGBUILD b/libre/uboot4extlinux-am335x_bone/PKGBUILD
deleted file mode 100644
index f1436af02..000000000
--- a/libre/uboot4extlinux-am335x_bone/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# U-Boot: BeagleBone and BeagleBone Black
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Contributor: Jookia <166291@gmail.com>
-# Contributor: Márcio Silva <coadde@parabola.nu>
-
-buildarch=4
-
-pkgname=uboot4extlinux-am335x_bone
-pkgver=2015.04
-pkgrel=1
-pkgdesc="U-Boot with Extlinux support for BeagleBone and BeagleBone Black"
-arch=('armv7h')
-url="http://git.denx.de/u-boot.git/"
-replaces=('uboot-beaglebone-linux-libre' 'uboot-beaglebone-linux-libre-lts'
-          'uboot-beaglebone-linux-libre-grsec' 'uboot-beaglebone-linux-libre-pck'
-          'uboot-beaglebone' 'uboot-am335x_bone')
-conflicts=('uboot-beaglebone-linux-libre' 'uboot-beaglebone-linux-libre-lts'
-           'uboot-beaglebone-linux-libre-grsec' 'uboot-beaglebone-linux-libre-pck'
-           'uboot-beaglebone' 'uboot-am335x_bone' 'uboot4grub-am335x_bone')
-makedepends=('bc')
-license=('GPL')
-backup=(boot/extlinux/extlinux.conf)
-install=${pkgname}.install
-source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
-        '0001-parabola-arm-modifications.patch'
-        'extlinux.conf'
-        'uEnv.txt')
-md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd'
-         '37784c8f8f52a615d65e775018d237fb'
-         '068f6b4e8047115e73f29af5f384889b'
-         'ccb79775b81654e16fca18825c7f2506')
-
-prepare() {
-  cd u-boot-${pkgver}
-  patch -Np1 -i ../0001-parabola-arm-modifications.patch
-}
-
-build() {
-  cd u-boot-${pkgver}
-
-  unset CFLAGS CXXFLAGS LDFLAGS
-
-  make distclean
-  make am335x_evm_config
-  make
-}
-
-package() {
-  cd u-boot-${pkgver}
-  mkdir -p "${pkgdir}"/boot/extlinux
-  cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}"/boot
-  cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux
-}
diff --git a/libre/uboot4extlinux-am335x_bone/extlinux.conf b/libre/uboot4extlinux-am335x_bone/extlinux.conf
deleted file mode 100644
index 52de94d49..000000000
--- a/libre/uboot4extlinux-am335x_bone/extlinux.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-menu title Welcome to U-Boot with Extlinux support!
-
-label Parabola GNU/Linux-libre, linux-libre kernel
-	kernel /boot/vmlinuz-linux-libre
-	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-	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=ttyO0,115200n8
-#	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=ttyO0,115200n8
-#	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=ttyO0,115200n8
-#	fdtdir /boot/dtbs/linux-libre-lts-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec kernel
-#	kernel /boot/vmlinuz-linux-libre-grsec
-#	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-#	fdtdir /boot/dtbs/linux-libre-grsec
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec-knock kernel
-#	kernel /boot/vmlinuz-linux-libre-grsec-knock
-#	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-#	fdtdir /boot/dtbs/linux-libre-grsec-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-audit kernel
-#	kernel /boot/vmlinuz-linux-libre-audit
-#	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-#	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=ttyO0,115200n8
-#	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=ttyO0,115200n8
-#	fdtdir /boot/dtbs/linux-libre-rt
diff --git a/libre/uboot4extlinux-am335x_bone/uEnv.txt b/libre/uboot4extlinux-am335x_bone/uEnv.txt
deleted file mode 100644
index f432efc6b..000000000
--- a/libre/uboot4extlinux-am335x_bone/uEnv.txt
+++ /dev/null
@@ -1 +0,0 @@
-optargs=coherent_pool=1M
diff --git a/libre/uboot4extlinux-am335x_bone/uboot4extlinux-am335x_bone.install b/libre/uboot4extlinux-am335x_bone/uboot4extlinux-am335x_bone.install
deleted file mode 100644
index 4467c694e..000000000
--- a/libre/uboot4extlinux-am335x_bone/uboot4extlinux-am335x_bone.install
+++ /dev/null
@@ -1,37 +0,0 @@
-flash_instructions() {
-  echo "# dd if=/boot/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k"
-  echo "# dd if=/boot/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k"
-}
-
-extlinux_warning() {
-  echo "==> WARNING: U-Boot uses Extlinux support to boot up. For setting it up, edit /boot/extlinux/extlinux.conf"
-}
-
-flash_uboot() {
-  root=$(mount | awk '/ on \/ / { print $1; }')
-  if [[ $root =~ ^/dev/mmcblk.*$ ]]; then
-    root=${root:0:12}
-    echo "A new U-Boot version needs to be flashed onto $root."
-    echo "Do this now? [y|N]"
-    read -r shouldwe
-    if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
-      dd if=/boot/MLO of=$root count=1 seek=1 conv=notrunc bs=128k
-      dd if=/boot/u-boot.img of=$root count=2 seek=1 conv=notrunc bs=384k
-    else
-      echo "You can do this later by running:"
-      flash_instructions
-    fi
-  else
-    echo "Flash the new U-Boot version onto your boot device. For example:"
-    flash_instructions
-  fi
-  extlinux_warning
-}
-
-post_install() {
-  flash_uboot
-}
-
-post_upgrade() {
-  flash_uboot
-}
diff --git a/libre/uboot4extlinux-chiliboard/0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch b/libre/uboot4extlinux-chiliboard/0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch
deleted file mode 100644
index bdb6699e6..000000000
--- a/libre/uboot4extlinux-chiliboard/0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 0a3f119b5221e16feb1cbe4036cc16d1dc4c194c Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
-Date: Sat, 7 Feb 2015 22:52:40 +0100
-Subject: [PATCH 1/6] Add linux/compiler-gcc5.h to fix builds with gcc5
-
-Add linux/compiler-gcc5/h from the kernel sources at:
-
-commit 5631b8fba640a4ab2f8a954f63a603fa34eda96b
-Author: Steven Noonan <steven@uplinklabs.net>
-Date:   Sat Oct 25 15:09:42 2014 -0700
-
-    compiler/gcc4+: Remove inaccurate comment about 'asm goto' miscompiles
-
-Signed-off-by: Hans de Goede <hdegoede@redhat.com>
----
- include/linux/compiler-gcc5.h | 65 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 65 insertions(+)
- create mode 100644 include/linux/compiler-gcc5.h
-
-diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
-new file mode 100644
-index 0000000..c8c5659
---- /dev/null
-+++ b/include/linux/compiler-gcc5.h
-@@ -0,0 +1,65 @@
-+#ifndef __LINUX_COMPILER_H
-+#error "Please don't include <linux/compiler-gcc5.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]
-+
-+   Early snapshots of gcc 4.3 don't support this and we can't detect this
-+   in the preprocessor, but we can live with this because they're unreleased.
-+   Maketime probing would be overkill here.
-+
-+   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.
-+ *
-+ * Early snapshots of gcc 4.5 don't support this and we can't detect
-+ * this in the preprocessor, but we can live with this because they're
-+ * unreleased.  Really, we need to have autoconf for the kernel.
-+ */
-+#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 */
--- 
-2.5.0
-
diff --git a/libre/uboot4extlinux-chiliboard/0002-ARM-asm-io.h-use-static-inline.patch b/libre/uboot4extlinux-chiliboard/0002-ARM-asm-io.h-use-static-inline.patch
deleted file mode 100644
index 6ec3d82fc..000000000
--- a/libre/uboot4extlinux-chiliboard/0002-ARM-asm-io.h-use-static-inline.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From a29b67a36a2b59acfc9cb7adc6e3bc06c490d4ee Mon Sep 17 00:00:00 2001
-From: Jeroen Hofstee <jeroen@myspectrum.nl>
-Date: Sun, 22 Jun 2014 23:10:39 +0200
-Subject: [PATCH 2/6] ARM:asm:io.h use static inline
-
-When compiling u-boot with W=1 the extern inline void for
-read* is likely causing the most noise. gcc / clang will
-warn there is never a actual declaration for these functions.
-Instead of declaring these extern make them static inline so
-it is actually declared.
-
-cc: Albert ARIBAUD <albert.u.boot@aribaud.net>
-Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
----
- arch/arm/include/asm/io.h | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
-index 214f3ea..dc6138a 100644
---- a/arch/arm/include/asm/io.h
-+++ b/arch/arm/include/asm/io.h
-@@ -77,7 +77,7 @@ static inline phys_addr_t virt_to_phys(void * vaddr)
- #define __arch_putl(v,a)		(*(volatile unsigned int *)(a) = (v))
- #define __arch_putq(v,a)		(*(volatile unsigned long long *)(a) = (v))
- 
--extern inline void __raw_writesb(unsigned long addr, const void *data,
-+static inline void __raw_writesb(unsigned long addr, const void *data,
- 				 int bytelen)
- {
- 	uint8_t *buf = (uint8_t *)data;
-@@ -85,7 +85,7 @@ extern inline void __raw_writesb(unsigned long addr, const void *data,
- 		__arch_putb(*buf++, addr);
- }
- 
--extern inline void __raw_writesw(unsigned long addr, const void *data,
-+static inline void __raw_writesw(unsigned long addr, const void *data,
- 				 int wordlen)
- {
- 	uint16_t *buf = (uint16_t *)data;
-@@ -93,7 +93,7 @@ extern inline void __raw_writesw(unsigned long addr, const void *data,
- 		__arch_putw(*buf++, addr);
- }
- 
--extern inline void __raw_writesl(unsigned long addr, const void *data,
-+static inline void __raw_writesl(unsigned long addr, const void *data,
- 				 int longlen)
- {
- 	uint32_t *buf = (uint32_t *)data;
-@@ -101,21 +101,21 @@ extern inline void __raw_writesl(unsigned long addr, const void *data,
- 		__arch_putl(*buf++, addr);
- }
- 
--extern inline void __raw_readsb(unsigned long addr, void *data, int bytelen)
-+static inline void __raw_readsb(unsigned long addr, void *data, int bytelen)
- {
- 	uint8_t *buf = (uint8_t *)data;
- 	while(bytelen--)
- 		*buf++ = __arch_getb(addr);
- }
- 
--extern inline void __raw_readsw(unsigned long addr, void *data, int wordlen)
-+static inline void __raw_readsw(unsigned long addr, void *data, int wordlen)
- {
- 	uint16_t *buf = (uint16_t *)data;
- 	while(wordlen--)
- 		*buf++ = __arch_getw(addr);
- }
- 
--extern inline void __raw_readsl(unsigned long addr, void *data, int longlen)
-+static inline void __raw_readsl(unsigned long addr, void *data, int longlen)
- {
- 	uint32_t *buf = (uint32_t *)data;
- 	while(longlen--)
--- 
-2.5.0
-
diff --git a/libre/uboot4extlinux-chiliboard/0003-common-main.c-make-show_boot_progress-__weak.patch b/libre/uboot4extlinux-chiliboard/0003-common-main.c-make-show_boot_progress-__weak.patch
deleted file mode 100644
index baf1efd5d..000000000
--- a/libre/uboot4extlinux-chiliboard/0003-common-main.c-make-show_boot_progress-__weak.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dc7efb77bbd59224855713a554bb3721568a85c6 Mon Sep 17 00:00:00 2001
-From: Jeroen Hofstee <jeroen@myspectrum.nl>
-Date: Thu, 26 Jun 2014 20:18:31 +0200
-Subject: [PATCH 3/6] common: main.c: make show_boot_progress __weak
-
-This not only looks a bit better it also prevents a
-warning with W=1 (no previous prototype).
-
-Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
-Acked-by: Simon Glass <sjg@chromium.org>
----
- common/main.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/common/main.c b/common/main.c
-index 32618f1..2979fbe 100644
---- a/common/main.c
-+++ b/common/main.c
-@@ -17,8 +17,7 @@ DECLARE_GLOBAL_DATA_PTR;
- /*
-  * Board-specific Platform code can reimplement show_boot_progress () if needed
-  */
--void inline __show_boot_progress (int val) {}
--void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
-+__weak void show_boot_progress(int val) {}
- 
- static void modem_init(void)
- {
--- 
-2.5.0
-
diff --git a/libre/uboot4extlinux-chiliboard/0004-common-board_f-cosmetic-use-__weak-for-leds.patch b/libre/uboot4extlinux-chiliboard/0004-common-board_f-cosmetic-use-__weak-for-leds.patch
deleted file mode 100644
index f2237a229..000000000
--- a/libre/uboot4extlinux-chiliboard/0004-common-board_f-cosmetic-use-__weak-for-leds.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From ea9b2d003712ae2c6158abb5c9f285f593e8fcb0 Mon Sep 17 00:00:00 2001
-From: Jeroen Hofstee <jeroen@myspectrum.nl>
-Date: Mon, 23 Jun 2014 23:20:19 +0200
-Subject: [PATCH 4/6] common: board_f: cosmetic use __weak for leds
-
-First of all this looks a lot better, but it also
-prevents a gcc warning (W=1), that the weak function
-has no previous prototype.
-
-cc: Simon Glass <sjg@chromium.org>
-Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
-Acked-by: Simon Glass <sjg@chromium.org>
----
- common/board_f.c     | 29 ++++++++++-------------------
- include/status_led.h | 22 +++++++++++-----------
- 2 files changed, 21 insertions(+), 30 deletions(-)
-
-diff --git a/common/board_f.c b/common/board_f.c
-index 4ea4cb2..bdab38e 100644
---- a/common/board_f.c
-+++ b/common/board_f.c
-@@ -37,6 +37,7 @@
- #include <os.h>
- #include <post.h>
- #include <spi.h>
-+#include <status_led.h>
- #include <trace.h>
- #include <watchdog.h>
- #include <asm/errno.h>
-@@ -78,25 +79,15 @@ DECLARE_GLOBAL_DATA_PTR;
-  ************************************************************************
-  * May be supplied by boards if desired
-  */
--inline void __coloured_LED_init(void) {}
--void coloured_LED_init(void)
--	__attribute__((weak, alias("__coloured_LED_init")));
--inline void __red_led_on(void) {}
--void red_led_on(void) __attribute__((weak, alias("__red_led_on")));
--inline void __red_led_off(void) {}
--void red_led_off(void) __attribute__((weak, alias("__red_led_off")));
--inline void __green_led_on(void) {}
--void green_led_on(void) __attribute__((weak, alias("__green_led_on")));
--inline void __green_led_off(void) {}
--void green_led_off(void) __attribute__((weak, alias("__green_led_off")));
--inline void __yellow_led_on(void) {}
--void yellow_led_on(void) __attribute__((weak, alias("__yellow_led_on")));
--inline void __yellow_led_off(void) {}
--void yellow_led_off(void) __attribute__((weak, alias("__yellow_led_off")));
--inline void __blue_led_on(void) {}
--void blue_led_on(void) __attribute__((weak, alias("__blue_led_on")));
--inline void __blue_led_off(void) {}
--void blue_led_off(void) __attribute__((weak, alias("__blue_led_off")));
-+__weak void coloured_LED_init(void) {}
-+__weak void red_led_on(void) {}
-+__weak void red_led_off(void) {}
-+__weak void green_led_on(void) {}
-+__weak void green_led_off(void) {}
-+__weak void yellow_led_on(void) {}
-+__weak void yellow_led_off(void) {}
-+__weak void blue_led_on(void) {}
-+__weak void blue_led_off(void) {}
- 
- /*
-  * Why is gd allocated a register? Prior to reloc it might be better to
-diff --git a/include/status_led.h b/include/status_led.h
-index 0eb91b8..b8aaaf7 100644
---- a/include/status_led.h
-+++ b/include/status_led.h
-@@ -272,19 +272,21 @@ extern void __led_set (led_id_t mask, int state);
- # include <asm/status_led.h>
- #endif
- 
-+#endif	/* CONFIG_STATUS_LED	*/
-+
- /*
-  * Coloured LEDs API
-  */
- #ifndef	__ASSEMBLY__
--extern void	coloured_LED_init (void);
--extern void	red_led_on(void);
--extern void	red_led_off(void);
--extern void	green_led_on(void);
--extern void	green_led_off(void);
--extern void	yellow_led_on(void);
--extern void	yellow_led_off(void);
--extern void	blue_led_on(void);
--extern void	blue_led_off(void);
-+void coloured_LED_init(void);
-+void red_led_on(void);
-+void red_led_off(void);
-+void green_led_on(void);
-+void green_led_off(void);
-+void yellow_led_on(void);
-+void yellow_led_off(void);
-+void blue_led_on(void);
-+void blue_led_off(void);
- #else
- 	.extern LED_init
- 	.extern red_led_on
-@@ -297,6 +299,4 @@ extern void	blue_led_off(void);
- 	.extern blue_led_off
- #endif
- 
--#endif	/* CONFIG_STATUS_LED	*/
--
- #endif	/* _STATUS_LED_H_	*/
--- 
-2.5.0
-
diff --git a/libre/uboot4extlinux-chiliboard/0005-chiliboard-support.patch b/libre/uboot4extlinux-chiliboard/0005-chiliboard-support.patch
deleted file mode 100644
index cbe029a69..000000000
--- a/libre/uboot4extlinux-chiliboard/0005-chiliboard-support.patch
+++ /dev/null
@@ -1,1685 +0,0 @@
-From 22efc5d711cf5a91a236b3a54f94cbcad0fc7b5e Mon Sep 17 00:00:00 2001
-From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Sat, 29 Aug 2015 08:56:32 -0600
-Subject: [PATCH 5/6] chiliboard support
-
----
- board/grinn/chiliboard/Makefile   |  13 +
- board/grinn/chiliboard/board.c    | 447 +++++++++++++++++++
- board/grinn/chiliboard/board.h    |  20 +
- board/grinn/chiliboard/mux.c      |  99 +++++
- board/grinn/chiliboard/u-boot.lds | 131 ++++++
- boards.cfg                        |   5 +
- drivers/mtd/nand/omap_gpmc.c      |   6 +-
- include/configs/chiliboard.h      | 878 ++++++++++++++++++++++++++++++++++++++
- 8 files changed, 1597 insertions(+), 2 deletions(-)
- create mode 100644 board/grinn/chiliboard/Makefile
- create mode 100644 board/grinn/chiliboard/board.c
- create mode 100644 board/grinn/chiliboard/board.h
- create mode 100644 board/grinn/chiliboard/mux.c
- create mode 100644 board/grinn/chiliboard/u-boot.lds
- create mode 100644 include/configs/chiliboard.h
-
-diff --git a/board/grinn/chiliboard/Makefile b/board/grinn/chiliboard/Makefile
-new file mode 100644
-index 0000000..804ac37
---- /dev/null
-+++ b/board/grinn/chiliboard/Makefile
-@@ -0,0 +1,13 @@
-+#
-+# Makefile
-+#
-+# Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
-+#
-+# SPDX-License-Identifier:	GPL-2.0+
-+#
-+
-+ifeq ($(CONFIG_SKIP_LOWLEVEL_INIT),)
-+obj-y	:= mux.o
-+endif
-+
-+obj-y	+= board.o
-diff --git a/board/grinn/chiliboard/board.c b/board/grinn/chiliboard/board.c
-new file mode 100644
-index 0000000..ed8ab63
---- /dev/null
-+++ b/board/grinn/chiliboard/board.c
-@@ -0,0 +1,447 @@
-+/*
-+ * board.c
-+ *
-+ * Board functions for Grinn chiliboard, AM335X based boards
-+ *
-+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
-+ *
-+ * Copyright (C) 2015, Grinn - http://www.grinn-global.com
-+ * Grzegorz Glomb, g.glomb@grinn-global.com
-+ *
-+ * SPDX-License-Identifier:	GPL-2.0+
-+ */
-+
-+#include <common.h>
-+#include <errno.h>
-+#include <spl.h>
-+#include <asm/arch/cpu.h>
-+#include <asm/arch/hardware.h>
-+#include <asm/arch/omap.h>
-+#include <asm/arch/ddr_defs.h>
-+#include <asm/arch/clock.h>
-+#include <asm/arch/gpio.h>
-+#include <asm/arch/mmc_host_def.h>
-+#include <asm/arch/sys_proto.h>
-+#include <asm/arch/mem.h>
-+#include <asm/io.h>
-+#include <asm/emif.h>
-+#include <asm/gpio.h>
-+#include <i2c.h>
-+#include <miiphy.h>
-+#include <cpsw.h>
-+#include <power/tps65217.h>
-+#include <power/tps65910.h>
-+#include <environment.h>
-+#include <watchdog.h>
-+#include <environment.h>
-+#include "board.h"
-+
-+DECLARE_GLOBAL_DATA_PTR;
-+#define HDR_NAME_LEN		8
-+
-+static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;
-+
-+#ifndef CONFIG_SKIP_LOWLEVEL_INIT
-+static const struct ddr_data ddr2_chilisom_gcs1_data = {
-+	.datardsratio0 = ((MT47H128M16RT25E_RD_DQS<<30) |
-+			  (MT47H128M16RT25E_RD_DQS<<20) |
-+			  (MT47H128M16RT25E_RD_DQS<<10) |
-+			  (MT47H128M16RT25E_RD_DQS<<0)),
-+	.datawdsratio0 = ((MT47H128M16RT25E_WR_DQS<<30) |
-+			  (MT47H128M16RT25E_WR_DQS<<20) |
-+			  (MT47H128M16RT25E_WR_DQS<<10) |
-+			  (MT47H128M16RT25E_WR_DQS<<0)),
-+	.datawiratio0 = ((MT47H128M16RT25E_PHY_WRLVL<<30) |
-+			 (MT47H128M16RT25E_PHY_WRLVL<<20) |
-+			 (MT47H128M16RT25E_PHY_WRLVL<<10) |
-+			 (MT47H128M16RT25E_PHY_WRLVL<<0)),
-+	.datagiratio0 = ((MT47H128M16RT25E_PHY_GATELVL<<30) |
-+			 (MT47H128M16RT25E_PHY_GATELVL<<20) |
-+			 (MT47H128M16RT25E_PHY_GATELVL<<10) |
-+			 (MT47H128M16RT25E_PHY_GATELVL<<0)),
-+	.datafwsratio0 = ((MT47H128M16RT25E_PHY_FIFO_WE<<30) |
-+			  (MT47H128M16RT25E_PHY_FIFO_WE<<20) |
-+			  (MT47H128M16RT25E_PHY_FIFO_WE<<10) |
-+			  (MT47H128M16RT25E_PHY_FIFO_WE<<0)),
-+	.datawrsratio0 = ((MT47H128M16RT25E_PHY_WR_DATA<<30) |
-+			  (MT47H128M16RT25E_PHY_WR_DATA<<20) |
-+			  (MT47H128M16RT25E_PHY_WR_DATA<<10) |
-+			  (MT47H128M16RT25E_PHY_WR_DATA<<0)),
-+};
-+
-+static const struct cmd_control ddr2_chilisom_gcs1_cmd_ctrl_data = {
-+	.cmd0csratio = MT47H128M16RT25E_RATIO,
-+	.cmd0iclkout = MT47H128M16RT25E_INVERT_CLKOUT,
-+
-+	.cmd1csratio = MT47H128M16RT25E_RATIO,
-+	.cmd1iclkout = MT47H128M16RT25E_INVERT_CLKOUT,
-+
-+	.cmd2csratio = MT47H128M16RT25E_RATIO,
-+	.cmd2iclkout = MT47H128M16RT25E_INVERT_CLKOUT,
-+};
-+
-+static const struct emif_regs ddr2_chilisom_gcs1_emif_reg_data = {
-+	.sdram_config = MT47H128M16RT25E_EMIF_SDCFG,
-+	.ref_ctrl = MT47H128M16RT25E_EMIF_SDREF,
-+	.sdram_tim1 = MT47H128M16RT25E_EMIF_TIM1,
-+	.sdram_tim2 = MT47H128M16RT25E_EMIF_TIM2,
-+	.sdram_tim3 = MT47H128M16RT25E_EMIF_TIM3,
-+	.emif_ddr_phy_ctlr_1 = MT47H128M16RT25E_EMIF_READ_LATENCY,
-+};
-+
-+static const struct ddr_data ddr3_chilisom_gcs2_data = {
-+	.datardsratio0 = MT41K256M16HA125E_RD_DQS,
-+	.datawdsratio0 = MT41K256M16HA125E_WR_DQS,
-+	.datafwsratio0 = MT41K256M16HA125E_PHY_FIFO_WE,
-+	.datawrsratio0 = MT41K256M16HA125E_PHY_WR_DATA,
-+};
-+
-+static const struct cmd_control ddr3_chilisom_gcs2_cmd_ctrl_data = {
-+	.cmd0csratio = MT41K256M16HA125E_RATIO,
-+	.cmd0iclkout = MT41K256M16HA125E_INVERT_CLKOUT,
-+
-+	.cmd1csratio = MT41K256M16HA125E_RATIO,
-+	.cmd1iclkout = MT41K256M16HA125E_INVERT_CLKOUT,
-+
-+	.cmd2csratio = MT41K256M16HA125E_RATIO,
-+	.cmd2iclkout = MT41K256M16HA125E_INVERT_CLKOUT,
-+};
-+
-+static struct emif_regs ddr3_chilisom_gcs2_emif_reg_data = {
-+	.sdram_config = MT41K256M16HA125E_EMIF_SDCFG,
-+	.ref_ctrl = MT41K256M16HA125E_EMIF_SDREF,
-+	.sdram_tim1 = MT41K256M16HA125E_EMIF_TIM1,
-+	.sdram_tim2 = MT41K256M16HA125E_EMIF_TIM2,
-+	.sdram_tim3 = MT41K256M16HA125E_EMIF_TIM3,
-+	.zq_config = MT41K256M16HA125E_ZQ_CFG,
-+	.emif_ddr_phy_ctlr_1 = MT41K256M16HA125E_EMIF_READ_LATENCY,
-+};
-+
-+#ifdef CONFIG_SPL_OS_BOOT
-+int spl_start_uboot(void)
-+{
-+	/* break into full u-boot on 'c' */
-+	if (serial_tstc() && serial_getc() == 'c')
-+		return 1;
-+
-+#ifdef CONFIG_SPL_ENV_SUPPORT
-+	env_init();
-+	env_relocate_spec();
-+	if (getenv_yesno("boot_os") != 1)
-+		return 1;
-+#endif
-+
-+	return 0;
-+}
-+#endif
-+
-+#define OSC	(V_OSCK/1000000)
-+const struct dpll_params dpll_ddr_chilisom_gcs1 = {
-+		266, OSC-1, 1, -1, -1, -1, -1};
-+const struct dpll_params dpll_ddr_chilisom_gcs2 = {
-+		400, OSC-1, 1, -1, -1, -1, -1};
-+
-+void am33xx_spl_board_init(void)
-+{
-+	int mpu_vdd;
-+
-+	dpll_mpu_opp100.m = am335x_get_efuse_mpu_max_freq(cdev);
-+
-+	int usb_cur_lim;
-+
-+	if (i2c_probe(TPS65217_CHIP_PM))
-+		return;
-+
-+	uchar pmic_status_reg;
-+	if (tps65217_reg_read(TPS65217_STATUS, &pmic_status_reg))
-+		return;
-+	if (!(pmic_status_reg & TPS65217_PWR_SRC_AC_BITMASK)) {
-+		puts("No AC power, disabling frequency switch\n");
-+		return;
-+	}
-+
-+	/*
-+	 * Increase USB current limit to 1300mA or 1800mA and set
-+	 * the MPU voltage controller as needed.
-+	 */
-+	if (dpll_mpu_opp100.m == MPUPLL_M_1000) {
-+		usb_cur_lim = TPS65217_USB_INPUT_CUR_LIMIT_1800MA;
-+		mpu_vdd = TPS65217_DCDC_VOLT_SEL_1325MV;
-+	} else {
-+		usb_cur_lim = TPS65217_USB_INPUT_CUR_LIMIT_1300MA;
-+		mpu_vdd = TPS65217_DCDC_VOLT_SEL_1275MV;
-+	}
-+
-+	if (tps65217_reg_write(TPS65217_PROT_LEVEL_NONE,
-+			       TPS65217_POWER_PATH,
-+			       usb_cur_lim,
-+			       TPS65217_USB_INPUT_CUR_LIMIT_MASK))
-+		puts("tps65217_reg_write failure\n");
-+
-+	/* Set DCDC3 (CORE) voltage to 1.125V */
-+	if (tps65217_voltage_update(TPS65217_DEFDCDC3,
-+				    TPS65217_DCDC_VOLT_SEL_1125MV)) {
-+		puts("tps65217_voltage_update failure\n");
-+		return;
-+	}
-+
-+	do_setup_dpll(&dpll_core_regs, &dpll_core_opp100);
-+	if (tps65217_voltage_update(TPS65217_DEFDCDC2, mpu_vdd)) {
-+		puts("tps65217_voltage_update failure\n");
-+		return;
-+	}
-+
-+	/* Set LDO3, LDO4 output voltage to 3.3V for GCS1.
-+	 * Set LDO3 to 1.8V and LDO4 to 3.3V for GCS2. */
-+
-+	#ifdef CONFIG_CHILISOM_GCS2
-+		if (tps65217_reg_write(TPS65217_PROT_LEVEL_2,
-+				       TPS65217_DEFLS1,
-+				       TPS65217_LDO_VOLTAGE_OUT_1_8,
-+				       TPS65217_LDO_MASK))
-+			puts("tps65217_reg_write failure\n");
-+		if (tps65217_reg_write(TPS65217_PROT_LEVEL_2,
-+				       TPS65217_DEFLS2,
-+				       TPS65217_LDO_VOLTAGE_OUT_3_3,
-+				       TPS65217_LDO_MASK))
-+			puts("tps65217_reg_write failure\n");
-+	#else
-+
-+		if (tps65217_reg_write(TPS65217_PROT_LEVEL_2,
-+				       TPS65217_DEFLS1,
-+				       TPS65217_LDO_VOLTAGE_OUT_3_3,
-+				       TPS65217_LDO_MASK))
-+			puts("tps65217_reg_write failure\n");
-+		if (tps65217_reg_write(TPS65217_PROT_LEVEL_2,
-+				       TPS65217_DEFLS2,
-+				       TPS65217_LDO_VOLTAGE_OUT_3_3,
-+				       TPS65217_LDO_MASK))
-+			puts("tps65217_reg_write failure\n");
-+	#endif
-+
-+	do_setup_dpll(&dpll_mpu_regs, &dpll_mpu_opp100);
-+}
-+
-+const struct dpll_params *get_dpll_ddr_params(void)
-+{
-+	enable_i2c0_pin_mux();
-+	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
-+
-+#ifndef CONFIG_CHILISOM_GCS2
-+	return &dpll_ddr_chilisom_gcs1;
-+#else
-+	return &dpll_ddr_chilisom_gcs2;
-+#endif
-+}
-+
-+void set_uart_mux_conf(void)
-+{
-+#ifdef CONFIG_SERIAL1
-+	enable_uart0_pin_mux();
-+#endif /* CONFIG_SERIAL1 */
-+}
-+
-+void set_mux_conf_regs(void)
-+{
-+	enable_board_pin_mux();
-+}
-+
-+const struct ctrl_ioregs ioregs_chilisom_gcs1 = {
-+	.cm0ioctl		= MT47H128M16RT25E_IOCTRL_VALUE,
-+	.cm1ioctl		= MT47H128M16RT25E_IOCTRL_VALUE,
-+	.cm2ioctl		= MT47H128M16RT25E_IOCTRL_VALUE,
-+	.dt0ioctl		= MT47H128M16RT25E_IOCTRL_VALUE,
-+	.dt1ioctl		= MT47H128M16RT25E_IOCTRL_VALUE,
-+};
-+
-+const struct ctrl_ioregs ioregs_chilisom_gcs2 = {
-+	.cm0ioctl		= MT41K256M16HA125E_IOCTRL_VALUE,
-+	.cm1ioctl		= MT41K256M16HA125E_IOCTRL_VALUE,
-+	.cm2ioctl		= MT41K256M16HA125E_IOCTRL_VALUE,
-+	.dt0ioctl		= MT41K256M16HA125E_IOCTRL_VALUE,
-+	.dt1ioctl		= MT41K256M16HA125E_IOCTRL_VALUE,
-+};
-+
-+void sdram_init(void)
-+{
-+#ifndef CONFIG_CHILISOM_GCS2
-+	config_ddr(266, &ioregs_chilisom_gcs1,
-+		   &ddr2_chilisom_gcs1_data,
-+		   &ddr2_chilisom_gcs1_cmd_ctrl_data,
-+		   &ddr2_chilisom_gcs1_emif_reg_data, 0);
-+#else
-+	config_ddr(400, &ioregs_chilisom_gcs2,
-+		   &ddr3_chilisom_gcs2_data,
-+		   &ddr3_chilisom_gcs2_cmd_ctrl_data,
-+		   &ddr3_chilisom_gcs2_emif_reg_data, 0);
-+#endif
-+}
-+#endif
-+
-+/*
-+ * Basic board specific setup.  Pinmux has been handled already.
-+ */
-+int board_init(void)
-+{
-+#if defined(CONFIG_HW_WATCHDOG)
-+	hw_watchdog_init();
-+#endif
-+
-+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
-+#if defined(CONFIG_NOR) || defined(CONFIG_NAND)
-+	gpmc_init();
-+#endif
-+	return 0;
-+}
-+
-+#ifdef CONFIG_BOARD_LATE_INIT
-+int board_late_init(void)
-+{
-+#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-+	char safe_string[HDR_NAME_LEN + 1];
-+
-+	/* Now set variables based on the header. */
-+	strncpy(safe_string, (char *)"CHILISOM", 8);
-+	safe_string[8] = 0;
-+	setenv("board_name", safe_string);
-+
-+#ifndef CONFIG_CHILISOM_GCS2
-+	strncpy(safe_string, (char *)"1.1", 3);
-+	safe_string[3] = 0;
-+	setenv("board_rev", safe_string);
-+#else
-+	strncpy(safe_string, (char *)"2.2", 3);
-+	safe_string[3] = 0;
-+	setenv("board_rev", safe_string);
-+#endif
-+#endif
-+	return 0;
-+}
-+#endif
-+
-+#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
-+	(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
-+static void cpsw_control(int enabled)
-+{
-+	/* VTP can be added here */
-+
-+	return;
-+}
-+
-+static struct cpsw_slave_data cpsw_slaves[] = {
-+	{
-+		.slave_reg_ofs	= 0x208,
-+		.sliver_reg_ofs	= 0xd80,
-+		.phy_addr	= 0,
-+	},
-+	{
-+		.slave_reg_ofs	= 0x308,
-+		.sliver_reg_ofs	= 0xdc0,
-+		.phy_addr	= 1,
-+	},
-+};
-+
-+static struct cpsw_platform_data cpsw_data = {
-+	.mdio_base		= CPSW_MDIO_BASE,
-+	.cpsw_base		= CPSW_BASE,
-+	.mdio_div		= 0xff,
-+	.channels		= 8,
-+	.cpdma_reg_ofs		= 0x800,
-+	.slaves			= 1,
-+	.slave_data		= cpsw_slaves,
-+	.ale_reg_ofs		= 0xd00,
-+	.ale_entries		= 1024,
-+	.host_port_reg_ofs	= 0x108,
-+	.hw_stats_reg_ofs	= 0x900,
-+	.bd_ram_ofs		= 0x2000,
-+	.mac_control		= (1 << 5),
-+	.control		= cpsw_control,
-+	.host_port_num		= 0,
-+	.version		= CPSW_CTRL_VERSION_2,
-+};
-+#endif
-+
-+/*
-+ * This function will:
-+ * Read the eFuse for MAC addresses, and set ethaddr/eth1addr/usbnet_devaddr
-+ * in the environment
-+ * Perform fixups to the PHY present on certain boards.  We only need this
-+ * function in:
-+ * - SPL with either CPSW or USB ethernet support
-+ * - Full U-Boot, with either CPSW or USB ethernet
-+ * Build in only these cases to avoid warnings about unused variables
-+ * when we build an SPL that has neither option but full U-Boot will.
-+ */
-+
-+#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \
-+		&& defined(CONFIG_SPL_BUILD)) || \
-+	((defined(CONFIG_DRIVER_TI_CPSW) || \
-+	  defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \
-+	 !defined(CONFIG_SPL_BUILD))
-+int board_eth_init(bd_t *bis)
-+{
-+	int rv, n = 0;
-+	uint8_t mac_addr[6];
-+	uint32_t mac_hi, mac_lo;
-+
-+	/* try reading mac address from efuse */
-+	mac_lo = readl(&cdev->macid0l);
-+	mac_hi = readl(&cdev->macid0h);
-+	mac_addr[0] = mac_hi & 0xFF;
-+	mac_addr[1] = (mac_hi & 0xFF00) >> 8;
-+	mac_addr[2] = (mac_hi & 0xFF0000) >> 16;
-+	mac_addr[3] = (mac_hi & 0xFF000000) >> 24;
-+	mac_addr[4] = mac_lo & 0xFF;
-+	mac_addr[5] = (mac_lo & 0xFF00) >> 8;
-+
-+#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \
-+	(defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD))
-+	if (!getenv("ethaddr")) {
-+		printf("<ethaddr> not set. Validating first E-fuse MAC\n");
-+
-+		if (is_valid_ether_addr(mac_addr))
-+			eth_setenv_enetaddr("ethaddr", mac_addr);
-+	}
-+
-+#ifdef CONFIG_DRIVER_TI_CPSW
-+
-+	mac_lo = readl(&cdev->macid1l);
-+	mac_hi = readl(&cdev->macid1h);
-+	mac_addr[0] = mac_hi & 0xFF;
-+	mac_addr[1] = (mac_hi & 0xFF00) >> 8;
-+	mac_addr[2] = (mac_hi & 0xFF0000) >> 16;
-+	mac_addr[3] = (mac_hi & 0xFF000000) >> 24;
-+	mac_addr[4] = mac_lo & 0xFF;
-+	mac_addr[5] = (mac_lo & 0xFF00) >> 8;
-+
-+	if (!getenv("eth1addr")) {
-+		if (is_valid_ether_addr(mac_addr))
-+			eth_setenv_enetaddr("eth1addr", mac_addr);
-+	}
-+
-+	/* writel(MII_MODE_ENABLE, &cdev->miisel); */
-+	writel(RMII_MODE_ENABLE | RMII_CHIPCKL_ENABLE, &cdev->miisel);
-+
-+	cpsw_slaves[0].phy_if = cpsw_slaves[1].phy_if = PHY_INTERFACE_MODE_RMII;
-+
-+	rv = cpsw_register(&cpsw_data);
-+	if (rv < 0)
-+		printf("Error %d registering CPSW switch\n", rv);
-+	else
-+		n += rv;
-+#endif
-+#endif
-+#if defined(CONFIG_USB_ETHER) && \
-+	(!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT))
-+	if (is_valid_ether_addr(mac_addr))
-+		eth_setenv_enetaddr("usbnet_devaddr", mac_addr);
-+
-+	rv = usb_eth_initialize(bis);
-+	if (rv < 0)
-+		printf("Error %d registering USB_ETHER\n", rv);
-+	else
-+		n += rv;
-+#endif
-+	return n;
-+}
-+#endif
-diff --git a/board/grinn/chiliboard/board.h b/board/grinn/chiliboard/board.h
-new file mode 100644
-index 0000000..6753e74
---- /dev/null
-+++ b/board/grinn/chiliboard/board.h
-@@ -0,0 +1,20 @@
-+/*
-+ * board.h
-+ *
-+ * Grinn AM335x boards information header
-+ *
-+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
-+ *
-+ * Copyright (C) 2015, Grinn - http://www.grinn-global.com
-+ * Grzegorz Glomb, g.glomb@grinn-global.com
-+ *
-+ * SPDX-License-Identifier:	GPL-2.0+
-+ */
-+
-+#ifndef _BOARD_H_
-+#define _BOARD_H_
-+
-+void enable_uart0_pin_mux(void);
-+void enable_i2c0_pin_mux(void);
-+void enable_board_pin_mux(void);
-+#endif
-diff --git a/board/grinn/chiliboard/mux.c b/board/grinn/chiliboard/mux.c
-new file mode 100644
-index 0000000..644f211
---- /dev/null
-+++ b/board/grinn/chiliboard/mux.c
-@@ -0,0 +1,99 @@
-+/*
-+ * mux.c
-+ *
-+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
-+ *
-+ * Copyright (C) 2015, Grinn - http://www.grinn-global.com
-+ * Grzegorz Glomb, g.glomb@grinn-global.com
-+ *
-+ * SPDX-License-Identifier:	GPL-2.0+
-+ */
-+
-+#include <common.h>
-+#include <asm/arch/sys_proto.h>
-+#include <asm/arch/hardware.h>
-+#include <asm/arch/mux.h>
-+#include <asm/io.h>
-+#include <i2c.h>
-+#include "board.h"
-+
-+static struct module_pin_mux uart0_pin_mux[] = {
-+	{OFFSET(uart0_rxd), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* UART0_RXD */
-+	{OFFSET(uart0_txd), (MODE(0) | PULLUDEN)},		/* UART0_TXD */
-+	{-1},
-+};
-+
-+static struct module_pin_mux mmc0_pin_mux[] = {
-+	{OFFSET(mmc0_dat3), (MODE(0) | RXACTIVE | PULLUP_EN)},	/* MMC0_DAT3 */
-+	{OFFSET(mmc0_dat2), (MODE(0) | RXACTIVE | PULLUP_EN)},	/* MMC0_DAT2 */
-+	{OFFSET(mmc0_dat1), (MODE(0) | RXACTIVE | PULLUP_EN)},	/* MMC0_DAT1 */
-+	{OFFSET(mmc0_dat0), (MODE(0) | RXACTIVE | PULLUP_EN)},	/* MMC0_DAT0 */
-+	{OFFSET(mmc0_clk), (MODE(0) | RXACTIVE | PULLUP_EN)},	/* MMC0_CLK */
-+	{OFFSET(mmc0_cmd), (MODE(0) | RXACTIVE | PULLUP_EN)},	/* MMC0_CMD */
-+	{-1},
-+};
-+
-+static struct module_pin_mux i2c0_pin_mux[] = {
-+	{OFFSET(i2c0_sda), (MODE(0) | RXACTIVE |
-+			PULLUDEN | SLEWCTRL)}, /* I2C_DATA */
-+	{OFFSET(i2c0_scl), (MODE(0) | RXACTIVE |
-+			PULLUDEN | SLEWCTRL)}, /* I2C_SCLK */
-+	{-1},
-+};
-+
-+static struct module_pin_mux rmii1_pin_mux[] = {
-+	{OFFSET(mii1_crs), MODE(1) | RXACTIVE},		/* RMII1_CRS */
-+	{OFFSET(mii1_rxerr), MODE(1) | RXACTIVE},	/* RMII1_RXERR */
-+	{OFFSET(mii1_txen), MODE(1)},			/* RMII1_TXEN */
-+	{OFFSET(mii1_txd1), MODE(1)},			/* RMII1_TXD1 */
-+	{OFFSET(mii1_txd0), MODE(1)},			/* RMII1_TXD0 */
-+	{OFFSET(mii1_rxd1), MODE(1) | RXACTIVE},	/* RMII1_RXD1 */
-+	{OFFSET(mii1_rxd0), MODE(1) | RXACTIVE},	/* RMII1_RXD0 */
-+	{OFFSET(mdio_data), MODE(0) | RXACTIVE | PULLUP_EN}, /* MDIO_DATA */
-+	{OFFSET(mdio_clk), MODE(0) | PULLUP_EN},	/* MDIO_CLK */
-+	{OFFSET(rmii1_refclk), MODE(0) | RXACTIVE},	/* RMII1_REFCLK */
-+	{-1},
-+};
-+
-+static struct module_pin_mux nand_pin_mux[] = {
-+	{OFFSET(gpmc_ad0), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD0 */
-+	{OFFSET(gpmc_ad1), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD1 */
-+	{OFFSET(gpmc_ad2), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD2 */
-+	{OFFSET(gpmc_ad3), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD3 */
-+	{OFFSET(gpmc_ad4), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD4 */
-+	{OFFSET(gpmc_ad5), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD5 */
-+	{OFFSET(gpmc_ad6), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD6 */
-+	{OFFSET(gpmc_ad7), (MODE(0) | PULLUP_EN | RXACTIVE)},	/* NAND AD7 */
-+	{OFFSET(gpmc_wait0), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* NAND WAIT */
-+	{OFFSET(gpmc_wpn), (MODE(7) | PULLUP_EN | RXACTIVE)},	/* NAND_WPN */
-+	{OFFSET(gpmc_csn0), (MODE(0) | PULLUDEN)},	/* NAND_CS0 */
-+	{OFFSET(gpmc_advn_ale), (MODE(0) | PULLUDEN)}, /* NAND_ADV_ALE */
-+	{OFFSET(gpmc_oen_ren), (MODE(0) | PULLUDEN)},	/* NAND_OE */
-+	{OFFSET(gpmc_wen), (MODE(0) | PULLUDEN)},	/* NAND_WEN */
-+	{OFFSET(gpmc_be0n_cle), (MODE(0) | PULLUDEN)},	/* NAND_BE_CLE */
-+	{-1},
-+};
-+
-+void enable_uart0_pin_mux(void)
-+{
-+	configure_module_pin_mux(uart0_pin_mux);
-+}
-+
-+void enable_i2c0_pin_mux(void)
-+{
-+	configure_module_pin_mux(i2c0_pin_mux);
-+}
-+
-+void enable_board_pin_mux(void)
-+{
-+	/* chiliboard pinmux */
-+	configure_module_pin_mux(rmii1_pin_mux);
-+	configure_module_pin_mux(nand_pin_mux);
-+	configure_module_pin_mux(mmc0_pin_mux);
-+
-+#ifndef CONFIG_CHILISOM_GCS2
-+	puts("Configuration for Chilisom GCS1\n");
-+#else
-+	puts("Configuration for Chilisom GCS2\n");
-+#endif
-+}
-diff --git a/board/grinn/chiliboard/u-boot.lds b/board/grinn/chiliboard/u-boot.lds
-new file mode 100644
-index 0000000..bf70d88
---- /dev/null
-+++ b/board/grinn/chiliboard/u-boot.lds
-@@ -0,0 +1,131 @@
-+/*
-+ * Copyright (c) 2004-2008 Texas Instruments
-+ *
-+ * (C) Copyright 2002
-+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
-+ *
-+ * Copyright (C) 2015, Grinn - http://www.grinn-global.com
-+ * Grzegorz Glomb, g.glomb@grinn-global.com
-+ *
-+ * See file CREDITS for list of people who contributed to this
-+ * project.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation; either version 2 of
-+ * the License, or (at your option) any later version.
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program; if not, write to the Free Software
-+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-+ * MA 02111-1307 USA
-+ */
-+
-+OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-+OUTPUT_ARCH(arm)
-+ENTRY(_start)
-+SECTIONS
-+{
-+	. = 0x00000000;
-+
-+	. = ALIGN(4);
-+	.text :
-+	{
-+		*(.__image_copy_start)
-+		*(.vectors)
-+		CPUDIR/start.o (.text*)
-+		board/grinn/chiliboard/built-in.o (.text*)
-+		*(.text*)
-+	}
-+
-+	. = ALIGN(4);
-+	.rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) }
-+
-+	. = ALIGN(4);
-+	.data : {
-+		*(.data*)
-+	}
-+
-+	. = ALIGN(4);
-+
-+	. = .;
-+
-+	. = ALIGN(4);
-+	.u_boot_list : {
-+		KEEP(*(SORT(.u_boot_list*)));
-+	}
-+
-+	. = ALIGN(4);
-+
-+	.image_copy_end :
-+	{
-+		*(.__image_copy_end)
-+	}
-+
-+	.rel_dyn_start :
-+	{
-+		*(.__rel_dyn_start)
-+	}
-+
-+	.rel.dyn : {
-+		*(.rel*)
-+	}
-+
-+	.rel_dyn_end :
-+	{
-+		*(.__rel_dyn_end)
-+	}
-+
-+	.hash : { *(.hash*) }
-+
-+	.end :
-+	{
-+		*(.__end)
-+	}
-+
-+	_image_binary_end = .;
-+
-+	/*
-+	 * Deprecated: this MMU section is used by pxa at present but
-+	 * should not be used by new boards/CPUs.
-+	 */
-+	. = ALIGN(4096);
-+	.mmutable : {
-+		*(.mmutable)
-+	}
-+
-+/*
-+ * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c
-+ * __bss_base and __bss_limit are for linker only (overlay ordering)
-+ */
-+
-+	.bss_start __rel_dyn_start (OVERLAY) : {
-+		KEEP(*(.__bss_start));
-+		__bss_base = .;
-+	}
-+
-+	.bss __bss_base (OVERLAY) : {
-+		*(.bss*)
-+		 . = ALIGN(4);
-+		 __bss_limit = .;
-+	}
-+
-+	.bss_end __bss_limit (OVERLAY) : {
-+		KEEP(*(.__bss_end));
-+	}
-+
-+	.dynsym _image_binary_end : { *(.dynsym) }
-+	.dynbss : { *(.dynbss) }
-+	.dynstr : { *(.dynstr*) }
-+	.dynamic : { *(.dynamic*) }
-+	.gnu.hash : { *(.gnu.hash) }
-+	.plt : { *(.plt*) }
-+	.interp : { *(.interp*) }
-+	.gnu : { *(.gnu*) }
-+	.ARM.exidx : { *(.ARM.exidx*) }
-+}
-diff --git a/boards.cfg b/boards.cfg
-index 1ba2081..b432704 100644
---- a/boards.cfg
-+++ b/boards.cfg
-@@ -258,6 +258,11 @@ Active  arm         armv7          am33xx      BuR             tseries
- Active  arm         armv7          am33xx      BuR             tseries             tseries_nand                          tseries:SERIAL1,CONS_INDEX=1,NAND                                                                                                 Hannes Petermaier <hannes.petermaier@br-automation.com>
- Active  arm         armv7          am33xx      BuR             tseries             tseries_spi                           tseries:SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT                                                                                   Hannes Petermaier <hannes.petermaier@br-automation.com>
- Active  arm         armv7          am33xx      compulab        cm_t335             cm_t335                               -                                                                                                                                 Igor Grinberg <grinberg@compulab.co.il>
-+Active  arm         armv7          am33xx      grinn           chiliboard          chiliboard_ram128m                    chiliboard:CHILISOM_GCS2,NAND,RAM128MB                                                                                            Grzegorz Glomb <g.glomb@grinn-global.com>
-+Active  arm         armv7          am33xx      grinn           chiliboard          chiliboard_nand0m_ram128m             chiliboard:CHILISOM_GCS2,RAM128MB                                                                                                 Grzegorz Glomb <g.glomb@grinn-global.com>
-+Active  arm         armv7          am33xx      grinn           chiliboard          chiliboard_nand512m                   chiliboard:CHILISOM_GCS2,NAND,NAND512MB                                                                                           Grzegorz Glomb <g.glomb@grinn-global.com>
-+Active  arm         armv7          am33xx      grinn           chiliboard          chiliboard_nand0m                     chiliboard:CHILISOM_GCS2                                                                                                          Grzegorz Glomb <g.glomb@grinn-global.com>
-+Active  arm         armv7          am33xx      grinn           chiliboard          chiliboard                            chiliboard:CHILISOM_GCS2,NAND                                                                                                     Grzegorz Glomb <g.glomb@grinn-global.com>
- Active  arm         armv7          am33xx      gumstix         pepper              pepper                                -                                                                                                                                 Ash Charles <ash@gumstix.com>
- Active  arm         armv7          am33xx      isee            igep0033            am335x_igep0033                       -                                                                                                                                 Enric Balletbo i Serra <eballetbo@iseebcn.com>
- Active  arm         armv7          am33xx      phytec          pcm051              pcm051_rev1                           pcm051:REV1                                                                                                                       Lars Poeschel <poeschel@lemonage.de>
-diff --git a/drivers/mtd/nand/omap_gpmc.c b/drivers/mtd/nand/omap_gpmc.c
-index 1acf06b..0c9cde3 100644
---- a/drivers/mtd/nand/omap_gpmc.c
-+++ b/drivers/mtd/nand/omap_gpmc.c
-@@ -478,11 +478,13 @@ static int omap_read_page_bch(struct mtd_info *mtd, struct nand_chip *chip,
- 				oob += eccbytes) {
- 		chip->ecc.hwctl(mtd, NAND_ECC_READ);
- 		/* read data */
--		chip->cmdfunc(mtd, NAND_CMD_RNDOUT, data_pos, page);
-+		/* chip->cmdfunc(mtd, NAND_CMD_RNDOUT, data_pos, page); */
-+		chip->cmdfunc(mtd, NAND_CMD_RNDOUT, data_pos, -1);
- 		chip->read_buf(mtd, p, eccsize);
- 
- 		/* read respective ecc from oob area */
--		chip->cmdfunc(mtd, NAND_CMD_RNDOUT, oob_pos, page);
-+		/* chip->cmdfunc(mtd, NAND_CMD_RNDOUT, oob_pos, page); */
-+		chip->cmdfunc(mtd, NAND_CMD_RNDOUT, oob_pos, -1);
- 		chip->read_buf(mtd, oob, eccbytes);
- 		/* read syndrome */
- 		chip->ecc.calculate(mtd, p, &ecc_calc[i]);
-diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h
-new file mode 100644
-index 0000000..eacc9af
---- /dev/null
-+++ b/include/configs/chiliboard.h
-@@ -0,0 +1,878 @@
-+/*
-+ * chiliboard.h
-+ *
-+ * Grinn chiliboard configuration header
-+ *
-+ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/
-+ *
-+ * Copyright (C) 2015, Grinn - http://www.grinn-global.com
-+ * Grzegorz Glomb, g.glomb@grinn-global.com
-+ *
-+ * SPDX-License-Identifier:	GPL-2.0+
-+ */
-+
-+#ifndef __CONFIG_CHILIBOARD_H
-+#define __CONFIG_CHILIBOARD_H
-+
-+#define CONFIG_AM33XX
-+#define CONFIG_ARCH_CPU_INIT
-+#define CONFIG_SYS_CACHELINE_SIZE       64
-+#define CONFIG_MAX_RAM_BANK_SIZE	(1024 << 20)	/* 1GB */
-+#define CONFIG_SYS_TIMERBASE		0x48040000	/* Use Timer2 */
-+#define CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC
-+
-+#include <asm/arch/omap.h>
-+
-+/* NS16550 Configuration */
-+#define CONFIG_SYS_NS16550
-+#define CONFIG_SYS_NS16550_SERIAL
-+#define CONFIG_SYS_NS16550_REG_SIZE	(-4)
-+#define CONFIG_SYS_NS16550_CLK		48000000
-+
-+/* Network defines. */
-+#define CONFIG_CMD_NET			/* 'bootp' and 'tftp' */
-+#define CONFIG_CMD_DHCP
-+#define CONFIG_CMD_MII
-+#define CONFIG_BOOTP_DNS		/* Configurable parts of CMD_DHCP */
-+#define CONFIG_BOOTP_DNS2
-+#define CONFIG_BOOTP_SEND_HOSTNAME
-+#define CONFIG_BOOTP_GATEWAY
-+#define CONFIG_BOOTP_SUBNETMASK
-+#define CONFIG_NET_RETRY_COUNT         10
-+#define CONFIG_CMD_PING
-+#define CONFIG_DRIVER_TI_CPSW		/* Driver for IP block */
-+#define CONFIG_MII			/* Required in net/eth.c */
-+
-+/*
-+ * RTC related defines. To use bootcount you must set bootlimit in the
-+ * environment to a non-zero value and enable CONFIG_BOOTCOUNT_LIMIT
-+ * in the board config.
-+ */
-+#define CONFIG_SYS_BOOTCOUNT_ADDR	0x44E3E000
-+
-+/* Enable the HW watchdog, since we can use this with bootcount */
-+#define CONFIG_HW_WATCHDOG
-+#define CONFIG_OMAP_WATCHDOG
-+
-+/*
-+ * SPL related defines.  The Public RAM memory map the ROM defines the
-+ * area between 0x402F0400 and 0x4030B800 as a download area and
-+ * 0x4030B800 to 0x4030CE00 as a public stack area.  The ROM also
-+ * supports X-MODEM loading via UART, and we leverage this and then use
-+ * Y-MODEM to load u-boot.img, when booted over UART.
-+ */
-+#define CONFIG_SPL_TEXT_BASE		0x402F0400
-+#define CONFIG_SPL_MAX_SIZE		(0x4030B800 - CONFIG_SPL_TEXT_BASE)
-+#define CONFIG_SYS_SPL_ARGS_ADDR	(CONFIG_SYS_SDRAM_BASE + \
-+					 (128 << 20))
-+
-+/* Enable the watchdog inside of SPL */
-+#define CONFIG_SPL_WATCHDOG_SUPPORT
-+
-+/*
-+ * Since SPL did pll and ddr initialization for us,
-+ * we don't need to do it twice.
-+ */
-+#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_NOR_BOOT)
-+#define CONFIG_SKIP_LOWLEVEL_INIT
-+#endif
-+
-+/*
-+ * When building U-Boot such that there is no previous loader
-+ * we need to call board_early_init_f.  This is taken care of in
-+ * s_init when we have SPL used.
-+ */
-+#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && !defined(CONFIG_SPL)
-+#define CONFIG_BOARD_EARLY_INIT_F
-+#endif
-+
-+#ifdef CONFIG_NAND
-+#define CONFIG_SPL_NAND_AM33XX_BCH	/* ELM support */
-+#endif
-+
-+/* Common define for many platforms. */
-+#define CONFIG_OMAP
-+#define CONFIG_OMAP_COMMON
-+#define CONFIG_SYS_GENERIC_BOARD
-+
-+/*
-+ * We typically do not contain NOR flash.  In the cases where we do, we
-+ * undefine this later.
-+ */
-+#define CONFIG_SYS_NO_FLASH
-+
-+/* Support both device trees and ATAGs. */
-+#define CONFIG_OF_LIBFDT
-+#define CONFIG_CMDLINE_TAG
-+#define CONFIG_SETUP_MEMORY_TAGS
-+#define CONFIG_INITRD_TAG
-+
-+/*
-+ * Our DDR memory always starts at 0x80000000 and U-Boot shall have
-+ * relocated itself to higher in memory by the time this value is used.
-+ * However, set this to a 32MB offset to allow for easier Linux kernel
-+ * booting as the default is often used as the kernel load address.
-+ */
-+#define CONFIG_SYS_LOAD_ADDR		0x82000000
-+
-+/*
-+ * We setup defaults based on constraints from the Linux kernel, which should
-+ * also be safe elsewhere.  We have the default load at 32MB into DDR (for
-+ * the kernel), FDT above 128MB (the maximum location for the end of the
-+ * kernel), and the ramdisk 512KB above that (allowing for hopefully never
-+ * seen large trees).  We say all of this must be within the first 256MB
-+ * as that will normally be within the kernel lowmem and thus visible via
-+ * bootm_size and we only run on platforms with 256MB or more of memory.
-+ */
-+#ifdef CONFIG_RAM128MB
-+#define DEFAULT_LINUX_BOOT_ENV \
-+	"loadaddr=0x82000000\0" \
-+	"kernel_addr_r=0x82000000\0" \
-+	"fdtaddr=0x84000000\0" \
-+	"fdt_addr_r=0x84000000\0" \
-+	"rdaddr=0x84080000\0" \
-+	"ramdisk_addr_r=0x84080000\0" \
-+	"bootm_size=0x8000000\0"
-+#else
-+#define DEFAULT_LINUX_BOOT_ENV \
-+	"loadaddr=0x82000000\0" \
-+	"kernel_addr_r=0x82000000\0" \
-+	"fdtaddr=0x88000000\0" \
-+	"fdt_addr_r=0x88000000\0" \
-+	"rdaddr=0x88080000\0" \
-+	"ramdisk_addr_r=0x88080000\0" \
-+	"bootm_size=0x10000000\0"
-+#endif
-+
-+/*
-+ * Default to a quick boot delay.
-+ */
-+#define CONFIG_BOOTDELAY		1
-+
-+/*
-+ * DDR information.  If the CONFIG_NR_DRAM_BANKS is not defined,
-+ * we say (for simplicity) that we have 1 bank, always, even when
-+ * we have more.  We always start at 0x80000000, and we place the
-+ * initial stack pointer in our SRAM. Otherwise, we can define
-+ * CONFIG_NR_DRAM_BANKS before including this file.
-+ */
-+#ifndef CONFIG_NR_DRAM_BANKS
-+#define CONFIG_NR_DRAM_BANKS		1
-+#endif
-+#define CONFIG_SYS_SDRAM_BASE		0x80000000
-+#define CONFIG_SYS_INIT_SP_ADDR         (NON_SECURE_SRAM_END - \
-+						GENERATED_GBL_DATA_SIZE)
-+
-+/* Timer information. */
-+#define CONFIG_SYS_PTV			2	/* Divisor: 2^(PTV+1) => 8 */
-+
-+/* I2C IP block */
-+#define CONFIG_I2C
-+#define CONFIG_CMD_I2C
-+#define CONFIG_SYS_I2C
-+#define CONFIG_SYS_OMAP24_I2C_SPEED	100000
-+#define CONFIG_SYS_OMAP24_I2C_SLAVE	1
-+#define CONFIG_SYS_I2C_OMAP24XX
-+
-+/* MMC/SD IP block */
-+#define CONFIG_MMC
-+#define CONFIG_GENERIC_MMC
-+#define CONFIG_OMAP_HSMMC
-+#define CONFIG_CMD_MMC
-+
-+/* McSPI IP block */
-+#define CONFIG_SPI
-+#define CONFIG_OMAP3_SPI
-+#define CONFIG_CMD_SPI
-+
-+/* GPIO block */
-+#define CONFIG_OMAP_GPIO
-+#define CONFIG_CMD_GPIO
-+
-+/*
-+ * GPMC NAND block.  We support 1 device and the physical address to
-+ * access CS0 at is 0x8000000.
-+ */
-+#ifdef CONFIG_NAND
-+#define CONFIG_NAND_OMAP_GPMC
-+#ifndef CONFIG_SYS_NAND_BASE
-+#define CONFIG_SYS_NAND_BASE		0x8000000
-+#endif
-+#define CONFIG_SYS_MAX_NAND_DEVICE	1
-+#define CONFIG_CMD_NAND
-+#endif
-+
-+/*
-+ * The following are general good-enough settings for U-Boot.  We set a
-+ * large malloc pool as we generally have a lot of DDR, and we opt for
-+ * function over binary size in the main portion of U-Boot as this is
-+ * generally easily constrained later if needed.  We enable the config
-+ * options that give us information in the environment about what board
-+ * we are on so we do not need to rely on the command prompt.  We set a
-+ * console baudrate of 115200 and use the default baud rate table.
-+ */
-+#define CONFIG_SYS_MALLOC_LEN		(16 << 20)
-+#define CONFIG_SYS_HUSH_PARSER
-+#define CONFIG_SYS_PROMPT		"U-Boot# "
-+#define CONFIG_SYS_CONSOLE_INFO_QUIET
-+#define CONFIG_BAUDRATE			115200
-+#define CONFIG_ENV_VARS_UBOOT_CONFIG	/* Strongly encouraged */
-+#define CONFIG_ENV_OVERWRITE		/* Overwrite ethaddr / serial# */
-+
-+/* As stated above, the following choices are optional. */
-+#define CONFIG_SYS_LONGHELP
-+#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_CMDLINE_EDITING
-+#define CONFIG_VERSION_VARIABLE
-+
-+/* We set the max number of command args high to avoid HUSH bugs. */
-+#define CONFIG_SYS_MAXARGS		64
-+
-+/* Console I/O Buffer Size */
-+#define CONFIG_SYS_CBSIZE		512
-+/* Print Buffer Size */
-+#define CONFIG_SYS_PBSIZE		(CONFIG_SYS_CBSIZE \
-+					+ sizeof(CONFIG_SYS_PROMPT) + 16)
-+/* Boot Argument Buffer Size */
-+#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-+
-+/*
-+ * When we have SPI, NOR or NAND flash we expect to be making use of
-+ * mtdparts, both for ease of use in U-Boot and for passing information
-+ * on to the Linux kernel.
-+ */
-+#if defined(CONFIG_SPI_BOOT) || defined(CONFIG_NOR) || defined(CONFIG_NAND)
-+#define CONFIG_MTD_DEVICE		/* Required for mtdparts */
-+#define CONFIG_CMD_MTDPARTS
-+#endif
-+
-+/*
-+ * For commands to use, we take the default list and add a few other
-+ * useful commands.  Note that we must have set CONFIG_SYS_NO_FLASH
-+ * prior to this include, in order to skip a few commands.  When we do
-+ * have flash, if we expect these commands they must be enabled in that
-+ * config.  If desired, a specific list of desired commands can be used
-+ * instead.
-+ */
-+#include <config_cmd_default.h>
-+#define CONFIG_CMD_ASKENV
-+#define CONFIG_CMD_ECHO
-+#define CONFIG_CMD_BOOTZ
-+
-+/*
-+ * Common filesystems support.  When we have removable storage we
-+ * enabled a number of useful commands and support.
-+ */
-+#if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE)
-+#define CONFIG_DOS_PARTITION
-+#define CONFIG_CMD_FAT
-+#define CONFIG_FAT_WRITE
-+#define CONFIG_CMD_EXT2
-+#define CONFIG_CMD_EXT4
-+#define CONFIG_CMD_FS_GENERIC
-+#endif
-+
-+/*
-+ * Our platforms make use of SPL to initalize the hardware (primarily
-+ * memory) enough for full U-Boot to be loaded.  We also support Falcon
-+ * Mode so that the Linux kernel can be booted directly from SPL
-+ * instead, if desired.  We make use of the general SPL framework found
-+ * under common/spl/.  Given our generally common memory map, we set a
-+ * number of related defaults and sizes here.
-+ */
-+#if !defined(CONFIG_NOR_BOOT) && \
-+	!(defined(CONFIG_QSPI_BOOT) && defined(CONFIG_AM43XX))
-+#define CONFIG_SPL
-+#define CONFIG_SPL_FRAMEWORK
-+#define CONFIG_SPL_OS_BOOT
-+
-+/*
-+ * Place the image at the start of the ROM defined image space.
-+ * We limit our size to the ROM-defined downloaded image area, and use the
-+ * rest of the space for stack.  We load U-Boot itself into memory at
-+ * 0x80800000 for legacy reasons (to not conflict with older SPLs).  We
-+ * have our BSS be placed 1MiB after this, to allow for the default
-+ * Linux kernel address of 0x80008000 to work, in the Falcon Mode case.
-+ * We have the SPL malloc pool at the end of the BSS area.
-+ */
-+#define CONFIG_SPL_STACK		CONFIG_SYS_INIT_SP_ADDR
-+#ifndef CONFIG_SYS_TEXT_BASE
-+#define CONFIG_SYS_TEXT_BASE		0x80800000
-+#endif
-+#ifndef CONFIG_SPL_BSS_START_ADDR
-+#define CONFIG_SPL_BSS_START_ADDR	0x80a00000
-+#define CONFIG_SPL_BSS_MAX_SIZE		0x80000		/* 512 KB */
-+#endif
-+#ifndef CONFIG_SYS_SPL_MALLOC_START
-+#define CONFIG_SYS_SPL_MALLOC_START	(CONFIG_SPL_BSS_START_ADDR + \
-+					 CONFIG_SPL_BSS_MAX_SIZE)
-+#define CONFIG_SYS_SPL_MALLOC_SIZE	CONFIG_SYS_MALLOC_LEN
-+#endif
-+
-+/* RAW SD card / eMMC locations. */
-+#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR	0x300 /* address 0x60000 */
-+#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS	0x200 /* 256 KB */
-+
-+/* FAT sd card locations. */
-+#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION	1
-+#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME	"u-boot.img"
-+
-+#ifdef CONFIG_SPL_OS_BOOT
-+/* FAT */
-+#define CONFIG_SPL_FAT_LOAD_KERNEL_NAME		"uImage"
-+#define CONFIG_SPL_FAT_LOAD_ARGS_NAME		"args"
-+
-+/* RAW SD card / eMMC */
-+#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR	0x900	/* address 0x120000 */
-+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR	0x80	/* address 0x10000 */
-+#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS	0x80	/* 64KiB */
-+
-+/* NAND */
-+#ifdef CONFIG_NAND
-+#define CONFIG_CMD_SPL_NAND_OFS			0x240000 /* end of u-boot */
-+#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS		0x280000
-+#define CONFIG_CMD_SPL_WRITE_SIZE		0x2000
-+#endif
-+
-+/* spl export command */
-+#define CONFIG_CMD_SPL
-+#endif
-+
-+#ifdef CONFIG_MMC
-+#define CONFIG_SPL_LIBDISK_SUPPORT
-+#define CONFIG_SPL_MMC_SUPPORT
-+#define CONFIG_SPL_FAT_SUPPORT
-+#endif
-+
-+/* General parts of the framework, required. */
-+#define CONFIG_SPL_I2C_SUPPORT
-+#define CONFIG_SPL_LIBCOMMON_SUPPORT
-+#define CONFIG_SPL_LIBGENERIC_SUPPORT
-+#define CONFIG_SPL_SERIAL_SUPPORT
-+#define CONFIG_SPL_GPIO_SUPPORT
-+#define CONFIG_SPL_BOARD_INIT
-+
-+#ifdef CONFIG_NAND
-+#define CONFIG_SPL_NAND_SUPPORT
-+#define CONFIG_SPL_NAND_BASE
-+#define CONFIG_SPL_NAND_DRIVERS
-+#define CONFIG_SPL_NAND_ECC
-+#define CONFIG_SPL_MTD_SUPPORT
-+#define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
-+/* #define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000 */ /* Defined later in this configuration */
-+#endif
-+#endif /* !CONFIG_NOR_BOOT */
-+
-+#ifndef CONFIG_SPL_BUILD
-+# define CONFIG_FIT
-+# define CONFIG_TIMESTAMP
-+# define CONFIG_LZO
-+# ifdef CONFIG_ENABLE_VBOOT
-+#  define CONFIG_OF_CONTROL
-+#  define CONFIG_OF_SEPARATE
-+#  define CONFIG_DEFAULT_DEVICE_TREE am335x-chiliboard
-+#  define CONFIG_FIT_SIGNATURE
-+#  define CONFIG_RSA
-+# endif
-+#endif
-+
-+#define CONFIG_SYS_BOOTM_LEN		(16 << 20)
-+
-+#define CONFIG_BOARD_LATE_INIT
-+
-+#define CONFIG_SERIAL1			1
-+#define CONFIG_CONS_INDEX		1
-+
-+/* Clock Defines */
-+#define V_OSCK				24000000  /* Clock output from T2 */
-+#define V_SCLK				(V_OSCK)
-+
-+/* Custom script for NOR */
-+#define CONFIG_SYS_LDSCRIPT		"board/grinn/chiliboard/u-boot.lds"
-+
-+/* Always 128 KiB env size */
-+#define CONFIG_ENV_SIZE			(128 << 10)
-+
-+/* Enhance our eMMC support / experience. */
-+#define CONFIG_CMD_GPT
-+#define CONFIG_EFI_PARTITION
-+#define CONFIG_PARTITION_UUIDS
-+#define CONFIG_CMD_PART
-+
-+#ifdef CONFIG_NAND
-+#ifndef CONFIG_NAND512MB
-+#define NANDARGS \
-+	"mtdids=" MTDIDS_DEFAULT "\0" \
-+	"mtdparts=" MTDPARTS_DEFAULT "\0" \
-+	"nandargs=setenv bootargs console=${console} " \
-+		"${optargs} " \
-+		"root=${nandroot} " \
-+		"rootfstype=${nandrootfstype}\0" \
-+	"nandroot=ubi0:rootfs rw ubi.mtd=8,2048\0" \
-+	"nandrootfstype=ubifs rootwait=1\0" \
-+	"nandboot=echo Booting from nand ...; " \
-+		"run nandargs; " \
-+		"nand read ${fdtaddr} u-boot-spl-os; " \
-+		"nand read ${loadaddr} kernel; " \
-+		"bootz ${loadaddr} - ${fdtaddr}\0"
-+#else
-+#define NANDARGS \
-+	"mtdids=" MTDIDS_DEFAULT "\0" \
-+	"mtdparts=" MTDPARTS_DEFAULT "\0" \
-+	"nandargs=setenv bootargs console=${console} " \
-+		"${optargs} " \
-+		"root=${nandroot} " \
-+		"rootfstype=${nandrootfstype}\0" \
-+	"nandroot=ubi0:rootfs rw ubi.mtd=8,4096\0" \
-+	"nandrootfstype=ubifs rootwait=1\0" \
-+	"nandboot=echo Booting from nand ...; " \
-+		"run nandargs; " \
-+		"nand read ${fdtaddr} u-boot-spl-os; " \
-+		"nand read ${loadaddr} kernel; " \
-+		"bootz ${loadaddr} - ${fdtaddr}\0"
-+#endif
-+#else
-+#define NANDARGS ""
-+#endif
-+
-+#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-+
-+#ifndef CONFIG_SPL_BUILD
-+#define CONFIG_EXTRA_ENV_SETTINGS \
-+	DEFAULT_LINUX_BOOT_ENV \
-+	"boot_fdt=try\0" \
-+	"bootpart=0:2\0" \
-+	"bootdir=/boot\0" \
-+	"bootfile=zImage\0" \
-+	"fdtfile=undefined\0" \
-+	"console=ttyO0,115200n8\0" \
-+	"partitions=" \
-+		"uuid_disk=${uuid_gpt_disk};" \
-+		"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
-+	"optargs=\0" \
-+	"mmcdev=0\0" \
-+	"mmcroot=/dev/mmcblk0p2 rw\0" \
-+	"mmcrootfstype=ext4 rootwait\0" \
-+	"rootpath=/export/rootfs\0" \
-+	"nfsopts=nolock\0" \
-+	"static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \
-+		"::off\0" \
-+	"ramroot=/dev/ram0 rw\0" \
-+	"ramrootfstype=ext2\0" \
-+	"mmcargs=setenv bootargs console=${console} " \
-+		"${optargs} " \
-+		"root=${mmcroot} " \
-+		"rootfstype=${mmcrootfstype}\0" \
-+	"spiroot=/dev/mtdblock4 rw\0" \
-+	"spirootfstype=jffs2\0" \
-+	"spisrcaddr=0xe0000\0" \
-+	"spiimgsize=0x362000\0" \
-+	"spibusno=0\0" \
-+	"spiargs=setenv bootargs console=${console} " \
-+		"${optargs} " \
-+		"root=${spiroot} " \
-+		"rootfstype=${spirootfstype}\0" \
-+	"netargs=setenv bootargs console=${console} " \
-+		"${optargs} " \
-+		"root=/dev/nfs " \
-+		"nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
-+		"ip=dhcp\0" \
-+	"bootenv=uEnv.txt\0" \
-+	"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
-+	"importbootenv=echo Importing environment from mmc ...; " \
-+		"env import -t $loadaddr $filesize\0" \
-+	"ramargs=setenv bootargs console=${console} " \
-+		"${optargs} " \
-+		"root=${ramroot} " \
-+		"rootfstype=${ramrootfstype}\0" \
-+	"loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
-+	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-+	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
-+	"mmcloados=run mmcargs; " \
-+		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-+			"if run loadfdt; then " \
-+				"bootz ${loadaddr} - ${fdtaddr}; " \
-+			"else " \
-+				"if test ${boot_fdt} = try; then " \
-+					"bootz; " \
-+				"else " \
-+					"echo WARN: Cannot load the DT; " \
-+				"fi; " \
-+			"fi; " \
-+		"else " \
-+			"bootz; " \
-+		"fi;\0" \
-+	"mmcboot=mmc dev ${mmcdev}; " \
-+		"if mmc rescan; then " \
-+			"echo SD/MMC found on device ${mmcdev};" \
-+			"if run loadbootenv; then " \
-+				"echo Loaded environment from ${bootenv};" \
-+				"run importbootenv;" \
-+			"fi;" \
-+			"if test -n $uenvcmd; then " \
-+				"echo Running uenvcmd ...;" \
-+				"run uenvcmd;" \
-+			"fi;" \
-+			"if run loadimage; then " \
-+				"run mmcloados;" \
-+			"fi;" \
-+		"fi;\0" \
-+	"spiboot=echo Booting from spi ...; " \
-+		"run spiargs; " \
-+		"sf probe ${spibusno}:0; " \
-+		"sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \
-+		"bootz ${loadaddr}\0" \
-+	"netboot=echo Booting from network ...; " \
-+		"setenv autoload no; " \
-+		"dhcp; " \
-+		"tftp ${loadaddr} ${bootfile}; " \
-+		"tftp ${fdtaddr} ${fdtfile}; " \
-+		"run netargs; " \
-+		"bootz ${loadaddr} - ${fdtaddr}\0" \
-+	"ramboot=echo Booting from ramdisk ...; " \
-+		"run ramargs; " \
-+		"bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
-+	"findfdt="\
-+		"setenv fdtfile am335x-chiliboard.dtb;\0" \
-+	NANDARGS \
-+	DFUARGS
-+#endif
-+
-+#define CONFIG_BOOTCOMMAND \
-+	"run findfdt; " \
-+	"run mmcboot;" \
-+	"setenv mmcdev 1; " \
-+	"setenv bootpart 1:2; " \
-+	"run mmcboot;" \
-+	"run nandboot;"
-+
-+/* NS16550 Configuration */
-+#define CONFIG_SYS_NS16550_COM1		0x44e09000	/* Base EVM has UART0 */
-+#define CONFIG_SYS_NS16550_COM2		0x48022000	/* UART1 */
-+#define CONFIG_SYS_NS16550_COM3		0x48024000	/* UART2 */
-+#define CONFIG_SYS_NS16550_COM4		0x481a6000	/* UART3 */
-+#define CONFIG_SYS_NS16550_COM5		0x481a8000	/* UART4 */
-+#define CONFIG_SYS_NS16550_COM6		0x481aa000	/* UART5 */
-+#define CONFIG_BAUDRATE			115200
-+
-+/*
-+#define CONFIG_CMD_EEPROM
-+#define CONFIG_ENV_EEPROM_IS_ON_I2C
-+#define CONFIG_SYS_I2C_EEPROM_ADDR	0x50
-+#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN	2
-+#define CONFIG_SYS_I2C_MULTI_EEPROMS
-+*/
-+
-+/* PMIC support */
-+#define CONFIG_POWER_TPS65217
-+/* #define CONFIG_POWER_TPS65910 */
-+
-+/* SPL */
-+#ifndef CONFIG_NOR_BOOT
-+#define CONFIG_SPL_POWER_SUPPORT
-+#define CONFIG_SPL_YMODEM_SUPPORT
-+
-+/* Bootcount using the RTC block */
-+#define CONFIG_BOOTCOUNT_LIMIT
-+#define CONFIG_BOOTCOUNT_AM33XX
-+
-+/* USB gadget RNDIS */
-+#define CONFIG_SPL_MUSB_NEW_SUPPORT
-+
-+/* General network SPL, both CPSW and USB gadget RNDIS */
-+#define CONFIG_SPL_NET_SUPPORT
-+#define CONFIG_SPL_ENV_SUPPORT
-+#define CONFIG_SPL_NET_VCI_STRING	"AM335x U-Boot SPL"
-+
-+#define CONFIG_SPL_LDSCRIPT		"$(CPUDIR)/am33xx/u-boot-spl.lds"
-+
-+#ifdef CONFIG_NAND
-+#define CONFIG_NAND_OMAP_GPMC
-+#define CONFIG_NAND_OMAP_ELM
-+#define CONFIG_SYS_NAND_5_ADDR_CYCLE
-+#define CONFIG_SYS_NAND_PAGE_COUNT	(CONFIG_SYS_NAND_BLOCK_SIZE / \
-+					 CONFIG_SYS_NAND_PAGE_SIZE)
-+
-+#ifndef CONFIG_NAND512MB
-+#define CONFIG_SYS_NAND_PAGE_SIZE	2048
-+#define CONFIG_SYS_NAND_OOBSIZE		64
-+#define CONFIG_SYS_NAND_BLOCK_SIZE	(128*1024)
-+#define CONFIG_SYS_NAND_BAD_BLOCK_POS	NAND_LARGE_BADBLOCK_POS
-+#define CONFIG_SYS_NAND_ECCPOS		{ 2, 3, 4, 5, 6, 7, 8, 9, \
-+					 10, 11, 12, 13, 14, 15, 16, 17, \
-+					 18, 19, 20, 21, 22, 23, 24, 25, \
-+					 26, 27, 28, 29, 30, 31, 32, 33, \
-+					 34, 35, 36, 37, 38, 39, 40, 41, \
-+					 42, 43, 44, 45, 46, 47, 48, 49, \
-+					 50, 51, 52, 53, 54, 55, 56, 57, }
-+
-+#define CONFIG_SYS_NAND_ECCSIZE		512
-+#define CONFIG_SYS_NAND_ECCBYTES	14
-+#define CONFIG_SYS_NAND_ONFI_DETECTION
-+#define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH8_CODE_HW
-+#define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
-+#define CONFIG_SYS_NAND_U_BOOT_OFFS	0x80000
-+#else
-+#define CONFIG_SYS_NAND_PAGE_SIZE	4096
-+#define CONFIG_SYS_NAND_OOBSIZE		224
-+#define CONFIG_SYS_NAND_BLOCK_SIZE	(256*1024)
-+#define CONFIG_SYS_NAND_BAD_BLOCK_POS	NAND_LARGE_BADBLOCK_POS
-+#define CONFIG_SYS_NAND_ECCPOS {\
-+				2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,\
-+				16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,\
-+				28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,\
-+				40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,\
-+				52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,\
-+				64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,\
-+				76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,\
-+				88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,\
-+				100, 101, 102, 103, 104, 105, 106, 107, 108, 109,\
-+				110, 111, 112, 113, 114, 115, 116, 117, 118, 119,\
-+				120, 121, 122, 123, 124, 125, 126, 127, 128, 129,\
-+				130, 131, 132, 133, 134, 135, 136, 137, 138, 139,\
-+				140, 141, 142, 143, 144, 145, 146, 147, 148, 149,\
-+				150, 151, 152, 153, 154, 155, 156, 157, 158, 159,\
-+				160, 161, 162, 163, 164, 165, 166, 167, 168, 169,\
-+				170, 171, 172, 173, 174, 175, 176, 177, 178, 179,\
-+				180, 181, 182, 183, 184, 185, 186, 187, 188, 189,\
-+				190, 191, 192, 193, 194, 195, 196, 197, 198, 199,\
-+				200, 201, 202, 203, 204, 205, 206, 207, 208, 209}
-+
-+#define CONFIG_SYS_NAND_ECCSIZE		512
-+#define CONFIG_SYS_NAND_ECCBYTES	26
-+#define CONFIG_SYS_NAND_ONFI_DETECTION
-+#define CONFIG_NAND_OMAP_ECCSCHEME	OMAP_ECC_BCH16_CODE_HW
-+#define CONFIG_SYS_NAND_U_BOOT_START	CONFIG_SYS_TEXT_BASE
-+#define CONFIG_SYS_NAND_U_BOOT_OFFS	0x100000
-+#endif
-+
-+#endif
-+#endif
-+
-+/*
-+ * For NOR boot, we must set this to the start of where NOR is mapped
-+ * in memory.
-+ */
-+#ifdef CONFIG_NOR_BOOT
-+#define CONFIG_SYS_TEXT_BASE		0x08000000
-+#endif
-+
-+/*
-+ * USB configuration.  We enable MUSB support, both for host and for
-+ * gadget.  We set USB0 as peripheral and USB1 as host, based on the
-+ * board schematic and physical port wired to each.  Then for host we
-+ * add mass storage support and for gadget we add both RNDIS ethernet
-+ * and DFU.
-+ */
-+#define CONFIG_USB_MUSB_DSPS
-+#define CONFIG_ARCH_MISC_INIT
-+#define CONFIG_MUSB_GADGET
-+#define CONFIG_MUSB_PIO_ONLY
-+#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT
-+#define CONFIG_USB_GADGET
-+#define CONFIG_USBDOWNLOAD_GADGET
-+#define CONFIG_USB_GADGET_DUALSPEED
-+#define CONFIG_USB_GADGET_VBUS_DRAW	2
-+#define CONFIG_MUSB_HOST
-+#define CONFIG_AM335X_USB0
-+#define CONFIG_AM335X_USB0_MODE	MUSB_PERIPHERAL
-+#define CONFIG_AM335X_USB1
-+#define CONFIG_AM335X_USB1_MODE MUSB_HOST
-+
-+#ifdef CONFIG_MUSB_HOST
-+#define CONFIG_CMD_USB
-+#define CONFIG_USB_STORAGE
-+#endif
-+
-+#ifdef CONFIG_MUSB_GADGET
-+#define CONFIG_USB_ETHER
-+#define CONFIG_USB_ETH_RNDIS
-+#define CONFIG_USBNET_HOST_ADDR	"de:ad:be:af:00:00"
-+
-+/* USB TI's IDs */
-+#define CONFIG_G_DNL_VENDOR_NUM 0x0403
-+#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00
-+#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments"
-+#endif /* CONFIG_MUSB_GADGET */
-+
-+#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT)
-+/* disable host part of MUSB in SPL */
-+#undef CONFIG_MUSB_HOST
-+/* disable EFI partitions and partition UUID support */
-+#undef CONFIG_PARTITION_UUIDS
-+#undef CONFIG_EFI_PARTITION
-+/*
-+ * Disable CPSW SPL support so we fit within the 101KiB limit.
-+ */
-+#undef CONFIG_SPL_ETH_SUPPORT
-+#endif
-+
-+/* USB Device Firmware Update support */
-+#ifndef CONFIG_SPL_BUILD
-+#define CONFIG_DFU_FUNCTION
-+#define CONFIG_DFU_MMC
-+#define CONFIG_CMD_DFU
-+#define DFU_ALT_INFO_MMC \
-+	"dfu_alt_info_mmc=" \
-+	"boot part 0 1;" \
-+	"rootfs part 0 2;" \
-+	"MLO fat 0 1;" \
-+	"MLO.raw mmc 0x100 0x100;" \
-+	"u-boot.img.raw mmc 0x300 0x400;" \
-+	"spl-os-args.raw mmc 0x80 0x80;" \
-+	"spl-os-image.raw mmc 0x900 0x2000;" \
-+	"spl-os-args fat 0 1;" \
-+	"spl-os-image fat 0 1;" \
-+	"u-boot.img fat 0 1;" \
-+	"uEnv.txt fat 0 1\0"
-+#ifdef CONFIG_NAND
-+#define CONFIG_DFU_NAND
-+#define DFU_ALT_INFO_NAND \
-+	"dfu_alt_info_nand=" \
-+	"SPL part 0 1;" \
-+	"SPL.backup1 part 0 2;" \
-+	"SPL.backup2 part 0 3;" \
-+	"SPL.backup3 part 0 4;" \
-+	"u-boot part 0 5;" \
-+	"u-boot-spl-os part 0 6;" \
-+	"kernel part 0 8;" \
-+	"rootfs part 0 9\0"
-+#else
-+#define DFU_ALT_INFO_NAND ""
-+#endif
-+#define CONFIG_DFU_RAM
-+#define DFU_ALT_INFO_RAM \
-+	"dfu_alt_info_ram=" \
-+	"kernel ram 0x80200000 0xD80000;" \
-+	"fdt ram 0x80F80000 0x80000;" \
-+	"ramdisk ram 0x81000000 0x4000000\0"
-+#define DFUARGS \
-+	"dfu_alt_info_emmc=rawemmc mmc 0 3751936\0" \
-+	DFU_ALT_INFO_MMC \
-+	DFU_ALT_INFO_RAM \
-+	DFU_ALT_INFO_NAND
-+#endif
-+
-+/*
-+ * Default to using SPI for environment, etc.
-+ * 0x000000 - 0x020000 : SPL (128KiB)
-+ * 0x020000 - 0x0A0000 : U-Boot (512KiB)
-+ * 0x0A0000 - 0x0BFFFF : First copy of U-Boot Environment (128KiB)
-+ * 0x0C0000 - 0x0DFFFF : Second copy of U-Boot Environment (128KiB)
-+ * 0x0E0000 - 0x442000 : Linux Kernel
-+ * 0x442000 - 0x800000 : Userland
-+ */
-+#if defined(CONFIG_SPI_BOOT)
-+/* SPL related */
-+#undef CONFIG_SPL_OS_BOOT		/* Not supported by existing map */
-+#define CONFIG_SPL_SPI_SUPPORT
-+#define CONFIG_SPL_SPI_FLASH_SUPPORT
-+#define CONFIG_SPL_SPI_LOAD
-+#define CONFIG_SPL_SPI_BUS		0
-+#define CONFIG_SPL_SPI_CS		0
-+#define CONFIG_SYS_SPI_U_BOOT_OFFS	0x20000
-+
-+#define CONFIG_ENV_IS_IN_SPI_FLASH
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-+#define CONFIG_ENV_SPI_MAX_HZ		CONFIG_SF_DEFAULT_SPEED
-+#define CONFIG_ENV_SECT_SIZE		(4 << 10) /* 4 KB sectors */
-+#define CONFIG_ENV_OFFSET		(768 << 10) /* 768 KiB in */
-+#define CONFIG_ENV_OFFSET_REDUND	(896 << 10) /* 896 KiB in */
-+#define MTDIDS_DEFAULT			"nor0=m25p80-flash.0"
-+#define MTDPARTS_DEFAULT		"mtdparts=m25p80-flash.0:128k(SPL)," \
-+					"512k(u-boot),128k(u-boot-env1)," \
-+					"128k(u-boot-env2),3464k(kernel)," \
-+					"-(rootfs)"
-+#elif defined(CONFIG_EMMC_BOOT)
-+#undef CONFIG_ENV_IS_NOWHERE
-+#define CONFIG_ENV_IS_IN_MMC
-+#define CONFIG_SYS_MMC_ENV_DEV		1
-+#define CONFIG_SYS_MMC_ENV_PART		2
-+#define CONFIG_ENV_OFFSET		0x0
-+#define CONFIG_ENV_OFFSET_REDUND	(CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
-+#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
-+#endif
-+
-+/* SPI flash. */
-+#define CONFIG_CMD_SF
-+#define CONFIG_SPI_FLASH
-+#define CONFIG_SPI_FLASH_WINBOND
-+#define CONFIG_SF_DEFAULT_SPEED		24000000
-+
-+/* Network. */
-+#define CONFIG_PHY_GIGE
-+#define CONFIG_PHYLIB
-+#define CONFIG_PHY_SMSC
-+
-+/* NAND support */
-+#ifdef CONFIG_NAND
-+#define CONFIG_CMD_NAND
-+#if !defined(CONFIG_SPI_BOOT) && !defined(CONFIG_NOR_BOOT)
-+#define MTDIDS_DEFAULT			"nand0=omap2-nand.0"
-+
-+#ifndef CONFIG_NAND512MB
-+#define MTDPARTS_DEFAULT		"mtdparts=omap2-nand.0:128k(SPL)," \
-+					"128k(SPL.backup1)," \
-+					"128k(SPL.backup2)," \
-+					"128k(SPL.backup3),1792k(u-boot)," \
-+					"128k(u-boot-spl-os)," \
-+					"128k(u-boot-env),5m(kernel),-(rootfs)"
-+#define CONFIG_ENV_IS_IN_NAND
-+#define CONFIG_ENV_OFFSET		0x260000 /* environment starts here */
-+#define CONFIG_SYS_ENV_SECT_SIZE	(128 << 10)	/* 128 KiB */
-+#else
-+#define MTDPARTS_DEFAULT		"mtdparts=omap2-nand.0:256k(SPL)," \
-+					"256k(SPL.backup1)," \
-+					"256k(SPL.backup2)," \
-+					"256k(SPL.backup3),2048k(u-boot)," \
-+					"256k(u-boot-spl-os)," \
-+					"256k(u-boot-env),5m(kernel),-(rootfs)"
-+#define CONFIG_ENV_IS_IN_NAND
-+#define CONFIG_ENV_OFFSET		0x340000 /* environment starts here */
-+#define CONFIG_SYS_ENV_SECT_SIZE	(128 << 10)	/* 128 KiB */
-+#endif
-+
-+#endif
-+#endif
-+
-+/*
-+ * NOR Size = 16 MiB
-+ * Number of Sectors/Blocks = 128
-+ * Sector Size = 128 KiB
-+ * Word length = 16 bits
-+ * Default layout:
-+ * 0x000000 - 0x07FFFF : U-Boot (512 KiB)
-+ * 0x080000 - 0x09FFFF : First copy of U-Boot Environment (128 KiB)
-+ * 0x0A0000 - 0x0BFFFF : Second copy of U-Boot Environment (128 KiB)
-+ * 0x0C0000 - 0x4BFFFF : Linux Kernel (4 MiB)
-+ * 0x4C0000 - 0xFFFFFF : Userland (11 MiB + 256 KiB)
-+ */
-+#if defined(CONFIG_NOR)
-+#undef CONFIG_SYS_NO_FLASH
-+#define CONFIG_CMD_FLASH
-+#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE
-+#define CONFIG_SYS_FLASH_PROTECTION
-+#define CONFIG_SYS_FLASH_CFI
-+#define CONFIG_FLASH_CFI_DRIVER
-+#define CONFIG_FLASH_CFI_MTD
-+#define CONFIG_SYS_MAX_FLASH_SECT	128
-+#define CONFIG_SYS_MAX_FLASH_BANKS	1
-+#define CONFIG_SYS_FLASH_BASE		(0x08000000)
-+#define CONFIG_SYS_FLASH_CFI_WIDTH	FLASH_CFI_16BIT
-+#define CONFIG_SYS_MONITOR_BASE		CONFIG_SYS_FLASH_BASE
-+/* Reduce SPL size by removing unlikey targets */
-+#ifdef CONFIG_NOR_BOOT
-+#define CONFIG_ENV_IS_IN_FLASH
-+#define CONFIG_ENV_SECT_SIZE		(128 << 10)	/* 128 KiB */
-+#define CONFIG_ENV_OFFSET		(512 << 10)	/* 512 KiB */
-+#define CONFIG_ENV_OFFSET_REDUND	(768 << 10)	/* 768 KiB */
-+#define MTDIDS_DEFAULT			"nor0=physmap-flash.0"
-+#define MTDPARTS_DEFAULT		"mtdparts=physmap-flash.0:" \
-+					"512k(u-boot)," \
-+					"128k(u-boot-env1)," \
-+					"128k(u-boot-env2)," \
-+					"4m(kernel),-(rootfs)"
-+#endif
-+#endif  /* NOR support */
-+
-+#endif	/* ! __CONFIG_CHILISOM_H */
--- 
-2.5.0
-
diff --git a/libre/uboot4extlinux-chiliboard/0006-parabola-arm-modifications.patch b/libre/uboot4extlinux-chiliboard/0006-parabola-arm-modifications.patch
deleted file mode 100644
index fc41962ef..000000000
--- a/libre/uboot4extlinux-chiliboard/0006-parabola-arm-modifications.patch
+++ /dev/null
@@ -1,423 +0,0 @@
-diff -Nur u-boot-2014.07.orig/include/config_distro_bootcmd.h u-boot-2014.07/include/config_distro_bootcmd.h
---- u-boot-2014.07.orig/include/config_distro_bootcmd.h	1969-12-31 21:00:00.000000000 -0300
-+++ u-boot-2014.07/include/config_distro_bootcmd.h	2015-04-13 11:53:03.000000000 -0300
-@@ -0,0 +1,236 @@
-+/*
-+ * (C) Copyright 2014
-+ * NVIDIA Corporation <www.nvidia.com>
-+ *
-+ * Copyright 2014 Red Hat, Inc.
-+ *
-+ * SPDX-License-Identifier:     GPL-2.0+
-+ */
-+
-+#ifndef _CONFIG_CMD_DISTRO_BOOTCMD_H
-+#define _CONFIG_CMD_DISTRO_BOOTCMD_H
-+
-+/*
-+ * A note on error handling: It is possible for BOOT_TARGET_DEVICES to
-+ * reference a device that is not enabled in the U-Boot configuration, e.g.
-+ * it may include MMC in the list without CONFIG_CMD_MMC being enabled. Given
-+ * that BOOT_TARGET_DEVICES is a macro that's expanded by the C pre-processor
-+ * at compile time, it's not  possible to detect and report such problems via
-+ * a simple #ifdef/#error combination. Still, the code needs to report errors.
-+ * The best way I've found to do this is to make BOOT_TARGET_DEVICES expand to
-+ * reference a non-existent symbol, and have the name of that symbol encode
-+ * the error message. Consequently, this file contains references to e.g.
-+ * BOOT_TARGET_DEVICES_references_MMC_without_CONFIG_CMD_MMC. Given the
-+ * prevalence of capitals here, this looks like a pre-processor macro and
-+ * hence seems like it should be all capitals, but it's really an error
-+ * message that includes some other pre-processor symbols in the text.
-+ */
-+
-+/* We need the part command */
-+#define CONFIG_PARTITION_UUIDS
-+#define CONFIG_CMD_PART
-+
-+#define BOOTENV_SHARED_BLKDEV_BODY(devtypel) \
-+		"if " #devtypel " dev ${devnum}; then " \
-+			"setenv devtype " #devtypel "; " \
-+			"run scan_dev_for_boot_part; " \
-+		"fi\0"
-+
-+#define BOOTENV_SHARED_BLKDEV(devtypel) \
-+	#devtypel "_boot=" \
-+	BOOTENV_SHARED_BLKDEV_BODY(devtypel)
-+
-+#define BOOTENV_DEV_BLKDEV(devtypeu, devtypel, instance) \
-+	"bootcmd_" #devtypel #instance "=" \
-+		"setenv devnum " #instance "; " \
-+		"run " #devtypel "_boot\0"
-+
-+#define BOOTENV_DEV_NAME_BLKDEV(devtypeu, devtypel, instance) \
-+	#devtypel #instance " "
-+
-+#ifdef CONFIG_CMD_MMC
-+#define BOOTENV_SHARED_MMC	BOOTENV_SHARED_BLKDEV(mmc)
-+#define BOOTENV_DEV_MMC		BOOTENV_DEV_BLKDEV
-+#define BOOTENV_DEV_NAME_MMC	BOOTENV_DEV_NAME_BLKDEV
-+#else
-+#define BOOTENV_SHARED_MMC
-+#define BOOTENV_DEV_MMC \
-+	BOOT_TARGET_DEVICES_references_MMC_without_CONFIG_CMD_MMC
-+#define BOOTENV_DEV_NAME_MMC \
-+	BOOT_TARGET_DEVICES_references_MMC_without_CONFIG_CMD_MMC
-+#endif
-+
-+#ifdef CONFIG_CMD_SATA
-+#define BOOTENV_SHARED_SATA	BOOTENV_SHARED_BLKDEV(sata)
-+#define BOOTENV_DEV_SATA	BOOTENV_DEV_BLKDEV
-+#define BOOTENV_DEV_NAME_SATA	BOOTENV_DEV_NAME_BLKDEV
-+#else
-+#define BOOTENV_SHARED_SATA
-+#define BOOTENV_DEV_SATA \
-+	BOOT_TARGET_DEVICES_references_SATA_without_CONFIG_CMD_SATA
-+#define BOOTENV_DEV_NAME_SATA \
-+	BOOT_TARGET_DEVICES_references_SATA_without_CONFIG_CMD_SATA
-+#endif
-+
-+#ifdef CONFIG_CMD_SCSI
-+#define BOOTENV_RUN_SCSI_INIT "run scsi_init; "
-+#define BOOTENV_SET_SCSI_NEED_INIT "setenv scsi_need_init; "
-+#define BOOTENV_SHARED_SCSI \
-+	"scsi_init=" \
-+		"if ${scsi_need_init}; then " \
-+			"setenv scsi_need_init false; " \
-+			"scsi scan; " \
-+		"fi\0" \
-+	\
-+	"scsi_boot=" \
-+		BOOTENV_RUN_SCSI_INIT \
-+		BOOTENV_SHARED_BLKDEV_BODY(scsi)
-+#define BOOTENV_DEV_SCSI	BOOTENV_DEV_BLKDEV
-+#define BOOTENV_DEV_NAME_SCSI	BOOTENV_DEV_NAME_BLKDEV
-+#else
-+#define BOOTENV_RUN_SCSI_INIT
-+#define BOOTENV_SET_SCSI_NEED_INIT
-+#define BOOTENV_SHARED_SCSI
-+#define BOOTENV_DEV_SCSI \
-+	BOOT_TARGET_DEVICES_references_SCSI_without_CONFIG_CMD_SCSI
-+#define BOOTENV_DEV_NAME_SCSI \
-+	BOOT_TARGET_DEVICES_references_SCSI_without_CONFIG_CMD_SCSI
-+#endif
-+
-+#ifdef CONFIG_CMD_IDE
-+#define BOOTENV_SHARED_IDE	BOOTENV_SHARED_BLKDEV(ide)
-+#define BOOTENV_DEV_IDE		BOOTENV_DEV_BLKDEV
-+#define BOOTENV_DEV_NAME_IDE	BOOTENV_DEV_NAME_BLKDEV
-+#else
-+#define BOOTENV_SHARED_IDE
-+#define BOOTENV_DEV_IDE \
-+	BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_CMD_IDE
-+#define BOOTENV_DEV_NAME_IDE \
-+	BOOT_TARGET_DEVICES_references_IDE_without_CONFIG_CMD_IDE
-+#endif
-+
-+#ifdef CONFIG_CMD_USB
-+#define BOOTENV_RUN_USB_INIT "usb start; "
-+#define BOOTENV_SHARED_USB \
-+	"usb_boot=" \
-+		BOOTENV_RUN_USB_INIT \
-+		BOOTENV_SHARED_BLKDEV_BODY(usb)
-+#define BOOTENV_DEV_USB		BOOTENV_DEV_BLKDEV
-+#define BOOTENV_DEV_NAME_USB	BOOTENV_DEV_NAME_BLKDEV
-+#else
-+#define BOOTENV_RUN_USB_INIT
-+#define BOOTENV_SHARED_USB
-+#define BOOTENV_DEV_USB \
-+	BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB
-+#define BOOTENV_DEV_NAME_USB \
-+	BOOT_TARGET_DEVICES_references_USB_without_CONFIG_CMD_USB
-+#endif
-+
-+#if defined(CONFIG_CMD_DHCP)
-+#define BOOTENV_DEV_DHCP(devtypeu, devtypel, instance) \
-+	"bootcmd_dhcp=" \
-+		BOOTENV_RUN_USB_INIT \
-+		"if dhcp ${scriptaddr} ${boot_script_dhcp}; then " \
-+			"source ${scriptaddr}; " \
-+		"fi\0"
-+#define BOOTENV_DEV_NAME_DHCP(devtypeu, devtypel, instance) \
-+	"dhcp "
-+#else
-+#define BOOTENV_DEV_DHCP \
-+	BOOT_TARGET_DEVICES_references_DHCP_without_CONFIG_CMD_DHCP
-+#define BOOTENV_DEV_NAME_DHCP \
-+	BOOT_TARGET_DEVICES_references_DHCP_without_CONFIG_CMD_DHCP
-+#endif
-+
-+#if defined(CONFIG_CMD_DHCP) && defined(CONFIG_CMD_PXE)
-+#define BOOTENV_DEV_PXE(devtypeu, devtypel, instance) \
-+	"bootcmd_pxe=" \
-+		BOOTENV_RUN_USB_INIT \
-+		"dhcp; " \
-+		"if pxe get; then " \
-+			"pxe boot; " \
-+		"fi\0"
-+#define BOOTENV_DEV_NAME_PXE(devtypeu, devtypel, instance) \
-+	"pxe "
-+#else
-+#define BOOTENV_DEV_PXE \
-+	BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE
-+#define BOOTENV_DEV_NAME_PXE \
-+	BOOT_TARGET_DEVICES_references_PXE_without_CONFIG_CMD_DHCP_or_PXE
-+#endif
-+
-+#define BOOTENV_DEV_NAME(devtypeu, devtypel, instance) \
-+	BOOTENV_DEV_NAME_##devtypeu(devtypeu, devtypel, instance)
-+#define BOOTENV_BOOT_TARGETS \
-+	"boot_targets=" BOOT_TARGET_DEVICES(BOOTENV_DEV_NAME) "\0"
-+
-+#define BOOTENV_DEV(devtypeu, devtypel, instance) \
-+	BOOTENV_DEV_##devtypeu(devtypeu, devtypel, instance)
-+#define BOOTENV \
-+	BOOTENV_SHARED_MMC \
-+	BOOTENV_SHARED_USB \
-+	BOOTENV_SHARED_SATA \
-+	BOOTENV_SHARED_SCSI \
-+	BOOTENV_SHARED_IDE \
-+	"boot_prefixes=/ /boot/\0" \
-+	"boot_scripts=boot.scr.uimg boot.scr\0" \
-+	"boot_script_dhcp=boot.scr.uimg\0" \
-+	BOOTENV_BOOT_TARGETS \
-+	\
-+	"boot_extlinux="                                                  \
-+		"sysboot ${devtype} ${devnum}:${bootpart} any "           \
-+			"${scriptaddr} ${prefix}extlinux/extlinux.conf\0" \
-+	\
-+	"scan_dev_for_extlinux="                                          \
-+		"if test -e ${devtype} ${devnum}:${bootpart} "            \
-+				"${prefix}extlinux/extlinux.conf; then "  \
-+			"echo Found ${prefix}extlinux/extlinux.conf; "    \
-+			"run boot_extlinux; "                             \
-+			"echo SCRIPT FAILED: continuing...; "             \
-+		"fi\0"                                                    \
-+	\
-+	"boot_a_script="                                                  \
-+		"load ${devtype} ${devnum}:${bootpart} "                  \
-+			"${scriptaddr} ${prefix}${script}; "              \
-+		"source ${scriptaddr}\0"                                  \
-+	\
-+	"scan_dev_for_scripts="                                           \
-+		"for script in ${boot_scripts}; do "                      \
-+			"if test -e ${devtype} ${devnum}:${bootpart} "    \
-+					"${prefix}${script}; then "       \
-+				"echo Found U-Boot script "               \
-+					"${prefix}${script}; "            \
-+				"run boot_a_script; "                     \
-+				"echo SCRIPT FAILED: continuing...; "     \
-+			"fi; "                                            \
-+		"done\0"                                                  \
-+	\
-+	"scan_dev_for_boot="                                              \
-+		"echo Scanning ${devtype} ${devnum}:${bootpart}...; "     \
-+		"for prefix in ${boot_prefixes}; do "                     \
-+			"run scan_dev_for_extlinux; "                     \
-+			"run scan_dev_for_scripts; "                      \
-+		"done\0"                                                  \
-+	\
-+	"scan_dev_for_boot_part="                                         \
-+		"part list ${devtype} ${devnum} -bootable devplist; "     \
-+		"env exists devplist || setenv devplist 1; "              \
-+		"for bootpart in ${devplist}; do "                        \
-+			"if fstype ${devtype} ${devnum}:${bootpart} "     \
-+					"bootfstype; then "               \
-+				"run scan_dev_for_boot; "                 \
-+			"fi; "                                            \
-+		"done\0"                                                  \
-+	\
-+	BOOT_TARGET_DEVICES(BOOTENV_DEV)                                  \
-+	\
-+	"distro_bootcmd=" BOOTENV_SET_SCSI_NEED_INIT                      \
-+		"for target in ${boot_targets}; do "                      \
-+			"run bootcmd_${target}; "                         \
-+		"done\0"
-+
-+#ifndef CONFIG_BOOTCOMMAND
-+#define CONFIG_BOOTCOMMAND "run distro_bootcmd"
-+#endif
-+
-+#endif  /* _CONFIG_CMD_DISTRO_BOOTCMD_H */
-diff -Nur u-boot-2014.07.orig/include/configs/chiliboard.h u-boot-2014.07/include/configs/chiliboard.h
---- u-boot-2014.07.orig/include/configs/chiliboard.h	2016-02-25 00:53:19.766846991 -0300
-+++ u-boot-2014.07/include/configs/chiliboard.h	2016-02-25 00:57:01.436205462 -0300
-@@ -124,7 +124,6 @@
-  * as that will normally be within the kernel lowmem and thus visible via
-  * bootm_size and we only run on platforms with 256MB or more of memory.
-  */
--#ifdef CONFIG_RAM128MB
- #define DEFAULT_LINUX_BOOT_ENV \
- 	"loadaddr=0x82000000\0" \
- 	"kernel_addr_r=0x82000000\0" \
-@@ -133,16 +132,6 @@
- 	"rdaddr=0x84080000\0" \
- 	"ramdisk_addr_r=0x84080000\0" \
- 	"bootm_size=0x8000000\0"
--#else
--#define DEFAULT_LINUX_BOOT_ENV \
--	"loadaddr=0x82000000\0" \
--	"kernel_addr_r=0x82000000\0" \
--	"fdtaddr=0x88000000\0" \
--	"fdt_addr_r=0x88000000\0" \
--	"rdaddr=0x88080000\0" \
--	"ramdisk_addr_r=0x88080000\0" \
--	"bootm_size=0x10000000\0"
--#endif
- 
- /*
-  * Default to a quick boot delay.
-@@ -258,6 +247,7 @@
- #define CONFIG_CMD_ASKENV
- #define CONFIG_CMD_ECHO
- #define CONFIG_CMD_BOOTZ
-+#define CONFIG_SUPPORT_RAW_INITRD
- 
- /*
-  * Common filesystems support.  When we have removable storage we
-@@ -398,6 +388,9 @@
- #define CONFIG_EFI_PARTITION
- #define CONFIG_PARTITION_UUIDS
- #define CONFIG_CMD_PART
-+#define CONFIG_CMD_SETEXPR
-+
-+#define CONFIG_IDENT_STRING 	" Parabola GNU/Linux-libre"
- 
- #ifdef CONFIG_NAND
- #ifndef CONFIG_NAND512MB
-@@ -437,12 +430,20 @@
- 
- #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
- 
-+/* Enable Extlinux boot support */
-+#define CONFIG_CMD_PXE
-+#define CONFIG_MENU
-+#define BOOT_TARGET_DEVICES(func)
-+#include <config_distro_bootcmd.h>
-+
- #ifndef CONFIG_SPL_BUILD
- #define CONFIG_EXTRA_ENV_SETTINGS \
-+	BOOTENV \
- 	DEFAULT_LINUX_BOOT_ENV \
- 	"boot_fdt=try\0" \
--	"bootpart=0:2\0" \
-+	"bootpart=0:1\0" \
- 	"bootdir=/boot\0" \
-+	"fdtdir=/boot/dtbs\0" \
- 	"bootfile=zImage\0" \
- 	"fdtfile=undefined\0" \
- 	"console=ttyO0,115200n8\0" \
-@@ -450,9 +451,6 @@
- 		"uuid_disk=${uuid_gpt_disk};" \
- 		"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
- 	"optargs=\0" \
--	"mmcdev=0\0" \
--	"mmcroot=/dev/mmcblk0p2 rw\0" \
--	"mmcrootfstype=ext4 rootwait\0" \
- 	"rootpath=/export/rootfs\0" \
- 	"nfsopts=nolock\0" \
- 	"static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \
-@@ -461,8 +459,7 @@
- 	"ramrootfstype=ext2\0" \
- 	"mmcargs=setenv bootargs console=${console} " \
- 		"${optargs} " \
--		"root=${mmcroot} " \
--		"rootfstype=${mmcrootfstype}\0" \
-+		"root=${root}\0" \
- 	"spiroot=/dev/mtdblock4 rw\0" \
- 	"spirootfstype=jffs2\0" \
- 	"spisrcaddr=0xe0000\0" \
-@@ -477,46 +474,48 @@
- 		"root=/dev/nfs " \
- 		"nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
- 		"ip=dhcp\0" \
--	"bootenv=uEnv.txt\0" \
--	"loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
--	"importbootenv=echo Importing environment from mmc ...; " \
--		"env import -t $loadaddr $filesize\0" \
- 	"ramargs=setenv bootargs console=${console} " \
- 		"${optargs} " \
- 		"root=${ramroot} " \
- 		"rootfstype=${ramrootfstype}\0" \
--	"loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
--	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
--	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
--	"mmcloados=run mmcargs; " \
--		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
--			"if run loadfdt; then " \
--				"bootz ${loadaddr} - ${fdtaddr}; " \
--			"else " \
--				"if test ${boot_fdt} = try; then " \
--					"bootz; " \
--				"else " \
--					"echo WARN: Cannot load the DT; " \
--				"fi; " \
--			"fi; " \
--		"else " \
--			"bootz; " \
--		"fi;\0" \
--	"mmcboot=mmc dev ${mmcdev}; " \
--		"if mmc rescan; then " \
--			"echo SD/MMC found on device ${mmcdev};" \
--			"if run loadbootenv; then " \
--				"echo Loaded environment from ${bootenv};" \
--				"run importbootenv;" \
--			"fi;" \
--			"if test -n $uenvcmd; then " \
--				"echo Running uenvcmd ...;" \
--				"run uenvcmd;" \
--			"fi;" \
--			"if run loadimage; then " \
--				"run mmcloados;" \
--			"fi;" \
--		"fi;\0" \
-+	"loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-+	"loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \
-+	"loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
-+	"mmcboot=for devtype in mmc; do " \
-+			"for devnum in 0 1; do " \
-+				"if ${devtype} dev ${devnum}; then " \
-+					"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} ${fdtaddr};" \
-+							"else " \
-+								"bootz ${loadaddr} - ${fdtaddr};" \
-+							"fi;" \
-+						"fi;" \
-+					"else " \
-+						"echo No kernel found;" \
-+					"fi;" \
-+					"setexpr devnum ${devnum} + 1;" \
-+				"fi;" \
-+			"done;" \
-+		"done;\0" \
- 	"spiboot=echo Booting from spi ...; " \
- 		"run spiargs; " \
- 		"sf probe ${spibusno}:0; " \
-@@ -541,9 +540,6 @@
- #define CONFIG_BOOTCOMMAND \
- 	"run findfdt; " \
- 	"run mmcboot;" \
--	"setenv mmcdev 1; " \
--	"setenv bootpart 1:2; " \
--	"run mmcboot;" \
- 	"run nandboot;"
- 
- /* NS16550 Configuration */
diff --git a/libre/uboot4extlinux-chiliboard/PKGBUILD b/libre/uboot4extlinux-chiliboard/PKGBUILD
deleted file mode 100644
index 0a2f97131..000000000
--- a/libre/uboot4extlinux-chiliboard/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# U-Boot: ChiliBoard
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-buildarch=4
-
-pkgname=uboot4extlinux-chiliboard
-pkgver=2014.07
-pkgrel=1
-pkgdesc="U-Boot with Extlinux support for ChiliBoard"
-arch=('armv7h')
-url="http://git.denx.de/u-boot.git/"
-replaces=('uboot-chiliboard-linux-libre' 'uboot-chiliboard')
-conflicts=('uboot-chiliboard-linux-libre' 'uboot-chiliboard' 'uboot4grub-chiliboard')
-makedepends=('bc')
-license=('GPL')
-backup=(boot/extlinux/extlinux.conf)
-install=${pkgname}.install
-source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
-        '0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch'
-        '0002-ARM-asm-io.h-use-static-inline.patch'
-        '0003-common-main.c-make-show_boot_progress-__weak.patch'
-        '0004-common-board_f-cosmetic-use-__weak-for-leds.patch'
-        '0005-chiliboard-support.patch'
-        '0006-parabola-arm-modifications.patch'
-        'extlinux.conf'
-        'uEnv.txt')
-md5sums=('36d4bad687edcafa396fee607e505d4e'
-         'e070e8b5cf8628b6440dfc9dbd87cb65'
-         '318310de19110167fe15ceac3ae32f7d'
-         '1792346431786e1442c4059cd3f288ed'
-         '2a32a77f123391c02935754ced2743c2'
-         '5951c799b35c526f02edbcb3eb1295fc'
-         '35147d090738dd0c8104a565de0f404e'
-         '068f6b4e8047115e73f29af5f384889b'
-         '0afad1f6f3f8609db6e1f5bb322b2a1a')
-
-prepare() {
-  cd u-boot-${pkgver}
-  patch -Np1 -i ../0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch
-  patch -Np1 -i ../0002-ARM-asm-io.h-use-static-inline.patch
-  patch -Np1 -i ../0003-common-main.c-make-show_boot_progress-__weak.patch
-  patch -Np1 -i ../0004-common-board_f-cosmetic-use-__weak-for-leds.patch
-  patch -Np1 -i ../0005-chiliboard-support.patch
-  patch -Np1 -i ../0006-parabola-arm-modifications.patch
-}
-
-build() {
-  cd u-boot-${pkgver}
-
-  unset CFLAGS CXXFLAGS LDFLAGS
-
-  make distclean
-  make chiliboard_config
-  make
-}
-
-package() {
-  cd u-boot-${pkgver}
-  mkdir -p "${pkgdir}"/boot/extlinux
-  cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}"/boot
-  cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux
-}
diff --git a/libre/uboot4extlinux-chiliboard/extlinux.conf b/libre/uboot4extlinux-chiliboard/extlinux.conf
deleted file mode 100644
index 52de94d49..000000000
--- a/libre/uboot4extlinux-chiliboard/extlinux.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-menu title Welcome to U-Boot with Extlinux support!
-
-label Parabola GNU/Linux-libre, linux-libre kernel
-	kernel /boot/vmlinuz-linux-libre
-	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-	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=ttyO0,115200n8
-#	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=ttyO0,115200n8
-#	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=ttyO0,115200n8
-#	fdtdir /boot/dtbs/linux-libre-lts-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec kernel
-#	kernel /boot/vmlinuz-linux-libre-grsec
-#	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-#	fdtdir /boot/dtbs/linux-libre-grsec
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec-knock kernel
-#	kernel /boot/vmlinuz-linux-libre-grsec-knock
-#	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-#	fdtdir /boot/dtbs/linux-libre-grsec-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-audit kernel
-#	kernel /boot/vmlinuz-linux-libre-audit
-#	append root=/dev/mmcblk0p1 rw console=ttyO0,115200n8
-#	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=ttyO0,115200n8
-#	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=ttyO0,115200n8
-#	fdtdir /boot/dtbs/linux-libre-rt
diff --git a/libre/uboot4extlinux-chiliboard/uEnv.txt b/libre/uboot4extlinux-chiliboard/uEnv.txt
deleted file mode 100644
index a9f26096d..000000000
--- a/libre/uboot4extlinux-chiliboard/uEnv.txt
+++ /dev/null
@@ -1 +0,0 @@
-optargs=
diff --git a/libre/uboot4extlinux-chiliboard/uboot4extlinux-chiliboard.install b/libre/uboot4extlinux-chiliboard/uboot4extlinux-chiliboard.install
deleted file mode 100644
index 4467c694e..000000000
--- a/libre/uboot4extlinux-chiliboard/uboot4extlinux-chiliboard.install
+++ /dev/null
@@ -1,37 +0,0 @@
-flash_instructions() {
-  echo "# dd if=/boot/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k"
-  echo "# dd if=/boot/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k"
-}
-
-extlinux_warning() {
-  echo "==> WARNING: U-Boot uses Extlinux support to boot up. For setting it up, edit /boot/extlinux/extlinux.conf"
-}
-
-flash_uboot() {
-  root=$(mount | awk '/ on \/ / { print $1; }')
-  if [[ $root =~ ^/dev/mmcblk.*$ ]]; then
-    root=${root:0:12}
-    echo "A new U-Boot version needs to be flashed onto $root."
-    echo "Do this now? [y|N]"
-    read -r shouldwe
-    if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
-      dd if=/boot/MLO of=$root count=1 seek=1 conv=notrunc bs=128k
-      dd if=/boot/u-boot.img of=$root count=2 seek=1 conv=notrunc bs=384k
-    else
-      echo "You can do this later by running:"
-      flash_instructions
-    fi
-  else
-    echo "Flash the new U-Boot version onto your boot device. For example:"
-    flash_instructions
-  fi
-  extlinux_warning
-}
-
-post_install() {
-  flash_uboot
-}
-
-post_upgrade() {
-  flash_uboot
-}
diff --git a/libre/uboot4extlinux-omap3_beagle/0001-parabola-arm-modifications.patch b/libre/uboot4extlinux-omap3_beagle/0001-parabola-arm-modifications.patch
deleted file mode 100644
index c99cd89b8..000000000
--- a/libre/uboot4extlinux-omap3_beagle/0001-parabola-arm-modifications.patch
+++ /dev/null
@@ -1,312 +0,0 @@
-diff -Nur u-boot-2016.01.orig/board/ti/beagle/beagle.c u-boot-2016.01/board/ti/beagle/beagle.c
---- u-boot-2016.01.orig/board/ti/beagle/beagle.c	2016-01-12 11:06:54.000000000 -0300
-+++ u-boot-2016.01/board/ti/beagle/beagle.c	2016-02-24 19:45:05.779336247 -0300
-@@ -56,6 +56,7 @@
- #define BBTOYS_WIFI			0x01000B00
- #define BBTOYS_VGA			0x02000B00
- #define BBTOYS_LCD			0x03000B00
-+#define BBTOYS_ULCD			0x04000B00
- #define BCT_BRETTL3			0x01000F00
- #define BCT_BRETTL4			0x02000F00
- #define LSR_COM6L_ADPT			0x01001300
-@@ -211,25 +212,25 @@
-  *		bus 1 for the availability of an AT24C01B serial EEPROM.
-  *		returns the device_vendor field from the EEPROM
-  */
--static unsigned int get_expansion_id(void)
-+static unsigned int get_expansion_id(int eeprom_address)
- {
- 	i2c_set_bus_num(EXPANSION_EEPROM_I2C_BUS);
- 
- 	/* return BEAGLE_NO_EEPROM if eeprom doesn't respond */
--	if (i2c_probe(EXPANSION_EEPROM_I2C_ADDRESS) == 1) {
-+	if (i2c_probe(eeprom_address) == 1) {
- 		i2c_set_bus_num(TWL4030_I2C_BUS);
- 		return BEAGLE_NO_EEPROM;
- 	}
- 
- 	/* read configuration data */
--	i2c_read(EXPANSION_EEPROM_I2C_ADDRESS, 0, 1, (u8 *)&expansion_config,
-+	i2c_read(eeprom_address, 0, 1, (u8 *)&expansion_config,
- 		 sizeof(expansion_config));
- 
- 	/* retry reading configuration data with 16bit addressing */
- 	if ((expansion_config.device_vendor == 0xFFFFFF00) ||
- 	    (expansion_config.device_vendor == 0xFFFFFFFF)) {
- 		printf("EEPROM is blank or 8bit addressing failed: retrying with 16bit:\n");
--		i2c_read(EXPANSION_EEPROM_I2C_ADDRESS, 0, 2, (u8 *)&expansion_config,
-+		i2c_read(eeprom_address, 0, 2, (u8 *)&expansion_config,
- 			 sizeof(expansion_config));
- 	}
- 
-@@ -341,15 +342,18 @@
- 	case REVISION_AXBX:
- 		printf("Beagle Rev Ax/Bx\n");
- 		setenv("beaglerev", "AxBx");
-+		setenv("musb", "musb_hdrc.fifo_mode=5");
- 		break;
- 	case REVISION_CX:
- 		printf("Beagle Rev C1/C2/C3\n");
- 		setenv("beaglerev", "Cx");
-+		setenv("musb", "musb_hdrc.fifo_mode=5");
- 		MUX_BEAGLE_C();
- 		break;
- 	case REVISION_C4:
- 		printf("Beagle Rev C4\n");
- 		setenv("beaglerev", "C4");
-+		setenv("musb", "musb_hdrc.fifo_mode=5");
- 		MUX_BEAGLE_C();
- 		/* Set VAUX2 to 1.8V for EHCI PHY */
- 		twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED,
-@@ -390,7 +394,7 @@
- 		generate_fake_mac = true;
- 	}
- 
--	switch (get_expansion_id()) {
-+	switch (get_expansion_id(EXPANSION_EEPROM_I2C_ADDRESS)) {
- 	case TINCANTOOLS_ZIPPY:
- 		printf("Recognized Tincantools Zippy board (rev %d %s)\n",
- 			expansion_config.revision,
-@@ -471,6 +475,30 @@
- 	}
- 
- 	if (expansion_config.content == 1)
-+		setenv(expansion_config.env_var, expansion_config.env_setting);
-+
-+	/* Scan 0x51 as well for loop-thru boards */
-+	switch (get_expansion_id(EXPANSION_EEPROM_I2C_ADDRESS + 1)) {
-+	case BBTOYS_ULCD:
-+		printf("Recognized BeagleBoardToys uLCD-lite board\n");
-+		setenv("buddy2", "bbtoys-ulcd");
-+		setenv("defaultdisplay", "dvi");
-+		setenv("dvimode", "800x480MR-16@60");
-+		setenv("lcd1", "i2c mw 40 00 00; i2c mw 40 04 80; i2c mw 40 0d 05");
-+		setenv("lcdcmd", "i2c dev 1 ; run lcd1; i2c dev 0");
-+		setenv("kmsmode", "video=DVI-D-1:800x480");
-+		break;
-+	case BEAGLE_NO_EEPROM:
-+		printf("No EEPROM on expansion board\n");
-+		setenv("buddy2", "none");
-+		break;
-+	default:
-+		printf("Unrecognized expansion board: %x\n",
-+			expansion_config.device_vendor);
-+		setenv("buddy2", "unknown");
-+	}
-+
-+	if (expansion_config.content == 1)
- 		setenv(expansion_config.env_var, expansion_config.env_setting);
- 
- 	twl4030_power_init();
-diff -Nur u-boot-2016.01.orig/include/configs/omap3_beagle.h u-boot-2016.01/include/configs/omap3_beagle.h
---- u-boot-2016.01.orig/include/configs/omap3_beagle.h	2016-01-12 11:06:54.000000000 -0300
-+++ u-boot-2016.01/include/configs/omap3_beagle.h	2016-02-24 19:50:25.959802093 -0300
-@@ -91,6 +91,12 @@
- #define CONFIG_USB_ETHER_MCS7830
- #define CONFIG_USB_ETHER_SMSC95XX
- 
-+/* Parabola GNU/Linux-libre extras */
-+#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre"
-+#define CONFIG_SUPPORT_RAW_INITRD
-+#define CONFIG_CMD_PART
-+#define CONFIG_PARTITION_UUIDS
-+
- /* GPIO banks */
- #define CONFIG_OMAP3_GPIO_5		/* GPIO128..159 is in GPIO bank 5 */
- #define CONFIG_OMAP3_GPIO_6		/* GPIO160..191 is in GPIO bank 6 */
-@@ -124,51 +130,71 @@
- #define CONFIG_SYS_MAX_NAND_DEVICE	1		/* Max number of NAND */
- 							/* devices */
- 
-+/* Enable Extlinux boot support */
-+#define CONFIG_CMD_PXE
-+#define CONFIG_MENU
-+#define BOOT_TARGET_DEVICES(func)
-+#include <config_distro_bootcmd.h>
-+
- #define CONFIG_EXTRA_ENV_SETTINGS \
--	"loadaddr=0x80200000\0" \
--	"rdaddr=0x81000000\0" \
-+	BOOTENV \
-+	"loadaddr=0x82000000\0" \
-+	"rdaddr=0x88080000\0" \
- 	"fdt_high=0xffffffff\0" \
--	"fdtaddr=0x80f80000\0" \
--	"usbtty=cdc_acm\0" \
--	"bootfile=uImage\0" \
--	"ramdisk=ramdisk.gz\0" \
--	"bootdir=/boot\0" \
--	"bootpart=0:2\0" \
-+	"fdtaddr=0x88000000\0" \
- 	"console=ttyO2,115200n8\0" \
--	"mpurate=auto\0" \
--	"buddy=none\0" \
--	"optargs=\0" \
--	"camera=none\0" \
--	"vram=12M\0" \
--	"dvimode=640x480MR-16@60\0" \
--	"defaultdisplay=dvi\0" \
-+	"fdtfile=undefined\0" \
-+	"bootpart=0:1\0" \
-+	"bootdir=\0" \
-+	"fdtdir=/dtbs\0" \
-+	"bootfile=zImage\0" \
-+	"rdfile=initramfs-linux.img\0" \
- 	"mmcdev=0\0" \
--	"mmcroot=/dev/mmcblk0p2 rw\0" \
--	"mmcrootfstype=ext3 rootwait\0" \
--	"nandroot=ubi0:rootfs ubi.mtd=4\0" \
--	"nandrootfstype=ubifs\0" \
--	"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=0x81000000,64M\0" \
--	"ramrootfstype=ext2\0" \
-+	"optargs=\0" \
- 	"mmcargs=setenv bootargs console=${console} " \
- 		"${optargs} " \
--		"mpurate=${mpurate} " \
--		"buddy=${buddy} "\
--		"camera=${camera} "\
--		"vram=${vram} " \
--		"omapfb.mode=dvi:${dvimode} " \
--		"omapdss.def_disp=${defaultdisplay} " \
--		"root=${mmcroot} " \
--		"rootfstype=${mmcrootfstype}\0" \
--	"nandargs=setenv bootargs console=${console} " \
--		"${optargs} " \
--		"mpurate=${mpurate} " \
--		"buddy=${buddy} "\
--		"camera=${camera} "\
--		"vram=${vram} " \
--		"omapfb.mode=dvi:${dvimode} " \
--		"omapdss.def_disp=${defaultdisplay} " \
--		"root=${nandroot} " \
--		"rootfstype=${nandrootfstype}\0" \
-+		"root=${root} " \
-+		"${musb} " \
-+		"${cmdline}\0" \
-+	"loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-+	"loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \
-+	"loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdtaddr} ${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;" \
-+				"if test ${devtype} = mmc; then part uuid mmc ${devnum}:2 uuid; else part uuid ${devtype} ${devnum}:1 uuid; fi;" \
-+				"part uuid ${devtype} ${rootpart} 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} ${fdtaddr};" \
-+						"else " \
-+							"bootz ${loadaddr} - ${fdtaddr};" \
-+						"fi;" \
-+					"fi;" \
-+				"else " \
-+					"echo No kernel found;" \
-+				"fi;" \
-+				"setexpr devnum ${devnum} + 1;" \
-+			"done;" \
-+		"done;\0" \
- 	"findfdt=" \
- 		"if test $beaglerev = AxBx; then " \
- 			"setenv fdtfile omap3-beagle.dtb; fi; " \
-@@ -181,81 +207,11 @@
- 		"if test $beaglerev = xMC; then " \
- 			"setenv fdtfile omap3-beagle-xm.dtb; fi; " \
- 		"if test $fdtfile = undefined; then " \
--			"echo WARNING: Could not determine device tree to use; fi; \0" \
--	"validatefdt=" \
--		"if test $beaglerev = xMAB; then " \
--			"if test ! -e mmc ${bootpart} ${bootdir}/${fdtfile}; then " \
--				"setenv fdtfile omap3-beagle-xm.dtb; " \
--			"fi; " \
--		"fi; \0" \
--	"bootenv=uEnv.txt\0" \
--	"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
--	"importbootenv=echo Importing environment from mmc ...; " \
--		"env import -t -r $loadaddr $filesize\0" \
--	"ramargs=setenv bootargs console=${console} " \
--		"${optargs} " \
--		"mpurate=${mpurate} " \
--		"buddy=${buddy} "\
--		"vram=${vram} " \
--		"omapfb.mode=dvi:${dvimode} " \
--		"omapdss.def_disp=${defaultdisplay} " \
--		"root=${ramroot} " \
--		"rootfstype=${ramrootfstype}\0" \
--	"loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \
--	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
--	"loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
--	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
--		"source ${loadaddr}\0" \
--	"loadfdt=run validatefdt; load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
--	"mmcboot=echo Booting from mmc ...; " \
--		"run mmcargs; " \
--		"bootm ${loadaddr}\0" \
--	"mmcbootz=echo Booting with DT from mmc${mmcdev} ...; " \
--		"run mmcargs; " \
--		"bootz ${loadaddr} - ${fdtaddr}\0" \
--	"nandboot=echo Booting from nand ...; " \
--		"run nandargs; " \
--		"nand read ${loadaddr} 280000 400000; " \
--		"bootm ${loadaddr}\0" \
--	"ramboot=echo Booting from ramdisk ...; " \
--		"run ramargs; " \
--		"bootm ${loadaddr}\0" \
--	"userbutton=if gpio input 173; then run userbutton_xm; " \
--		"else run userbutton_nonxm; fi;\0" \
--	"userbutton_xm=gpio input 4;\0" \
--	"userbutton_nonxm=gpio input 7;\0"
--/* "run userbutton" will return 1 (false) if pressed and 0 (true) if not */
-+			"echo WARNING: Could not determine device tree to use; fi; \0"
-+
- #define CONFIG_BOOTCOMMAND \
- 	"run findfdt; " \
--	"mmc dev ${mmcdev}; if mmc rescan; then " \
--		"if run userbutton; then " \
--			"setenv bootenv uEnv.txt;" \
--		"else " \
--			"setenv bootenv user.txt;" \
--		"fi;" \
--		"echo SD/MMC found on device ${mmcdev};" \
--		"if run loadbootenv; then " \
--			"echo Loaded environment from ${bootenv};" \
--			"run importbootenv;" \
--		"fi;" \
--		"if test -n $uenvcmd; then " \
--			"echo Running uenvcmd ...;" \
--			"run uenvcmd;" \
--		"fi;" \
--		"if run loadbootscript; then " \
--			"run bootscript; " \
--		"else " \
--			"if run loadimage; then " \
--				"run mmcboot;" \
--			"fi;" \
--		"fi; " \
--	"fi;" \
--	"run nandboot;" \
--	"setenv bootfile zImage;" \
--	"if run loadimage; then " \
--		"run loadfdt;" \
--		"run mmcbootz; " \
--	"fi; " \
-+	"run mmcboot"
- 
- /*
-  * OMAP3 has 12 GP timers, they can be driven by the system clock
diff --git a/libre/uboot4extlinux-omap3_beagle/PKGBUILD b/libre/uboot4extlinux-omap3_beagle/PKGBUILD
deleted file mode 100644
index a3c16f7cc..000000000
--- a/libre/uboot4extlinux-omap3_beagle/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# U-Boot: BeagleBoard and BeagleBoard-xM
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-buildarch=4
-
-pkgname=uboot4extlinux-omap3_beagle
-pkgver=2016.01
-pkgrel=1
-pkgdesc="U-Boot with Extlinux support for BeagleBoard and BeagleBoard-xM"
-arch=('armv7h')
-url="http://git.denx.de/u-boot.git/"
-license=('GPL')
-replaces=('uboot-beagleboard-linux-libre' 'uboot-beagleboard-linux-libre-lts'
-          'uboot-beagleboard-linux-libre-grsec' 'uboot-beagleboard-linux-libre-pck'
-          'uboot-beagleboard' 'uboot-omap3_beagle')
-conflicts=('uboot-beagleboard-linux-libre' 'uboot-beagleboard-linux-libre-lts'
-           'uboot-beagleboard-linux-libre-grsec' 'uboot-beagleboard-linux-libre-pck'
-           'uboot-beagleboard' 'uboot-omap3_beagle' 'uboot4grub-omap3_beagle')
-makedepends=('bc')
-backup=(boot/extlinux/extlinux.conf)
-install=${pkgname}.install
-source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
-        '0001-parabola-arm-modifications.patch'
-        'extlinux.conf'
-        'uEnv.txt')
-md5sums=('7d4f65fd43d4d706f5c5650e020d899d'
-         'da3d52f785bce02602f88fb85f74de2f'
-         '5172c86fd491728aad8109ebb8a997f8'
-         'd41d8cd98f00b204e9800998ecf8427e')
-
-prepare() {
-  cd u-boot-${pkgver}
-  patch -Np1 -i ../0001-parabola-arm-modifications.patch
-}
-
-build() {
-  cd u-boot-${pkgver}
-
-  unset LDFLAGS CFLAGS CXXFLAGS
-
-  make distclean
-  make omap3_beagle_config
-  make
-}
-
-package() {
-  cd u-boot-${pkgver}
-  mkdir -p "${pkgdir}"/boot/extlinux
-  cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}"/boot
-  cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux
-}
diff --git a/libre/uboot4extlinux-omap3_beagle/extlinux.conf b/libre/uboot4extlinux-omap3_beagle/extlinux.conf
deleted file mode 100644
index 708bfcddb..000000000
--- a/libre/uboot4extlinux-omap3_beagle/extlinux.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-menu title Welcome to U-Boot with Extlinux support!
-
-label Parabola GNU/Linux-libre, linux-libre kernel
-	kernel /vmlinuz-linux-libre
-	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-	fdtdir /dtbs/linux-libre
-
-#label Parabola GNU/Linux-libre, linux-libre-lts kernel
-#	kernel /vmlinuz-linux-libre-lts
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-lts
-
-#label Parabola GNU/Linux-libre, linux-libre-knock kernel
-#	kernel /vmlinuz-linux-libre-knock
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-lts-knock kernel
-#	kernel /vmlinuz-linux-libre-lts-knock
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-lts-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec kernel
-#	kernel /vmlinuz-linux-libre-grsec
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-grsec
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec-knock kernel
-#	kernel /vmlinuz-linux-libre-grsec-knock
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-grsec-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-audit kernel
-#	kernel /vmlinuz-linux-libre-audit
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-audit
-
-#label Parabola GNU/Linux-libre, linux-libre-pck kernel
-#	kernel /vmlinuz-linux-libre-pck
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-pck
-
-#label Parabola GNU/Linux-libre, linux-libre-rt kernel
-#	kernel /vmlinuz-linux-libre-rt
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /dtbs/linux-libre-rt
diff --git a/libre/uboot4extlinux-omap3_beagle/uEnv.txt b/libre/uboot4extlinux-omap3_beagle/uEnv.txt
deleted file mode 100644
index e69de29bb..000000000
--- a/libre/uboot4extlinux-omap3_beagle/uEnv.txt
+++ /dev/null
diff --git a/libre/uboot4extlinux-omap3_beagle/uboot4extlinux-omap3_beagle.install b/libre/uboot4extlinux-omap3_beagle/uboot4extlinux-omap3_beagle.install
deleted file mode 100644
index 8aff26699..000000000
--- a/libre/uboot4extlinux-omap3_beagle/uboot4extlinux-omap3_beagle.install
+++ /dev/null
@@ -1,11 +0,0 @@
-extlinux_warning() {
-  echo "==> WARNING: U-Boot uses Extlinux support to boot up. For setting it up, edit /boot/extlinux/extlinux.conf"
-}
-
-post_install() {
-  extlinux_warning
-}
-
-post_upgrade() {
-  extlinux_warning
-}
diff --git a/libre/uboot4extlinux-omap4_panda/0001-parabola-arm-modifications.patch b/libre/uboot4extlinux-omap4_panda/0001-parabola-arm-modifications.patch
deleted file mode 100644
index 09aee7ce0..000000000
--- a/libre/uboot4extlinux-omap4_panda/0001-parabola-arm-modifications.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-diff -Nur u-boot-2016.01.orig/include/configs/ti_omap4_common.h u-boot-2016.01/include/configs/ti_omap4_common.h
---- u-boot-2016.01.orig/include/configs/ti_omap4_common.h	2016-01-12 11:06:54.000000000 -0300
-+++ u-boot-2016.01/include/configs/ti_omap4_common.h	2016-02-24 23:19:09.761629260 -0300
-@@ -46,7 +46,6 @@
-  * the timings to use or use pre-determined timings (based on using the
-  * dynamic method.  Default to the static timing infomation.
-  */
--#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
- #ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS
- #define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION
- #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS
-@@ -79,33 +78,74 @@
- #define CONFIG_USB_TTY			1
- #define CONFIG_SYS_CONSOLE_IS_IN_ENV	1
- 
-+/* Parabola GNU/Linux-libre extras */
-+#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>
-+
- /*
-  * Environment setup
-  */
- #define CONFIG_EXTRA_ENV_SETTINGS \
-+	BOOTENV \
- 	DEFAULT_LINUX_BOOT_ENV \
- 	DEFAULT_MMC_TI_ARGS \
- 	"console=ttyO2,115200n8\0" \
- 	"fdtfile=undefined\0" \
- 	"bootpart=0:2\0" \
- 	"bootdir=/boot\0" \
-+	"fdtdir=/boot/dtbs\0" \
- 	"bootfile=zImage\0" \
-+	"rdfile=initramfs-linux.img\0" \
- 	"usbtty=cdc_acm\0" \
- 	"vram=16M\0" \
--	"loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
--	"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
--		"source ${loadaddr}\0" \
--	"loadbootenv=load mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
--	"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
--		"env import -t ${loadaddr} ${filesize}\0" \
--	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
--	"loaduimage=load mmc ${mmcdev} ${loadaddr} uImage\0" \
--	"mmcboot=echo Booting from mmc${mmcdev} ...; " \
--		"run args_mmc; " \
--		"bootz ${loadaddr} - ${fdtaddr}\0" \
--	"uimageboot=echo Booting from mmc${mmcdev} ...; " \
--		"run args_mmc; " \
--		"bootm ${loadaddr}\0" \
-+	"optargs=\0" \
-+	"mmcargs=setenv bootargs console=${console} " \
-+		"vram=${vram} " \
-+		"root=${root} " \
-+		"${optargs}\0" \
-+	"loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-+	"loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \
-+	"loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdtaddr} ${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} ${fdtaddr};" \
-+						"else " \
-+							"bootz ${loadaddr} - ${fdtaddr};" \
-+						"fi;" \
-+					"fi;" \
-+				"else " \
-+					"echo No kernel found;" \
-+				"fi;" \
-+				"setexpr devnum ${devnum} + 1;" \
-+			"done;" \
-+		"done;\0" \
- 	"findfdt="\
- 		"if test $board_name = sdp4430; then " \
- 			"setenv fdtfile omap4-sdp.dtb; fi; " \
-@@ -118,32 +158,11 @@
- 		"if test $board_name = duovero; then " \
- 			"setenv fdtfile omap4-duovero-parlor.dtb; fi;" \
- 		"if test $fdtfile = undefined; then " \
--			"echo WARNING: Could not determine device tree to use; fi; \0" \
--	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
-+			"echo WARNING: Could not determine device tree to use; fi; \0"
- 
- #define CONFIG_BOOTCOMMAND \
- 	"run findfdt; " \
--	"mmc dev ${mmcdev}; if mmc rescan; then " \
--		"echo SD/MMC found on device ${mmcdev};" \
--		"if run loadbootscript; then " \
--			"run bootscript; " \
--		"else " \
--			"if run loadbootenv; then " \
--				"run importbootenv; " \
--			"fi;" \
--			"if test -n ${uenvcmd}; then " \
--				"echo Running uenvcmd ...;" \
--				"run uenvcmd;" \
--			"fi;" \
--		"fi;" \
--		"if run loadimage; then " \
--			"run loadfdt;" \
--			"run mmcboot; " \
--		"fi; " \
--		"if run loaduimage; then " \
--			"run uimageboot;" \
--		"fi; " \
--	"fi"
-+	"run mmcboot"
- 
- /*
-  * Defines for SPL
diff --git a/libre/uboot4extlinux-omap4_panda/PKGBUILD b/libre/uboot4extlinux-omap4_panda/PKGBUILD
deleted file mode 100644
index cf9132074..000000000
--- a/libre/uboot4extlinux-omap4_panda/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# U-Boot: PandaBoard and PandaBoard ES
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-buildarch=4
-
-pkgname=uboot4extlinux-omap4_panda
-pkgver=2016.01
-pkgrel=1
-pkgdesc="U-Boot with Extlinux support for PandaBoard and PandaBoard ES"
-arch=('armv7h')
-url="http://git.denx.de/u-boot.git/"
-replaces=('uboot-pandaboard-linux-libre' 'uboot-pandaboard' 'uboot-omap4_panda')
-conflicts=('uboot-pandaboard-linux-libre' 'uboot-pandaboard' 'uboot-omap4_panda' 'uboot4grub-omap4_panda')
-makedepends=('bc')
-license=('GPL')
-install=${pkgname}.install
-backup=('boot/extlinux/extlinux.conf' 'boot/uEnv.txt')
-source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
-        '0001-parabola-arm-modifications.patch'
-        'extlinux.conf'
-        'uEnv.txt')
-md5sums=('7d4f65fd43d4d706f5c5650e020d899d'
-         'b74e858feeed48acaba5ac0548d675ca'
-         '12c61073bb860f4c8d8ec59145c267ed'
-         '86004660f2912861a040e335c9c0e85b')
-
-prepare() {
-  cd u-boot-${pkgver}
-
-  patch -Np1 -i ../0001-parabola-arm-modifications.patch
-}
-
-build() {
-  cd u-boot-${pkgver}
-
-  unset LDFLAGS
-
-  make distclean
-  make omap4_panda_config
-  make
-}
-
-package() {
-  cd u-boot-${pkgver}
-
-  mkdir -p "${pkgdir}"/boot/extlinux
-  cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}"/boot
-  cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux
-}
diff --git a/libre/uboot4extlinux-omap4_panda/extlinux.conf b/libre/uboot4extlinux-omap4_panda/extlinux.conf
deleted file mode 100644
index 725121811..000000000
--- a/libre/uboot4extlinux-omap4_panda/extlinux.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-menu title Welcome to U-Boot with Extlinux support!
-
-label Parabola GNU/Linux-libre, linux-libre kernel
-	kernel /boot/vmlinuz-linux-libre
-	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-	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=ttyO2,115200n8
-#	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=ttyO2,115200n8
-#	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=ttyO2,115200n8
-#	fdtdir /boot/dtbs/linux-libre-lts-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec kernel
-#	kernel /boot/vmlinuz-linux-libre-grsec
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /boot/dtbs/linux-libre-grsec
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec-knock kernel
-#	kernel /boot/vmlinuz-linux-libre-grsec-knock
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	fdtdir /boot/dtbs/linux-libre-grsec-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-audit kernel
-#	kernel /boot/vmlinuz-linux-libre-audit
-#	append root=/dev/mmcblk0p1 rw console=ttyO2,115200n8
-#	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=ttyO2,115200n8
-#	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=ttyO2,115200n8
-#	fdtdir /boot/dtbs/linux-libre-rt
diff --git a/libre/uboot4extlinux-omap4_panda/uEnv.txt b/libre/uboot4extlinux-omap4_panda/uEnv.txt
deleted file mode 100644
index 55298e1a9..000000000
--- a/libre/uboot4extlinux-omap4_panda/uEnv.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# Uncomment and add any additional kernel parameters to optargs
-#optargs=
diff --git a/libre/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install b/libre/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install
deleted file mode 100644
index 771f1f0b3..000000000
--- a/libre/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install
+++ /dev/null
@@ -1,26 +0,0 @@
-extlinux_warning() {
-  echo "==> WARNING: U-Boot uses Extlinux support to boot up. For setting it up, edit /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/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k
-    dd if=/boot/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k
-  else
-    echo "You can do this later by running:"
-    echo "# dd if=/boot/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k"
-    echo "# dd if=/boot/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k"
-  fi
-  extlinux_warning
-}
-
-post_install() {
-  flash_uboot
-}
-
-post_upgrade() {
-  flash_uboot
-}
diff --git a/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch b/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
deleted file mode 100644
index 5b59f18af..000000000
--- a/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -Nur u-boot-2016.01.orig/include/config_distro_defaults.h u-boot-2016.01/include/config_distro_defaults.h
---- u-boot-2016.01.orig/include/config_distro_defaults.h	2016-01-12 11:06:54.000000000 -0300
-+++ u-boot-2016.01/include/config_distro_defaults.h	2016-02-26 13:23:28.880315683 -0300
-@@ -67,4 +67,7 @@
- #define CONFIG_SUPPORT_RAW_INITRD
- #define CONFIG_SYS_HUSH_PARSER
- 
-+#define CONFIG_CMD_PART
-+#define CONFIG_PARTITION_UUIDS
-+
- #endif	/* _CONFIG_CMD_DISTRO_DEFAULTS_H */
-diff -Nur u-boot-2016.01.orig/include/configs/sunxi-common.h u-boot-2016.01/include/configs/sunxi-common.h
---- u-boot-2016.01.orig/include/configs/sunxi-common.h	2016-01-12 11:06:54.000000000 -0300
-+++ u-boot-2016.01/include/configs/sunxi-common.h	2016-02-26 14:37:41.077919620 -0300
-@@ -173,7 +173,7 @@
- #define CONFIG_SYS_NO_FLASH
- 
- #define CONFIG_SYS_MONITOR_LEN		(768 << 10)	/* 768 KiB */
--#define CONFIG_IDENT_STRING		" Allwinner Technology"
-+#define CONFIG_IDENT_STRING		" Parabola GNU/Linux-libre"
- 
- #define CONFIG_ENV_OFFSET		(544 << 10) /* (8 + 24 + 512) KiB */
- #define CONFIG_ENV_SIZE			(128 << 10)	/* 128 KiB */
-@@ -449,6 +449,9 @@
- #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) \
-@@ -457,6 +460,7 @@
- 	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 \
-@@ -474,8 +478,6 @@
- #define BOOTCMD_SUNXI_COMPAT
- #endif
- 
--#include <config_distro_bootcmd.h>
--
- #ifdef CONFIG_USB_KEYBOARD
- #define CONSOLE_STDIN_SETTINGS \
- 	"preboot=usb start\0" \
-@@ -500,13 +502,13 @@
- 	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
diff --git a/libre/uboot4extlinux-sunxi/PKGBUILD b/libre/uboot4extlinux-sunxi/PKGBUILD
deleted file mode 100644
index 7c82f57e8..000000000
--- a/libre/uboot4extlinux-sunxi/PKGBUILD
+++ /dev/null
@@ -1,237 +0,0 @@
-# U-Boot: sunXi
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-buildarch=4
-
-pkgbase=uboot4extlinux-sunxi
-pkgname=('uboot4extlinux-a10-olinuxino-lime'
-         'uboot4extlinux-a10s-olinuxino-micro'
-         'uboot4extlinux-a13-olinuxino'
-         'uboot4extlinux-a13-olinuxino-micro'
-         'uboot4extlinux-a20-olinuxino-lime'
-         'uboot4extlinux-a20-olinuxino-lime2'
-         'uboot4extlinux-a20-olinuxino-micro'
-         'uboot4extlinux-cubieboard'
-         'uboot4extlinux-cubieboard2'
-         'uboot4extlinux-cubietruck'
-         'uboot4extlinux-pcduino'
-         'uboot4extlinux-pcduino3'
-         'uboot4extlinux-pcduino3-nano')
-pkgver=2016.01
-pkgrel=1
-arch=('armv7h')
-url="http://git.denx.de/u-boot.git/"
-license=('GPL')
-makedepends=('bc' 'dtc')
-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')
-md5sums=('7d4f65fd43d4d706f5c5650e020d899d'
-         '8cac8444bd1d229063a150d212cc360a'
-         'acd3e7b3c45c2801c2435f4a5de3f58c')
-
-boards=('A10-OLinuXino-Lime'
-        'A10s-OLinuXino-M'
-        'A13-OLinuXino'
-        'A13-OLinuXinoM'
-        'A20-OLinuXino-Lime'
-        'A20-OLinuXino-Lime2'
-        'A20-OLinuXino_MICRO'
-        'Cubieboard'
-        'Cubieboard2'
-        'Cubietruck'
-        'Linksprite_pcDuino'
-        'Linksprite_pcDuino3'
-        'Linksprite_pcDuino3_Nano')
-
-prepare() {
-  cd u-boot-${pkgver}
-
-  patch -Np1 -i ../0001-parabola-arm-modifications.patch
-}
-
-build() {
-  cd u-boot-${pkgver}
-
-  unset CFLAGS
-  unset CXXFLAGS
-  unset LDFLAGS
-
-  for i in ${boards[@]}; do
-    mkdir ../bin_${i}
-    make distclean
-    make ${i}_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=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-a10-olinuxino-lime' 'uboot-a10-olinuxino-lime-linux-libre')
-  replaces=('uboot-a10-olinuxino-lime' 'uboot-a10-olinuxino-lime-linux-libre' 'uboot4grub-a10-olinuxino-lime')
-
-  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-micro() {
-  pkgdesc="U-Boot with Extlinux support for A10s OLinuXino Micro"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-a10s-olinuxino-micro' 'uboot-a10s-olinuxino-micro-linux-libre')
-  replaces=('uboot-a10s-olinuxino-micro' 'uboot-a10s-olinuxino-micro-linux-libre' 'uboot4grub-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=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-a13-olinuxino' 'uboot-a13-olinuxino-linux-libre')
-  replaces=('uboot-a13-olinuxino' 'uboot-a13-olinuxino-linux-libre' 'uboot4grub-a13-olinuxino')
-
-  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-olinuxino-micro() {
-  pkgdesc="U-Boot with Extlinux support for A13 OLinuXino Micro"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-a13-olinuxino-micro' 'uboot-a13-olinuxino-micro-linux-libre')
-  replaces=('uboot-a13-olinuxino-micro' 'uboot-a13-olinuxino-micro-linux-libre' 'uboot4grub-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=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-a20-olinuxino-lime' 'uboot-a20-olinuxino-lime-linux-libre')
-  replaces=('uboot-a20-olinuxino-lime' 'uboot-a20-olinuxino-lime-linux-libre' 'uboot4grub-a20-olinuxino-lime')
-
-  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=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-a20-olinuxino-lime2' 'uboot-a20-olinuxino-lime2-linux-libre')
-  replaces=('uboot-a20-olinuxino-lime2' 'uboot-a20-olinuxino-lime2-linux-libre' 'uboot4grub-a20-olinuxino-lime2')
-
-  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=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-a20-olinuxino-micro' 'uboot-a20-olinuxino-micro-linux-libre')
-  replaces=('uboot-a20-olinuxino-micro' 'uboot-a20-olinuxino-micro-linux-libre' 'uboot4grub-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-cubieboard() {
-  pkgdesc="U-Boot with Extlinux support for Cubieboard"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-cubieboard' 'uboot-cubieboard-linux-libre')
-  replaces=('uboot-cubieboard' 'uboot-cubieboard-linux-libre' 'uboot4grub-cubieboard')
-
-  install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_Cubieboard/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin
-
-  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
-}
-
-package_uboot4extlinux-cubieboard2() {
-  pkgdesc="U-Boot with Extlinux support for Cubieboard 2"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-cubieboard2' 'uboot-cubieboard2-linux-libre')
-  replaces=('uboot-cubieboard2' 'uboot-cubieboard2-linux-libre' 'uboot4grub-cubieboard2')
-
-  install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_Cubieboard2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin
-
-  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
-}
-
-package_uboot4extlinux-cubietruck() {
-  pkgdesc="U-Boot with Extlinux support for Cubietruck"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-cubietruck' 'uboot-cubietruck-linux-libre')
-  replaces=('uboot-cubietruck' 'uboot-cubietruck-linux-libre' 'uboot4grub-cubietruck')
-
-  install -d "${pkgdir}"/boot/extlinux
-  install -Dm644 bin_Cubietruck/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin
-
-  install -Dm644 extlinux.conf "${pkgdir}"/boot/extlinux
-}
-
-package_uboot4extlinux-pcduino() {
-  pkgdesc="U-Boot with Extlinux support for pcDuino"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-pcduino' 'uboot-pcduino-linux-libre')
-  replaces=('uboot-pcduino' 'uboot-pcduino-linux-libre' 'uboot4grub-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-pcduino3() {
-  pkgdesc="U-Boot with Extlinux support for pcDuino3"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-pcduino3' 'uboot-pcduino3-linux-libre')
-  replaces=('uboot-pcduino3' 'uboot-pcduino3-linux-libre' 'uboot4grub-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-pcduino3-nano() {
-  pkgdesc="U-Boot with Extlinux support for pcDuino3 Nano"
-  install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-pcduino3-nano' 'uboot-pcduino3-nano-linux-libre')
-  replaces=('uboot-pcduino3-nano' 'uboot-pcduino3-nano-linux-libre' 'uboot4grub-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
-}
diff --git a/libre/uboot4extlinux-sunxi/extlinux.conf b/libre/uboot4extlinux-sunxi/extlinux.conf
deleted file mode 100644
index 66f6b30d5..000000000
--- a/libre/uboot4extlinux-sunxi/extlinux.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-menu title Welcome to U-Boot with Extlinux support!
-
-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-grsec kernel
-#	kernel /boot/vmlinuz-linux-libre-grsec
-#	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
-#	fdtdir /boot/dtbs/linux-libre-grsec
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec-knock kernel
-#	kernel /boot/vmlinuz-linux-libre-grsec-knock
-#	append root=/dev/mmcblk0p1 rw console=ttyS0,115200
-#	fdtdir /boot/dtbs/linux-libre-grsec-knock
-
-#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
diff --git a/libre/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install b/libre/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install
deleted file mode 100644
index e39c2cd2e..000000000
--- a/libre/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install
+++ /dev/null
@@ -1,27 +0,0 @@
-extlinux_warning() {
-  echo "==> WARNING: U-Boot uses Extlinux support to boot up. For setting it up, edit /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
-}
-
-## arg 1:  the new package version
-post_install() {
-  flash_uboot
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  flash_uboot
-}
diff --git a/libre/uboot4extlinux-udoo/0001-parabola-arm-modifications.patch b/libre/uboot4extlinux-udoo/0001-parabola-arm-modifications.patch
deleted file mode 100644
index 7328d1ad7..000000000
--- a/libre/uboot4extlinux-udoo/0001-parabola-arm-modifications.patch
+++ /dev/null
@@ -1,389 +0,0 @@
-diff -Nur u-boot-2015.01.orig/board/udoo/1066mhz_4x256mx16_dl.cfg u-boot-2015.01/board/udoo/1066mhz_4x256mx16_dl.cfg
---- u-boot-2015.01.orig/board/udoo/1066mhz_4x256mx16_dl.cfg	1969-12-31 21:00:00.000000000 -0300
-+++ u-boot-2015.01/board/udoo/1066mhz_4x256mx16_dl.cfg	2016-02-23 18:15:32.854611743 -0300
-@@ -0,0 +1,58 @@
-+/*
-+ * Copyright (C) 2013 Seco USA Inc
-+ *
-+ * SPDX-License-Identifier:	GPL-2.0+
-+ */
-+
-+
-+DATA 4, MX6_MMDC_P0_MDPDC,	0x0002002D
-+DATA 4, MX6_MMDC_P0_MDOTC,	0x00333040
-+
-+DATA 4, MX6_MMDC_P0_MDCFG0,	0x3F4352F3
-+DATA 4, MX6_MMDC_P0_MDCFG1,	0xB66D8B63
-+DATA 4, MX6_MMDC_P0_MDCFG2,	0x01FF00DB
-+
-+DATA 4, MX6_MMDC_P0_MDMISC,	0x00001740
-+DATA 4, MX6_MMDC_P0_MDSCR,	0x00008000
-+DATA 4, MX6_MMDC_P0_MDRWD,	0x000026D2
-+
-+
-+DATA 4, MX6_MMDC_P0_MDOR,	0x00431023
-+DATA 4, MX6_MMDC_P0_MDASP,	0x00000027
-+DATA 4, MX6_MMDC_P0_MDCTL,	0x831A0000
-+
-+DATA 4, MX6_MMDC_P0_MDSCR,	0x02008032
-+DATA 4, MX6_MMDC_P0_MDSCR,	0x00008033
-+DATA 4, MX6_MMDC_P0_MDSCR,	0x00048031
-+DATA 4, MX6_MMDC_P0_MDSCR,	0x05208030
-+DATA 4, MX6_MMDC_P0_MDSCR,	0x04008040
-+
-+DATA 4, MX6_MMDC_P0_MPZQHWCTRL,	0xa1390003
-+DATA 4, MX6_MMDC_P1_MPZQHWCTRL,	0xa1390003
-+
-+DATA 4, MX6_MMDC_P0_MDREF,	0x00007800
-+
-+DATA 4, MX6_MMDC_P0_MPODTCTRL,	0x00022227
-+DATA 4, MX6_MMDC_P1_MPODTCTRL,	0x00022227
-+
-+DATA 4, MX6_MMDC_P0_MPDGCTRL0,	0x425C0251
-+DATA 4, MX6_MMDC_P0_MPDGCTRL1,	0x021B021E
-+DATA 4, MX6_MMDC_P1_MPDGCTRL0,	0x021B021E
-+DATA 4, MX6_MMDC_P1_MPDGCTRL1,	0x01730200
-+
-+DATA 4, MX6_MMDC_P0_MPRDDLCTL,	0x45474C45
-+DATA 4, MX6_MMDC_P1_MPRDDLCTL,	0x44464744
-+DATA 4, MX6_MMDC_P0_MPWRDLCTL,	0x3F3F3336
-+DATA 4, MX6_MMDC_P1_MPWRDLCTL,	0x32383630
-+
-+DATA 4, MX6_MMDC_P0_MPWLDECTRL0,	0x002F0038
-+DATA 4, MX6_MMDC_P0_MPWLDECTRL1,	0x001F001F
-+DATA 4, MX6_MMDC_P1_MPWLDECTRL0,	0x001F001F
-+DATA 4, MX6_MMDC_P1_MPWLDECTRL1,	0x001F001F
-+
-+DATA 4, MX6_MMDC_P0_MPMUR0,	0x00000000
-+DATA 4, MX6_MMDC_P1_MPMUR0,	0x00000000
-+
-+DATA 4, MX6_MMDC_P0_MDPDC,	0x0002556D
-+DATA 4, MX6_MMDC_P0_MAPSR,	0x00011006
-+DATA 4, MX6_MMDC_P0_MDSCR,	0x00000000
-diff -Nur u-boot-2015.01.orig/board/udoo/ddr-setup_dl.cfg u-boot-2015.01/board/udoo/ddr-setup_dl.cfg
---- u-boot-2015.01.orig/board/udoo/ddr-setup_dl.cfg	1969-12-31 21:00:00.000000000 -0300
-+++ u-boot-2015.01/board/udoo/ddr-setup_dl.cfg	2016-02-23 18:15:32.854611743 -0300
-@@ -0,0 +1,84 @@
-+/*
-+ * Copyright (C) 2013 Seco USA Inc
-+ *
-+ * SPDX-License-Identifier:	GPL-2.0+
-+ *
-+ * Device Configuration Data (DCD)
-+ *
-+ * Each entry must have the format:
-+ * Addr-type           Address        Value
-+ *
-+ * where:
-+ *      Addr-type register length (1,2 or 4 bytes)
-+ *      Address   absolute address of the register
-+ *      value     value to be stored in the register
-+ */
-+
-+/*
-+ * DDR3 settings
-+ * MX6Q    ddr is limited to 1066 Mhz	currently 1056 MHz(528 MHz clock),
-+ *	   memory bus width: 64 bits	x16/x32/x64
-+ * MX6DL   ddr is limited to 800 MHz(400 MHz clock)
-+ *	   memory bus width: 64 bits	x16/x32/x64
-+ * MX6SOLO ddr is limited to 800 MHz(400 MHz clock)
-+ *	   memory bus width: 32 bits	x16/x32
-+ */
-+DATA 4, MX6_IOM_DRAM_SDQS0,	0x00000028
-+DATA 4, MX6_IOM_DRAM_SDQS1,	0x00000028
-+DATA 4, MX6_IOM_DRAM_SDQS2,	0x00000028
-+DATA 4, MX6_IOM_DRAM_SDQS3,	0x00000028
-+DATA 4, MX6_IOM_DRAM_SDQS4,	0x00000028
-+DATA 4, MX6_IOM_DRAM_SDQS5,	0x00000028
-+DATA 4, MX6_IOM_DRAM_SDQS6,	0x00000028
-+DATA 4, MX6_IOM_DRAM_SDQS7,	0x00000028
-+
-+DATA 4, MX6_IOM_GRP_B0DS,	0x00000028
-+DATA 4, MX6_IOM_GRP_B1DS,	0x00000028
-+DATA 4, MX6_IOM_GRP_B2DS,	0x00000028
-+DATA 4, MX6_IOM_GRP_B3DS,	0x00000028
-+DATA 4, MX6_IOM_GRP_B4DS,	0x00000028
-+DATA 4, MX6_IOM_GRP_B5DS,	0x00000028
-+DATA 4, MX6_IOM_GRP_B6DS,	0x00000028
-+DATA 4, MX6_IOM_GRP_B7DS,	0x00000028
-+DATA 4, MX6_IOM_GRP_ADDDS,	0x00000028
-+
-+DATA 4, MX6_IOM_GRP_CTLDS,	0x00000028
-+
-+DATA 4, MX6_IOM_DRAM_DQM0,	0x00000028
-+DATA 4, MX6_IOM_DRAM_DQM1,	0x00000028
-+DATA 4, MX6_IOM_DRAM_DQM2,	0x00000028
-+DATA 4, MX6_IOM_DRAM_DQM3,	0x00000028
-+DATA 4, MX6_IOM_DRAM_DQM4,	0x00000028
-+DATA 4, MX6_IOM_DRAM_DQM5,	0x00000028
-+DATA 4, MX6_IOM_DRAM_DQM6,	0x00000028
-+DATA 4, MX6_IOM_DRAM_DQM7,	0x00000028
-+
-+DATA 4, MX6_IOM_DRAM_CAS,	0x00000028
-+DATA 4, MX6_IOM_DRAM_RAS,	0x00000028
-+DATA 4, MX6_IOM_DRAM_SDCLK_0,	0x00000028
-+DATA 4, MX6_IOM_DRAM_SDCLK_1,	0x00000028
-+
-+DATA 4, MX6_IOM_DRAM_RESET,	0x00000028
-+
-+DATA 4, MX6_IOM_DRAM_SDODT0,	0x00000028
-+DATA 4, MX6_IOM_DRAM_SDODT1,	0x00000028
-+
-+/* (differential input) */
-+DATA 4, MX6_IOM_DDRMODE_CTL,	0x00020000
-+/* (differential input) */
-+DATA 4, MX6_IOM_GRP_DDRMODE,	0x00020000
-+/* disable ddr pullups */
-+DATA 4, MX6_IOM_GRP_DDRPKE,	0x00000000
-+DATA 4, MX6_IOM_DRAM_SDBA2,	0x00000000
-+/* 40 Ohm drive strength for cs0/1,sdba2,cke0/1,sdwe */
-+DATA 4, MX6_IOM_GRP_DDR_TYPE,	0x000C0000
-+
-+/* Read data DQ Byte0-3 delay */
-+DATA 4, MX6_MMDC_P0_MPRDDQBY0DL,	0x33333333
-+DATA 4, MX6_MMDC_P0_MPRDDQBY1DL,	0x33333333
-+DATA 4, MX6_MMDC_P0_MPRDDQBY2DL,	0x33333333
-+DATA 4, MX6_MMDC_P0_MPRDDQBY3DL,	0x33333333
-+DATA 4, MX6_MMDC_P1_MPRDDQBY0DL,	0x33333333
-+DATA 4, MX6_MMDC_P1_MPRDDQBY1DL,	0x33333333
-+DATA 4, MX6_MMDC_P1_MPRDDQBY2DL,	0x33333333
-+DATA 4, MX6_MMDC_P1_MPRDDQBY3DL,	0x33333333
-diff -Nur u-boot-2015.01.orig/board/udoo/udoo-dl.cfg u-boot-2015.01/board/udoo/udoo-dl.cfg
---- u-boot-2015.01.orig/board/udoo/udoo-dl.cfg	1969-12-31 21:00:00.000000000 -0300
-+++ u-boot-2015.01/board/udoo/udoo-dl.cfg	2016-02-23 18:15:32.854611743 -0300
-@@ -0,0 +1,29 @@
-+/*
-+ * Copyright (C) 2013 Boundary Devices
-+ *
-+ * SPDX-License-Identifier:	GPL-2.0+
-+ *
-+ * Refer doc/README.imximage for more details about how-to configure
-+ * and create imximage boot image
-+ *
-+ * The syntax is taken as close as possible with the kwbimage
-+ */
-+
-+/* image version */
-+IMAGE_VERSION 2
-+
-+/*
-+ * Boot Device : one of
-+ * spi, sd (the board has no nand neither onenand)
-+ */
-+BOOT_FROM      sd
-+
-+#define __ASSEMBLY__
-+#include <config.h>
-+#include "asm/arch/mx6-ddr.h"
-+#include "asm/arch/iomux.h"
-+#include "asm/arch/crm_regs.h"
-+
-+#include "ddr-setup_dl.cfg"
-+#include "1066mhz_4x256mx16_dl.cfg"
-+#include "clocks.cfg"
-diff -Nur u-boot-2015.01.orig/configs/udoo_dl_defconfig u-boot-2015.01/configs/udoo_dl_defconfig
---- u-boot-2015.01.orig/configs/udoo_dl_defconfig	1969-12-31 21:00:00.000000000 -0300
-+++ u-boot-2015.01/configs/udoo_dl_defconfig	2016-02-23 18:15:32.854611743 -0300
-@@ -0,0 +1,3 @@
-+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/udoo/udoo-dl.cfg,MX6DL,DDR_MB=1024"
-+CONFIG_ARM=y
-+CONFIG_TARGET_UDOO=y
-diff -Nur u-boot-2015.01.orig/include/configs/udoo.h u-boot-2015.01/include/configs/udoo.h
---- u-boot-2015.01.orig/include/configs/udoo.h	2015-01-12 12:39:08.000000000 -0200
-+++ u-boot-2015.01/include/configs/udoo.h	2016-02-23 18:24:17.779054304 -0300
-@@ -78,7 +78,7 @@
- #define CONFIG_CMD_BMODE
- #define CONFIG_CMD_SETEXPR
- 
--#define CONFIG_BOOTDELAY		3
-+#define CONFIG_BOOTDELAY		1
- 
- #define CONFIG_SYS_MEMTEST_START	0x10000000
- #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
-@@ -96,60 +96,107 @@
- #define CONFIG_BOUNCE_BUFFER
- #define CONFIG_CMD_EXT2
- #define CONFIG_CMD_FAT
-+#define CONFIG_CMD_EXT4
-+#define CONFIG_CMD_FS_GENERIC
- #define CONFIG_DOS_PARTITION
- 
-+#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre"
-+
-+#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S)
-+#define CONFIG_DEFAULT_FDT_FILE		"imx6dl-udoo.dtb"
-+#elif defined(CONFIG_MX6Q)
- #define CONFIG_DEFAULT_FDT_FILE		"imx6q-udoo.dtb"
-+#endif
-+
-+/* Enable Extlinux boot support */
-+#define CONFIG_CMD_PXE
-+#define CONFIG_MENU
-+#define BOOT_TARGET_DEVICES(func)
-+#include <config_distro_bootcmd.h>
- 
- #define CONFIG_EXTRA_ENV_SETTINGS \
--	"script=boot.scr\0" \
--	"image=zImage\0" \
--	"console=ttymxc1\0" \
-+	BOOTENV \
-+	"bootfile=zImage\0" \
-+	"bootdir=/boot\0" \
-+	"console=ttymxc1,115200\0" \
- 	"splashpos=m,m\0" \
- 	"fdt_high=0xffffffff\0" \
-+	"rdaddr=0x12A00000\0" \
-+	"rdfile=initramfs-linux.img\0" \
- 	"initrd_high=0xffffffff\0" \
--	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
--	"fdt_addr=0x18000000\0" \
--	"boot_fdt=try\0" \
-+	"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
-+	"fdtdir=/boot/dtbs\0" \
-+	"fdtaddr=0x18000000\0" \
- 	"ip_dyn=yes\0" \
-+	"optargs=\0" \
-+	"video=\0" \
-+	"devtype=mmc\0" \
-+	"devnum=0\0" \
- 	"mmcdev=0\0" \
--	"mmcpart=1\0" \
--	"mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
--	"update_sd_firmware_filename=u-boot.imx\0" \
--	"update_sd_firmware=" \
--		"if test ${ip_dyn} = yes; then " \
--			"setenv get_cmd dhcp; " \
-+	"mmcroot=/dev/mmcblk0p1 rw rootwait\0" \
-+	"mmcargs=setenv bootargs console=${console} " \
-+		"${optargs} " \
-+		"root=${mmcroot} " \
-+		"video=${video}\0" \
-+	"videoargs=" \
-+		"setenv nextcon 0; " \
-+		"if hdmidet; then " \
-+			"setenv bootargs ${bootargs} " \
-+				"video=mxcfb${nextcon}:dev=hdmi,1280x720M@60," \
-+					"if=RGB24; " \
-+			"setenv fbmem fbmem=28M; " \
-+			"setexpr nextcon ${nextcon} + 1; " \
- 		"else " \
--			"setenv get_cmd tftp; " \
-+			"echo - no HDMI monitor;" \
- 		"fi; " \
--		"if mmc dev ${mmcdev}; then "	\
--			"if ${get_cmd} ${update_sd_firmware_filename}; then " \
--				"setexpr fw_sz ${filesize} / 0x200; " \
--				"setexpr fw_sz ${fw_sz} + 1; "	\
--				"mmc write ${loadaddr} 0x2 ${fw_sz}; " \
--			"fi; "	\
--		"fi\0" \
--	"mmcargs=setenv bootargs console=${console},${baudrate} " \
--		"root=${mmcroot}\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} ${fdt_file}\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}; " \
-+		"i2c dev 1; " \
-+		"if i2c probe 0x10; then " \
-+			"setenv bootargs ${bootargs} " \
-+				"video=mxcfb${nextcon}:dev=lcd,800x480@60," \
-+					"if=RGB666; " \
-+			"if test 0 -eq ${nextcon}; then " \
-+				"setenv fbmem fbmem=10M; " \
- 			"else " \
--				"if test ${boot_fdt} = try; then " \
--					"bootz; " \
--				"else " \
--					"echo WARN: Cannot load the DT; " \
--				"fi; " \
-+				"setenv fbmem ${fbmem},10M; " \
- 			"fi; " \
-+			"setexpr nextcon ${nextcon} + 1; " \
- 		"else " \
--			"bootz; " \
-+			"echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';" \
-+		"fi; " \
-+		"setenv bootargs ${bootargs} ${fbmem}\0" \
-+	"loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
-+	"loadrd=load mmc ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \
-+	"loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load mmc ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
-+	"mmcboot=mmc dev ${mmcdev}; " \
-+		"if mmc rescan; then " \
-+			"echo SD/MMC found on device ${mmcdev};" \
-+			"setenv bootpart ${mmcdev}:1; " \
-+			"echo Checking for: ${bootdir}/uEnv.txt ...;" \
-+			"if test -e mmc ${bootpart} ${bootdir}/uEnv.txt; then " \
-+				"load mmc ${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 " \
-+				"if run loadfdt; then " \
-+					"run mmcargs;" \
-+					"if run loadrd; then " \
-+						"bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \
-+					"else " \
-+						"bootz ${loadaddr} - ${fdtaddr};" \
-+					"fi;" \
-+				"else " \
-+					"echo Kernel found, but no device tree found;" \
-+				"fi;" \
-+			"else " \
-+				"echo No kernel found;" \
-+			"fi;" \
- 		"fi;\0" \
- 	"netargs=setenv bootargs console=${console},${baudrate} " \
- 		"root=/dev/nfs " \
-@@ -161,10 +208,10 @@
- 		"else " \
- 			"setenv get_cmd tftp; " \
- 		"fi; " \
--		"${get_cmd} ${image}; " \
-+		"${get_cmd} ${bootfile}; " \
- 		"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
--			"if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
--				"bootz ${loadaddr} - ${fdt_addr}; " \
-+			"if ${get_cmd} ${fdtaddr} ${fdtfile}; then " \
-+				"bootz ${loadaddr} - ${fdtaddr}; " \
- 			"else " \
- 				"if test ${boot_fdt} = try; then " \
- 					"bootz; " \
-@@ -177,16 +224,7 @@
- 		"fi;\0"
- 
- #define CONFIG_BOOTCOMMAND \
--	   "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;"
- 
- /* Miscellaneous configurable options */
- #define CONFIG_SYS_LONGHELP
-@@ -227,6 +265,7 @@
- 
- #define CONFIG_OF_LIBFDT
- #define CONFIG_CMD_BOOTZ
-+#define CONFIG_SUPPORT_RAW_INITRD
- 
- #ifndef CONFIG_SYS_DCACHE_OFF
- #define CONFIG_CMD_CACHE
diff --git a/libre/uboot4extlinux-udoo/0002-kernel-add-support-for-gcc-5.patch b/libre/uboot4extlinux-udoo/0002-kernel-add-support-for-gcc-5.patch
deleted file mode 100644
index 30718c561..000000000
--- a/libre/uboot4extlinux-udoo/0002-kernel-add-support-for-gcc-5.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 5b07fc2c680ad4279a45d863108544020b4d74cd Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sasha.levin@oracle.com>
-Date: Mon, 13 Oct 2014 15:51:05 -0700
-Subject: [PATCH 2/6] kernel: add support for gcc 5
-
-We're missing include/linux/compiler-gcc5.h which is required now
-because gcc branched off to v5 in trunk.
-
-Just copy the relevant bits out of include/linux/compiler-gcc4.h,
-no new code is added as of now.
-
-This fixes a build error when using gcc 5.
-
-Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 66 insertions(+)
- create mode 100644 include/linux/compiler-gcc5.h
-
-diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h
-new file mode 100644
-index 0000000..cdd1cc2
---- /dev/null
-+++ b/include/linux/compiler-gcc5.h
-@@ -0,0 +1,66 @@
-+#ifndef __LINUX_COMPILER_H
-+#error "Please don't include <linux/compiler-gcc5.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]
-+
-+   Early snapshots of gcc 4.3 don't support this and we can't detect this
-+   in the preprocessor, but we can live with this because they're unreleased.
-+   Maketime probing would be overkill here.
-+
-+   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.
-+ *
-+ * Early snapshots of gcc 4.5 don't support this and we can't detect
-+ * this in the preprocessor, but we can live with this because they're
-+ * unreleased.  Really, we need to have autoconf for the kernel.
-+ */
-+#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.
-+ * Fixed in GCC 4.8.2 and later versions.
-+ *
-+ * (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 */
--- 
-2.4.4
-
diff --git a/libre/uboot4extlinux-udoo/PKGBUILD b/libre/uboot4extlinux-udoo/PKGBUILD
deleted file mode 100644
index 41f6960a4..000000000
--- a/libre/uboot4extlinux-udoo/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# U-Boot: UDOO
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-buildarch=4
-
-pkgbase=uboot4extlinux-udoo
-pkgname=('uboot4extlinux-udoo_dl' 'uboot4extlinux-udoo_quad')
-pkgver=2015.01
-pkgrel=1
-arch=('armv7h')
-url="http://git.denx.de/u-boot.git/"
-license=('GPL')
-makedepends=('bc')
-backup=(boot/extlinux/extlinux.conf)
-source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
-        '0001-parabola-arm-modifications.patch'
-        '0002-kernel-add-support-for-gcc-5.patch'
-        'extlinux.conf')
-md5sums=('7f08dc9e98a71652bd6968888ed6ec95'
-         'f90125a266a2cd80980464f949d03d88'
-         '721a46867e189d8dedc6b6f86a536a34'
-         'e05d2d41a1bdbbd5d6fec02534784dcd')
-
-prepare() {
-  cd u-boot-${pkgver}
-
-  patch -Np1 -i ../0001-parabola-arm-modifications.patch
-  patch -Np1 -i ../0002-kernel-add-support-for-gcc-5.patch
-}
-
-build() {
-  cd u-boot-${pkgver}
-  
-  unset CFLAGS CXXFLAGS LDFLAGS
-  
-  mkdir bins
-  for i in dl quad; do
-    make distclean
-    make udoo_${i}_config
-    make
-    mv u-boot.imx bins/u-boot-${i}.imx
-  done
-}
-
-package_uboot4extlinux-udoo_dl() {
-  pkgdesc="U-Boot with Extlinux support for UDOO Dual"
-  replaces=('uboot-udoo-dual-linux-libre' 'uboot-udoo-dual-linux-libre-grsec'
-            'uboot-udoo-dual' 'uboot-udoo_dl')
-  conflicts=('uboot-udoo-dual-linux-libre' 'uboot-udoo-dual-linux-libre-grsec'
-             'uboot-udoo-dual' 'uboot-udoo_dl' 'uboot4extlinux-udoo_quad' 'uboot4grub-udoo_dl' 'uboot4grub-udoo_quad')
-  install=${pkgbase}.install
-
-  mkdir -p "${pkgdir}"/boot/extlinux
-  cp u-boot-${pkgver}/bins/u-boot-dl.imx "${pkgdir}"/boot/u-boot.imx
-  cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux
-}
-
-package_uboot4extlinux-udoo_quad() {
-  pkgdesc="U-Boot with Extlinux support for UDOO Quad"
-  replaces=('uboot-udoo-quad-linux-libre' 'uboot-udoo-quad-linux-libre-grsec'
-            'uboot-udoo-quad' 'uboot-udoo_quad')
-  conflicts=('uboot-udoo-quad-linux-libre' 'uboot-udoo-quad-linux-libre-grsec'
-             'uboot-udoo-quad' 'uboot-udoo_quad' 'uboot4extlinux-udoo_dl'  'uboot4grub-udoo_dl' 'uboot4grub-udoo_quad')
-  install=${pkgbase}.install
-
-  mkdir -p "${pkgdir}"/boot/extlinux
-  cp u-boot-${pkgver}/bins/u-boot-quad.imx "${pkgdir}"/boot/u-boot.imx
-  cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux
-}
diff --git a/libre/uboot4extlinux-udoo/extlinux.conf b/libre/uboot4extlinux-udoo/extlinux.conf
deleted file mode 100644
index 45d603094..000000000
--- a/libre/uboot4extlinux-udoo/extlinux.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-menu title Welcome to U-Boot with Extlinux support!
-
-label Parabola GNU/Linux-libre, linux-libre kernel
-	kernel /boot/vmlinuz-linux-libre
-	append root=/dev/mmcblk0p1 rw console=ttymxc1,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=ttymxc1,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=ttymxc1,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=ttymxc1,115200
-#	fdtdir /boot/dtbs/linux-libre-lts-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec kernel
-#	kernel /boot/vmlinuz-linux-libre-grsec
-#	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
-#	fdtdir /boot/dtbs/linux-libre-grsec
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec-knock kernel
-#	kernel /boot/vmlinuz-linux-libre-grsec-knock
-#	append root=/dev/mmcblk0p1 rw console=ttymxc1,115200
-#	fdtdir /boot/dtbs/linux-libre-grsec-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-audit kernel
-#	kernel /boot/vmlinuz-linux-libre-audit
-#	append root=/dev/mmcblk0p1 rw console=ttymxc1,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=ttymxc1,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=ttymxc1,115200
-#	fdtdir /boot/dtbs/linux-libre-rt
diff --git a/libre/uboot4extlinux-udoo/uboot4extlinux-udoo.install b/libre/uboot4extlinux-udoo/uboot4extlinux-udoo.install
deleted file mode 100644
index 8a45c3b16..000000000
--- a/libre/uboot4extlinux-udoo/uboot4extlinux-udoo.install
+++ /dev/null
@@ -1,28 +0,0 @@
-extlinux_warning() {
-  echo "==> WARNING: U-Boot uses Extlinux support to boot up. For setting it up, edit /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.imx of=/dev/mmcblk0 bs=512 seek=2
-    sync
-  else
-    echo "You can do this later by running:"
-    echo "# dd if=/boot/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2"
-  fi
-  extlinux_warning
-}
-
-## arg 1:  the new package version
-post_install() {
-  flash_uboot
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  flash_uboot
-}
diff --git a/libre/uboot4extlinux-wandboard/0001-parabola-arm-modifications.patch b/libre/uboot4extlinux-wandboard/0001-parabola-arm-modifications.patch
deleted file mode 100644
index c50ca9e00..000000000
--- a/libre/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/uboot4extlinux-wandboard/PKGBUILD b/libre/uboot4extlinux-wandboard/PKGBUILD
deleted file mode 100644
index b97e0b1df..000000000
--- a/libre/uboot4extlinux-wandboard/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# U-Boot: Wandboard
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-buildarch=4
-
-pkgname=uboot4extlinux-wandboard
-pkgver=2015.10
-pkgrel=1
-pkgdesc="U-Boot with Extlinux support for Wandboard"
-arch=('armv7h')
-url="http://git.denx.de/u-boot.git/"
-license=('GPL')
-makedepends=('bc')
-replaces=('uboot-wandboard-solo' 'uboot-wandboard-dual' 'uboot-wandboard-quad' 'uboot-wandboard' 'uboot-wandboard-linux-libre')
-conflicts=('uboot-wandboard' 'uboot-wandboard-linux-libre' 'uboot4grub-wandboard')
-install=${pkgname}.install
-source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
-        '0001-parabola-arm-modifications.patch'
-        'extlinux.conf')
-md5sums=('7c203b0fc3390a122d8e8b75f147eac5'
-         'b456e16c44508868ce6d265da625d768'
-         '3367c0142a98a62fed243be74f5c465d')
-
-prepare() {
-  cd u-boot-${pkgver}
-  patch -Np1 -i ../0001-parabola-arm-modifications.patch
-}
-
-build() {
-  cd u-boot-${pkgver}
-  
-  unset LDFLAGS
-  
-  make distclean
-  make wandboard_defconfig
-  make
-}
-
-package() {
-  cd u-boot-${pkgver}
-  mkdir -p "${pkgdir}"/boot/extlinux
-
-  mkdir -p "${pkgdir}"/boot
-  cp SPL u-boot.img "${pkgdir}"/boot
-  cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux
-}
diff --git a/libre/uboot4extlinux-wandboard/extlinux.conf b/libre/uboot4extlinux-wandboard/extlinux.conf
deleted file mode 100644
index 16cc3a38f..000000000
--- a/libre/uboot4extlinux-wandboard/extlinux.conf
+++ /dev/null
@@ -1,46 +0,0 @@
-menu title Welcome to U-Boot with Extlinux support!
-
-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-knock kernel
-#	kernel /boot/vmlinuz-linux-libre-knock
-#	append root=/dev/mmcblk0p2 rw console=ttymxc0
-#	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/mmcblk0p2 rw console=ttymxc0
-#	fdtdir /boot/dtbs/linux-libre-lts-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec kernel
-#	kernel /boot/vmlinuz-linux-libre-grsec
-#	append root=/dev/mmcblk0p2 rw console=ttymxc0
-#	fdtdir /boot/dtbs/linux-libre-grsec
-
-#label Parabola GNU/Linux-libre, linux-libre-grsec-knock kernel
-#	kernel /boot/vmlinuz-linux-libre-grsec-knock
-#	append root=/dev/mmcblk0p2 rw console=ttymxc0
-#	fdtdir /boot/dtbs/linux-libre-grsec-knock
-
-#label Parabola GNU/Linux-libre, linux-libre-audit kernel
-#	kernel /boot/vmlinuz-linux-libre-audit
-#	append root=/dev/mmcblk0p2 rw console=ttymxc0
-#	fdtdir /boot/dtbs/linux-libre-audit
-
-#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
diff --git a/libre/uboot4extlinux-wandboard/uboot4extlinux-wandboard.install b/libre/uboot4extlinux-wandboard/uboot4extlinux-wandboard.install
deleted file mode 100644
index ddfb5c83f..000000000
--- a/libre/uboot4extlinux-wandboard/uboot4extlinux-wandboard.install
+++ /dev/null
@@ -1,29 +0,0 @@
-extlinux_warning() {
-  echo "==> WARNING: U-Boot uses Extlinux support to boot up. For setting it up, edit /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
-}
-
-## arg 1:  the new package version
-post_install() {
-  flash_uboot
-}
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  flash_uboot
-}
author	André Fabian Silva Delgado <emulatorman@parabola.nu>	2016-03-02 00:23:43 -0300
committer	André Fabian Silva Delgado <emulatorman@parabola.nu>	2016-03-02 00:28:07 -0300
commit	11467233d8b439275ce1e1db650a4c6f91a9db1f (patch)
tree	62cc14ffe05dcc5541210d2073a4c119e6a125c2 /libre
parent	a44772df880c7bcf6ba114a6e4d86ba4ff6b4adc (diff)
download	abslibre-11467233d8b439275ce1e1db650a4c6f91a9db1f.tar.gz abslibre-11467233d8b439275ce1e1db650a4c6f91a9db1f.tar.bz2 abslibre-11467233d8b439275ce1e1db650a4c6f91a9db1f.zip