CuboxI: u-boot: sync with commit a06fada (supporting Hummingboard)

packages/tools/u-boot/package.mk

@@ -22,7 +22,7 @@ if [ "$UBOOT_VERSION" = "default" ]; then
   PKG_SITE="http://www.denx.de/wiki/U-Boot/WebHome"
   PKG_URL="ftp://ftp.denx.de/pub/u-boot/$PKG_NAME-$PKG_VERSION.tar.bz2"
 elif [ "$UBOOT_VERSION" = "imx6-cuboxi" ]; then
-  PKG_VERSION="imx6-ed888a1"
+  PKG_VERSION="imx6-a06fada"
   PKG_SITE="http://imx.solid-run.com/wiki/index.php?title=Building_the_kernel_and_u-boot_for_the_CuBox-i_and_the_HummingBoard"
   PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 fi

projects/Cuboxi/patches/u-boot/u-boot-zImage.patch

@@ -1,6 +1,6 @@
---- u-boot-imx6-cuboxi-3fd848b/include/configs/mx6_cubox-i.h.orig	2014-03-02 20:44:06.000000000 +0100
-+++ u-boot-imx6-cuboxi-3fd848b/include/configs/mx6_cubox-i.h	2014-03-05 08:11:31.533508170 +0100
-@@ -150,6 +150,7 @@
+--- u-boot-imx6-a06fada/include/configs/mx6_cubox-i.h.orig	2014-08-20 21:24:00.000000000 +0200
++++ u-boot-imx6-a06fada/include/configs/mx6_cubox-i.h	2014-08-21 08:12:57.282325080 +0200
+@@ -155,6 +155,7 @@
  #define CONFIG_SYS_CONSOLE_IS_IN_ENV
  
  #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -8,37 +8,25 @@
          "script=boot.scr\0" \
          "bootfile=auto\0" \
          "bootenv=uEnv.txt\0" \
-@@ -207,25 +208,25 @@
+@@ -217,7 +218,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} = ${zImage}; 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} = ${zImage}; then " \
- 		    "bootz; " \
+ 		    "bootz ${loadaddr} ${ramdisk_addr} ${fdt_addr}; " \
  		"else " \
- 		    "bootm; " \
- 		"fi;\0 " \
- 	"bootit=setenv boot_file ${bootfile}; " \
+ 		    "bootm ${loadaddr} ${ramdisk_addr} ${fdt_addr}; " \
+@@ -232,7 +233,7 @@
+ 		"else " \
+ 		    "setenv ramdisk_addr -; " \
+                 "fi; " \
 -                "if test ${boot_file} = zImage; then " \
 +                "if test ${boot_file} = ${zImage}; then " \
                      "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
                          "if run loadfdt; then " \
-                             "run autobootfdt; " \
-                         "else " \
-                             "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 ${zImage};" \
-                                   "echo if you have not appended a dtb to the file it may;" \
-                                   "echo hang after displaying Starting kernel...;" \
-                                   "echo ;" \
-@@ -255,7 +256,7 @@
+ 			    "echo Loaded ${fdt_file}; " \
+@@ -269,7 +270,7 @@
                      "setenv get_cmd tftp; " \
                  "fi; " \
                  "if test ${bootfile} = auto; then " \
@@ -47,7 +35,7 @@
                       "if ${get_cmd} ${bootfile}; then " \
                           "run bootit; " \
                       "else " \
-@@ -278,7 +279,7 @@
+@@ -295,7 +296,7 @@
  			   "fi; " \
                             "if test ${bootfile} = auto; then " \
                                     "setenv origbootfile auto; " \
@@ -55,4 +43,4 @@
 +                                   "setenv bootfile ${zImage}; " \
                                     "if run loadbootfile; then " \
                                          "run mmcboot; " \
-                                    "else " \
+                                    "else " \