|
@@ -1,5 +1,5 @@
|
|
|
---- u-boot-imx6-20140416.orig/include/configs/mx6_cubox-i.h 2014-04-17 15:53:51.000000000 +0200
|
|
|
-+++ u-boot-imx6-20140416/include/configs/mx6_cubox-i.h 2014-06-30 12:44:38.808082044 +0200
|
|
|
+--- u-boot-imx6-20140819.orig/include/configs/mx6_cubox-i.h 2014-08-19 09:42:57.000000000 +0200
|
|
|
++++ u-boot-imx6-20140819/include/configs/mx6_cubox-i.h 2014-08-19 13:26:15.775439757 +0200
|
|
|
@@ -158,7 +158,7 @@
|
|
|
"script=boot.scr\0" \
|
|
|
"bootfile=auto\0" \
|
|
@@ -18,30 +18,33 @@
|
|
|
"update_sd_firmware_filename=u-boot.imx\0" \
|
|
|
"update_sd_firmware=" \
|
|
|
"if test ${ip_dyn} = yes; then " \
|
|
|
-@@ -212,19 +212,19 @@
|
|
|
+@@ -217,7 +217,7 @@
|
|
|
"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
|
|
|
"env import -t ${loadaddr} ${filesize};\0" \
|
|
|
- "autobootfdt=echo Booting ${boot_file}; " \
|
|
|
-- "if test ${boot_file} = zImage; then " \
|
|
|
-+ "if test ${boot_file} = kernel; then " \
|
|
|
- "bootz ${loadaddr} - ${fdt_addr}; " \
|
|
|
- "else " \
|
|
|
- "bootm ${loadaddr} - ${fdt_addr}; " \
|
|
|
- "fi;\0 " \
|
|
|
"autoboot=echo Booting ${boot_file}; " \
|
|
|
- "if test ${boot_file} = zImage; then " \
|
|
|
+ "if test ${boot_file} = kernel; then " \
|
|
|
- "bootz; " \
|
|
|
+ "bootz ${loadaddr} ${ramdisk_addr} ${fdt_addr}; " \
|
|
|
"else " \
|
|
|
- "bootm; " \
|
|
|
- "fi;\0 " \
|
|
|
- "bootit=setenv boot_file ${bootfile}; " \
|
|
|
+ "bootm ${loadaddr} ${ramdisk_addr} ${fdt_addr}; " \
|
|
|
+@@ -232,14 +232,14 @@
|
|
|
+ "else " \
|
|
|
+ "setenv ramdisk_addr -; " \
|
|
|
+ "fi; " \
|
|
|
- "if test ${boot_file} = zImage; then " \
|
|
|
+ "if test ${boot_file} = kernel; then " \
|
|
|
"if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
|
|
|
"if run loadfdt; then " \
|
|
|
- "run autobootfdt; " \
|
|
|
-@@ -260,7 +260,7 @@
|
|
|
+ "echo Loaded ${fdt_file}; " \
|
|
|
+ "else " \
|
|
|
+ "setenv fdt_addr; " \
|
|
|
+ "if test ${boot_fdt} = try; then " \
|
|
|
+- "echo WARN: Cannot load the DTB and boot file is type zImage;" \
|
|
|
++ "echo WARN: Cannot load the DTB and boot file is type kernel;" \
|
|
|
+ "echo if you have not appended a dtb to the file it may;" \
|
|
|
+ "echo hang after displaying Starting kernel...;" \
|
|
|
+ "echo ;" \
|
|
|
+@@ -269,7 +269,7 @@
|
|
|
"setenv get_cmd tftp; " \
|
|
|
"fi; " \
|
|
|
"if test ${bootfile} = auto; then " \
|
|
@@ -50,7 +53,7 @@
|
|
|
"if ${get_cmd} ${bootfile}; then " \
|
|
|
"run bootit; " \
|
|
|
"else " \
|
|
|
-@@ -286,7 +286,7 @@
|
|
|
+@@ -295,7 +295,7 @@
|
|
|
"fi; " \
|
|
|
"if test ${bootfile} = auto; then " \
|
|
|
"setenv origbootfile auto; " \
|