sunxi: Store the device tree name in the SPL header

[u-boot] / include / configs / imx6qdl_icore.h

diff --git a/include/configs/imx6qdl_icore.h b/include/configs/imx6qdl_icore.h
index f25f3640781f47b991066a203b37c0f96da6a5e8..5a28b15afc79f7ab35ac9cb9601693923fa35585 100644 (file)
--- a/include/configs/imx6qdl_icore.h
+++ b/include/configs/imx6qdl_icore.h
@@ -39,6 +39,7 @@
        "script=boot.scr\0" \
        "splashpos=m,m\0" \
        "image=uImage\0" \
+       "fit_image=fit.itb\0" \
        "console=ttymxc3\0" \
        "fdt_high=0xffffffff\0" \
        "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
@@ -59,6 +60,10 @@
                "source\0" \
        "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
        "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+       "loadfit=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${fit_image}\0" \
+       "fitboot=echo Booting FIT image from mmc ...; " \
+               "run mmcargs; " \
+               "bootm ${loadaddr}\0" \
        "mmcboot=echo Booting from mmc ...; " \
                "run mmcargs; " \
                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
@@ -89,16 +94,20 @@
 # define CONFIG_BOOTCOMMAND            "run nandboot"
 #else
 # define CONFIG_BOOTCOMMAND \
-          "mmc dev ${mmcdev};" \
-          "mmc dev ${mmcdev}; if mmc rescan; then " \
-                  "if run loadbootscript; then " \
-                          "run bootscript; " \
-                  "else " \
-                       "if run loadimage; then " \
-                               "run mmcboot; " \
+       "mmc dev ${mmcdev};" \
+       "if mmc rescan; then " \
+               "if run loadbootscript; then " \
+                       "run bootscript; " \
+               "else " \
+                       "if run loadfit; then " \
+                               "run fitboot; " \
+                       "else " \
+                               "if run loadimage; then " \
+                                       "run mmcboot; " \
+                               "fi; " \
                        "fi; " \
-                  "fi; " \
-          "fi"
+               "fi; " \
+       "fi"
 #endif
 
 /* Miscellaneous configurable options */
@@ -138,7 +147,7 @@
 #ifdef CONFIG_FSL_USDHC
 # define CONFIG_SYS_MMC_ENV_DEV                0
 # define CONFIG_SYS_FSL_USDHC_NUM      1
-# define CONFIG_SYS_FSL_ESDHC_ADDR     USDHC2_BASE_ADDR
+# define CONFIG_SYS_FSL_ESDHC_ADDR     0
 #endif
 
 /* NAND */