engicam: Set fdt_file env during run-time

[people/ms/u-boot.git] / include / configs / imx6ul_geam.h

diff --git a/include/configs/imx6ul_geam.h b/include/configs/imx6ul_geam.h
index 48b11209101f34ac2370614f58b2ff9561504fbe..9f66dd324f950554d0fd30b619eea2e46ee9c647 100644 (file)
--- a/include/configs/imx6ul_geam.h
+++ b/include/configs/imx6ul_geam.h
@@ -37,51 +37,70 @@
 /* Default environment */
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "script=boot.scr\0" \
-       "image=zImage\0" \
+       "image=uImage\0" \
+       "fit_image=fit.itb\0" \
        "console=ttymxc0\0" \
        "fdt_high=0xffffffff\0" \
-       "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
        "fdt_addr=0x87800000\0" \
        "boot_fdt=try\0" \
-       "mmcdev=0\0" \
        "mmcpart=1\0" \
-       "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \
+       "nandroot=ubi0:rootfs rootfstype=ubifs\0" \
        "mmcautodetect=yes\0" \
        "mmcargs=setenv bootargs console=${console},${baudrate} " \
                "root=${mmcroot}\0" \
+       "ubiargs=setenv bootargs console=${console},${baudrate} " \
+               "ubi.mtd=5 root=${nandroot} ${mtdparts}\0" \
        "loadbootscript=" \
                "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
        "bootscript=echo Running bootscript from mmc ...; " \
                "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 ...; " \
+       "loadfit=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${fit_image}\0" \
+       "fitboot=echo Booting FIT image from mmc ...; " \
+               "run mmcargs; " \
+               "bootm ${loadaddr}\0" \
+       "_mmcboot=run mmcargs; " \
                "run mmcargs; " \
                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
                        "if run loadfdt; then " \
-                               "bootz ${loadaddr} - ${fdt_addr}; " \
+                               "bootm ${loadaddr} - ${fdt_addr}; " \
                        "else " \
                                "if test ${boot_fdt} = try; then " \
-                                       "bootz; " \
+                                       "bootm; " \
                                "else " \
                                        "echo WARN: Cannot load the DT; " \
                                "fi; " \
                        "fi; " \
                "else " \
-                       "bootz; " \
-               "fi\0"
-
-#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; " \
+                       "bootm; " \
+               "fi\0" \
+       "mmcboot=echo Booting from mmc ...; " \
+               "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\0" \
+       "nandboot=echo Booting from nand ...; " \
+               "if mtdparts; then " \
+                       "echo Starting nand boot ...; " \
+               "else " \
+                       "mtdparts default; " \
+               "fi; " \
+               "run ubiargs; " \
+               "nand read ${loadaddr} kernel 0x800000; " \
+               "nand read ${fdt_addr} dtb 0x100000; " \
+               "bootm ${loadaddr} - ${fdt_addr}\0"
+
+#define CONFIG_BOOTCOMMAND             "run $modeboot"
 
 /* Miscellaneous configurable options */
 #define CONFIG_SYS_MEMTEST_START       0x80000000
@@ -103,6 +122,14 @@
 #define CONFIG_SYS_INIT_SP_ADDR                (CONFIG_SYS_INIT_RAM_ADDR + \
                                        CONFIG_SYS_INIT_SP_OFFSET)
 
+/* FIT */
+#ifdef CONFIG_FIT
+# define CONFIG_HASH_VERIFY
+# define CONFIG_SHA1
+# define CONFIG_SHA256
+# define CONFIG_IMAGE_FORMAT_LEGACY
+#endif
+
 /* UART */
 #ifdef CONFIG_MXC_UART
 # define CONFIG_MXC_UART_BASE          UART1_BASE
@@ -112,7 +139,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 */
@@ -128,9 +155,14 @@
 # define CONFIG_MTD_DEVICE
 # define CONFIG_CMD_MTDPARTS
 # define CONFIG_MTD_PARTITIONS
-# define MTDIDS_DEFAULT                        "nand0=nand"
-# define MTDPARTS_DEFAULT              "mtdparts=nand:2m(spl),2m(uboot)," \
-                                       "1m(env),4m(kernel),1m(dtb),-(rootfs)"
+# define MTDIDS_DEFAULT                        "nand0=gpmi-nand"
+# define MTDPARTS_DEFAULT              "mtdparts=gpmi-nand:2m(spl),2m(uboot)," \
+                                       "1m(env),8m(kernel),1m(dtb),-(rootfs)"
+
+/* UBI */
+# define CONFIG_CMD_UBIFS
+# define CONFIG_RBTREE
+# define CONFIG_LZO
 
 # define CONFIG_APBH_DMA
 # define CONFIG_APBH_DMA_BURST