Udoo quad/dl u-boot patches

This commit is contained in:
Igor Pečovnik 2015-12-21 10:17:44 +01:00
parent 4511793157
commit b524751907
3 changed files with 57 additions and 1 deletions

View File

@ -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}

View File

@ -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 ...; " \

View File

@ -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 ...; " \