From b524751907a60ffa36984e10cec7b6f29ea30aa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= <igor.pecovnik@gmail.com>
Date: Mon, 21 Dec 2015 10:17:44 +0100
Subject: [PATCH] Udoo quad/dl u-boot patches

---
 config/boot-udoo.cmd                          |  2 +-
 .../udoo-2015-u-boot.patch                    | 28 +++++++++++++++++++
 .../u-boot-udoo-next/udoo-2015-u-boot.patch   | 28 +++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 patch/u-boot/u-boot-udoo-default/udoo-2015-u-boot.patch
 create mode 100644 patch/u-boot/u-boot-udoo-next/udoo-2015-u-boot.patch

diff --git a/config/boot-udoo.cmd b/config/boot-udoo.cmd
index 25bfdc36a6..f4bfb257f1 100644
--- a/config/boot-udoo.cmd
+++ b/config/boot-udoo.cmd
@@ -1,5 +1,5 @@
 setenv bootargs root=/dev/mmcblk0p1 rootfstype=ext4 rootwait console=tty1 video=mxcfb0:dev=hdmi,1920x1080M@60,if=RGB24,bpp=32 rd.dm=0 rd.luks=0 rd.lvm=0 raid=noautodetect pci=nomsi ahci_imx.hotplug=1 quiet
-setenv fdt_file imx6q-udoo.dtb
+setenv fdt_file imx6q-udoo-hdmi.dtb
 ext2load mmc 0 ${fdt_addr} /boot/dtb/${fdt_file} || fatload mmc 0 ${fdt_addr} dtb/${fdt_file}
 ext2load mmc 0 ${loadaddr} /boot/${image} || fatload mmc 0 ${loadaddr} ${image}
 bootz ${loadaddr} - ${fdt_addr}
diff --git a/patch/u-boot/u-boot-udoo-default/udoo-2015-u-boot.patch b/patch/u-boot/u-boot-udoo-default/udoo-2015-u-boot.patch
new file mode 100644
index 0000000000..c843a1e1eb
--- /dev/null
+++ b/patch/u-boot/u-boot-udoo-default/udoo-2015-u-boot.patch
@@ -0,0 +1,28 @@
+diff --git a/include/configs/udoo_qdl.h b/include/configs/udoo_qdl.h
+--- a/include/configs/udoo_qdl.h
++++ b/include/configs/udoo_qdl.h
+@@ -86,7 +86,11 @@
+ #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+ 
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+-	"script=uEnv.txt\0" \
++	"script=boot.scr\0" \
++	"boot_prefixes=/ /boot/\0" \
++	"boot_a_script=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${prefix}${script} || fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${prefix}${script} \0" \
++	"scan_dev_for_boot=echo Scanning mmc ; for prefix in ${boot_prefixes}; do run scan_dev_for_scripts; done\0" \
++	"scan_dev_for_scripts=if test -e ${mmcdev}:${mmcpart} ${prefix}${script}; then echo Found U-Boot script ${prefix}${script}; run boot_a_script; else echo Checking here ${prefix} ... not found; fi;\0" \
+ 	"image=zImage\0" \
+ 	"console=ttymxc1\0" \
+ 	"splashpos=m,m\0" \
+@@ -116,9 +120,9 @@
+ 	"mmcargs=setenv bootargs console=${console},${baudrate} ${video} ${memory} " \
+ 		"root=${mmcroot}\0" \
+ 	"loadbootscript=" \
+-		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
++	"run scan_dev_for_boot;\0" \
+ 	"bootscript=echo Running bootscript from mmc ...; " \
+-		"env import -t ${loadaddr} ${filesize};\0" \
++		"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 ...; " \
\ No newline at end of file
diff --git a/patch/u-boot/u-boot-udoo-next/udoo-2015-u-boot.patch b/patch/u-boot/u-boot-udoo-next/udoo-2015-u-boot.patch
new file mode 100644
index 0000000000..c843a1e1eb
--- /dev/null
+++ b/patch/u-boot/u-boot-udoo-next/udoo-2015-u-boot.patch
@@ -0,0 +1,28 @@
+diff --git a/include/configs/udoo_qdl.h b/include/configs/udoo_qdl.h
+--- a/include/configs/udoo_qdl.h
++++ b/include/configs/udoo_qdl.h
+@@ -86,7 +86,11 @@
+ #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+ 
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+-	"script=uEnv.txt\0" \
++	"script=boot.scr\0" \
++	"boot_prefixes=/ /boot/\0" \
++	"boot_a_script=ext2load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${prefix}${script} || fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${prefix}${script} \0" \
++	"scan_dev_for_boot=echo Scanning mmc ; for prefix in ${boot_prefixes}; do run scan_dev_for_scripts; done\0" \
++	"scan_dev_for_scripts=if test -e ${mmcdev}:${mmcpart} ${prefix}${script}; then echo Found U-Boot script ${prefix}${script}; run boot_a_script; else echo Checking here ${prefix} ... not found; fi;\0" \
+ 	"image=zImage\0" \
+ 	"console=ttymxc1\0" \
+ 	"splashpos=m,m\0" \
+@@ -116,9 +120,9 @@
+ 	"mmcargs=setenv bootargs console=${console},${baudrate} ${video} ${memory} " \
+ 		"root=${mmcroot}\0" \
+ 	"loadbootscript=" \
+-		"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
++	"run scan_dev_for_boot;\0" \
+ 	"bootscript=echo Running bootscript from mmc ...; " \
+-		"env import -t ${loadaddr} ${filesize};\0" \
++		"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 ...; " \
\ No newline at end of file