summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-02-24 14:19:11 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-02-24 14:19:50 -0300
commite6d002635e055921c9a0b2b7205b51248aae8eb0 (patch)
treeda780085825521d0e62cb632292cfe1748d55f06
parent8f2cbbc8d34b0f0addf38672580cedaddf6ee0ce (diff)
downloadabslibre-e6d002635e055921c9a0b2b7205b51248aae8eb0.tar.gz
abslibre-e6d002635e055921c9a0b2b7205b51248aae8eb0.tar.bz2
abslibre-e6d002635e055921c9a0b2b7205b51248aae8eb0.zip
uboot-udoo-2015.01-2: use patch based on Arch ARM to add Extlinux support
-rw-r--r--libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch194
-rw-r--r--libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch.testing1241
-rw-r--r--libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch.testing2628
-rw-r--r--libre-testing/uboot-udoo/PKGBUILD4
4 files changed, 173 insertions, 894 deletions
diff --git a/libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch b/libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch
index ac4f758fe..326b4aaa0 100644
--- a/libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch
+++ b/libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch
@@ -1,6 +1,6 @@
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-24 01:42:53.330380669 -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
@@ -62,7 +62,7 @@ diff -Nur u-boot-2015.01.orig/board/udoo/1066mhz_4x256mx16_dl.cfg u-boot-2015.01
+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-24 01:42:53.330380669 -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
@@ -150,7 +150,7 @@ diff -Nur u-boot-2015.01.orig/board/udoo/ddr-setup_dl.cfg u-boot-2015.01/board/u
+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-24 01:42:53.330380669 -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
@@ -183,15 +183,24 @@ diff -Nur u-boot-2015.01.orig/board/udoo/udoo-dl.cfg u-boot-2015.01/board/udoo/u
+#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-24 01:42:53.330380669 -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-24 01:47:09.384245992 -0300
-@@ -96,11 +96,26 @@
++++ 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
@@ -207,35 +216,174 @@ diff -Nur u-boot-2015.01.orig/include/configs/udoo.h u-boot-2015.01/include/conf
#define CONFIG_DEFAULT_FDT_FILE "imx6q-udoo.dtb"
+#endif
+
-+/* Enable extlinux boot support */
++/* 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 \
- "script=boot.scr\0" \
- "image=zImage\0" \
- "console=ttymxc1\0" \
-@@ -111,9 +126,11 @@
- "fdt_addr=0x18000000\0" \
- "boot_fdt=try\0" \
++ "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" \
+- "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" \
- "update_sd_firmware_filename=u-boot.imx\0" \
- "update_sd_firmware=" \
- "if test ${ip_dyn} = yes; then " \
-@@ -178,6 +195,7 @@
++ "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 " \
-+ "run scan_dev_for_boot;" \
- "if run loadbootscript; then " \
- "run bootscript; " \
- "else " \
+- "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-testing/uboot-udoo/0001-parabola-arm-modifications.patch.testing1 b/libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch.testing1
deleted file mode 100644
index ac4f758fe..000000000
--- a/libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch.testing1
+++ /dev/null
@@ -1,241 +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-24 01:42:53.330380669 -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-24 01:42:53.330380669 -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-24 01:42:53.330380669 -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-24 01:42:53.330380669 -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-24 01:47:09.384245992 -0300
-@@ -96,11 +96,26 @@
- #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 ARM"
-+
-+#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 \
-+ BOOTENV \
- "script=boot.scr\0" \
- "image=zImage\0" \
- "console=ttymxc1\0" \
-@@ -111,9 +126,11 @@
- "fdt_addr=0x18000000\0" \
- "boot_fdt=try\0" \
- "ip_dyn=yes\0" \
-+ "devtype=mmc\0" \
-+ "devnum=0\0" \
- "mmcdev=0\0" \
- "mmcpart=1\0" \
-- "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
-+ "mmcroot=/dev/mmcblk0p1 rw rootwait\0" \
- "update_sd_firmware_filename=u-boot.imx\0" \
- "update_sd_firmware=" \
- "if test ${ip_dyn} = yes; then " \
-@@ -178,6 +195,7 @@
-
- #define CONFIG_BOOTCOMMAND \
- "mmc dev ${mmcdev}; if mmc rescan; then " \
-+ "run scan_dev_for_boot;" \
- "if run loadbootscript; then " \
- "run bootscript; " \
- "else " \
diff --git a/libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch.testing2 b/libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch.testing2
deleted file mode 100644
index dbb449c7c..000000000
--- a/libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch.testing2
+++ /dev/null
@@ -1,628 +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 ARM"
-+
-+#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 -Nur u-boot-2015.01.orig/include/configs/udoo.h.orig u-boot-2015.01/include/configs/udoo.h.orig
---- u-boot-2015.01.orig/include/configs/udoo.h.orig 1969-12-31 21:00:00.000000000 -0300
-+++ u-boot-2015.01/include/configs/udoo.h.orig 2015-01-12 12:39:08.000000000 -0200
-@@ -0,0 +1,235 @@
-+/*
-+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
-+ *
-+ * Configuration settings for Udoo board.
-+ *
-+ * SPDX-License-Identifier: GPL-2.0+
-+ */
-+
-+#ifndef __CONFIG_H
-+#define __CONFIG_H
-+
-+#include "mx6_common.h"
-+#include <asm/arch/imx-regs.h>
-+#include <asm/imx-common/gpio.h>
-+#include <linux/sizes.h>
-+
-+#define CONFIG_MX6
-+#define CONFIG_DISPLAY_CPUINFO
-+#define CONFIG_DISPLAY_BOARDINFO
-+
-+#define MACH_TYPE_UDOO 4800
-+#define CONFIG_MACH_TYPE MACH_TYPE_UDOO
-+
-+#define CONFIG_CMDLINE_TAG
-+#define CONFIG_SETUP_MEMORY_TAGS
-+#define CONFIG_INITRD_TAG
-+#define CONFIG_REVISION_TAG
-+
-+#define CONFIG_SYS_GENERIC_BOARD
-+
-+/* Size of malloc() pool */
-+#define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M)
-+
-+#define CONFIG_BOARD_EARLY_INIT_F
-+#define CONFIG_MXC_GPIO
-+
-+#define CONFIG_MXC_UART
-+#define CONFIG_MXC_UART_BASE UART2_BASE
-+
-+/* SATA Configs */
-+
-+#define CONFIG_CMD_SATA
-+#ifdef CONFIG_CMD_SATA
-+#define CONFIG_DWC_AHSATA
-+#define CONFIG_SYS_SATA_MAX_DEVICE 1
-+#define CONFIG_DWC_AHSATA_PORT_ID 0
-+#define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR
-+#define CONFIG_LBA48
-+#define CONFIG_LIBATA
-+#endif
-+
-+/* Network support */
-+
-+#define CONFIG_CMD_PING
-+#define CONFIG_CMD_DHCP
-+#define CONFIG_CMD_MII
-+#define CONFIG_CMD_NET
-+#define CONFIG_FEC_MXC
-+#define CONFIG_MII
-+#define IMX_FEC_BASE ENET_BASE_ADDR
-+#define CONFIG_FEC_XCV_TYPE RGMII
-+#define CONFIG_ETHPRIME "FEC"
-+#define CONFIG_FEC_MXC_PHYADDR 6
-+#define CONFIG_PHYLIB
-+#define CONFIG_PHY_MICREL
-+#define CONFIG_PHY_MICREL_KSZ9031
-+
-+/* allow to overwrite serial and ethaddr */
-+#define CONFIG_ENV_OVERWRITE
-+#define CONFIG_CONS_INDEX 1
-+#define CONFIG_BAUDRATE 115200
-+
-+/* Command definition */
-+#include <config_cmd_default.h>
-+
-+#undef CONFIG_CMD_IMLS
-+
-+#define CONFIG_CMD_BMODE
-+#define CONFIG_CMD_SETEXPR
-+
-+#define CONFIG_BOOTDELAY 3
-+
-+#define CONFIG_SYS_MEMTEST_START 0x10000000
-+#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M)
-+#define CONFIG_LOADADDR 0x12000000
-+#define CONFIG_SYS_TEXT_BASE 0x17800000
-+
-+/* MMC Configuration */
-+#define CONFIG_FSL_ESDHC
-+#define CONFIG_FSL_USDHC
-+#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-+
-+#define CONFIG_MMC
-+#define CONFIG_CMD_MMC
-+#define CONFIG_GENERIC_MMC
-+#define CONFIG_BOUNCE_BUFFER
-+#define CONFIG_CMD_EXT2
-+#define CONFIG_CMD_FAT
-+#define CONFIG_DOS_PARTITION
-+
-+#define CONFIG_DEFAULT_FDT_FILE "imx6q-udoo.dtb"
-+
-+#define CONFIG_EXTRA_ENV_SETTINGS \
-+ "script=boot.scr\0" \
-+ "image=zImage\0" \
-+ "console=ttymxc1\0" \
-+ "splashpos=m,m\0" \
-+ "fdt_high=0xffffffff\0" \
-+ "initrd_high=0xffffffff\0" \
-+ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
-+ "fdt_addr=0x18000000\0" \
-+ "boot_fdt=try\0" \
-+ "ip_dyn=yes\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; " \
-+ "else " \
-+ "setenv get_cmd tftp; " \
-+ "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}; " \
-+ "else " \
-+ "if test ${boot_fdt} = try; then " \
-+ "bootz; " \
-+ "else " \
-+ "echo WARN: Cannot load the DT; " \
-+ "fi; " \
-+ "fi; " \
-+ "else " \
-+ "bootz; " \
-+ "fi;\0" \
-+ "netargs=setenv bootargs console=${console},${baudrate} " \
-+ "root=/dev/nfs " \
-+ "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
-+ "netboot=echo Booting from net ...; " \
-+ "run netargs; " \
-+ "if test ${ip_dyn} = yes; then " \
-+ "setenv get_cmd dhcp; " \
-+ "else " \
-+ "setenv get_cmd tftp; " \
-+ "fi; " \
-+ "${get_cmd} ${image}; " \
-+ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
-+ "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \
-+ "bootz ${loadaddr} - ${fdt_addr}; " \
-+ "else " \
-+ "if test ${boot_fdt} = try; then " \
-+ "bootz; " \
-+ "else " \
-+ "echo WARN: Cannot load the DT; " \
-+ "fi; " \
-+ "fi; " \
-+ "else " \
-+ "bootz; " \
-+ "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"
-+
-+/* Miscellaneous configurable options */
-+#define CONFIG_SYS_LONGHELP
-+#define CONFIG_SYS_HUSH_PARSER
-+#define CONFIG_AUTO_COMPLETE
-+#define CONFIG_SYS_CBSIZE 256
-+
-+/* Print Buffer Size */
-+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-+#define CONFIG_SYS_MAXARGS 16
-+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
-+
-+#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
-+
-+#define CONFIG_CMDLINE_EDITING
-+
-+/* Physical Memory Map */
-+#define CONFIG_NR_DRAM_BANKS 1
-+#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR
-+
-+#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM
-+#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR
-+#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE
-+
-+#define CONFIG_SYS_INIT_SP_OFFSET \
-+ (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
-+#define CONFIG_SYS_INIT_SP_ADDR \
-+ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
-+
-+/* FLASH and environment organization */
-+#define CONFIG_SYS_NO_FLASH
-+
-+#define CONFIG_ENV_SIZE (8 * 1024)
-+
-+#define CONFIG_ENV_IS_IN_MMC
-+#define CONFIG_ENV_OFFSET (6 * 64 * 1024)
-+#define CONFIG_SYS_MMC_ENV_DEV 0
-+
-+#define CONFIG_OF_LIBFDT
-+#define CONFIG_CMD_BOOTZ
-+
-+#ifndef CONFIG_SYS_DCACHE_OFF
-+#define CONFIG_CMD_CACHE
-+#endif
-+
-+#endif /* __CONFIG_H * */
diff --git a/libre-testing/uboot-udoo/PKGBUILD b/libre-testing/uboot-udoo/PKGBUILD
index 03f554e46..4765a2473 100644
--- a/libre-testing/uboot-udoo/PKGBUILD
+++ b/libre-testing/uboot-udoo/PKGBUILD
@@ -6,7 +6,7 @@ buildarch=4
pkgbase=uboot-udoo
pkgname=('uboot-udoo_dl' 'uboot-udoo_quad')
pkgver=2015.01
-pkgrel=1
+pkgrel=2
arch=('armv7h')
url="http://git.denx.de/u-boot.git/"
license=('GPL')
@@ -17,7 +17,7 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
'0002-kernel-add-support-for-gcc-5.patch'
'extlinux.conf')
md5sums=('7f08dc9e98a71652bd6968888ed6ec95'
- '9ed11143b9f54b560bf503df3b721899'
+ '70ccab6e449dbd232d5ff97a7fd17f95'
'721a46867e189d8dedc6b6f86a536a34'
'e05d2d41a1bdbbd5d6fec02534784dcd')