OMAP3: igep00x0: allow booting with a FDT from MMC

[platform/kernel/u-boot.git] / include / configs / igep00x0.h

diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h
index c17267e..722c566 100644 (file)
--- a/include/configs/igep00x0.h
+++ b/include/configs/igep00x0.h
@@ -18,6 +18,7 @@
 #define CONFIG_OMAP            1       /* in a TI OMAP core */
 #define CONFIG_OMAP34XX                1       /* which is a 34XX */
 #define CONFIG_OMAP_GPIO
+#define CONFIG_OMAP_COMMON
 
 #define CONFIG_SDRC    /* The chip has SDRC controller */
 
@@ -97,8 +98,9 @@
 #include <config_cmd_default.h>
 
 #define CONFIG_CMD_CACHE
-#define CONFIG_CMD_EXT2                /* EXT2 Support                 */
+#define CONFIG_CMD_EXT4
 #define CONFIG_CMD_FAT         /* FAT support                  */
+#define CONFIG_CMD_FS_GENERIC
 #define CONFIG_CMD_I2C         /* I2C serial bus support       */
 #define CONFIG_CMD_MMC         /* MMC support                  */
 #ifdef CONFIG_BOOT_ONENAND
@@ -136,6 +138,9 @@
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "usbtty=cdc_acm\0" \
        "loadaddr=0x82000000\0" \
+       "dtbaddr=0x81600000\0" \
+       "bootdir=/boot\0" \
+       "bootfile=zImage\0" \
        "usbtty=cdc_acm\0" \
        "console=ttyO2,115200n8\0" \
        "mpurate=auto\0" \
@@ -163,17 +168,20 @@
                "omapdss.def_disp=${defaultdisplay} " \
                "root=${nandroot} " \
                "rootfstype=${nandrootfstype}\0" \
-       "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
+       "loadbootenv=load mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
        "importbootenv=echo Importing environment from mmc ...; " \
                "env import -t $loadaddr $filesize\0" \
-       "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
+       "loadzimage=load mmc ${mmcdev}:2 ${loadaddr} ${bootdir}/${bootfile}\0" \
+       "loadfdt=load mmc ${mmcdev}:2 ${dtbaddr} ${bootdir}/${dtbfile}\0" \
        "mmcboot=echo Booting from mmc ...; " \
                "run mmcargs; " \
-               "bootm ${loadaddr}\0" \
+               "bootz ${loadaddr}\0" \
+       "mmcbootfdt=echo Booting with DT from mmc ...; " \
+               "bootz ${loadaddr} - ${dtbaddr}\0" \
        "nandboot=echo Booting from onenand ...; " \
                "run nandargs; " \
                "onenand read ${loadaddr} 280000 400000; " \
-               "bootm ${loadaddr}\0" \
+               "bootz ${loadaddr}\0" \
 
 #define CONFIG_BOOTCOMMAND \
        "mmc dev ${mmcdev}; if mmc rescan; then " \
@@ -185,7 +193,12 @@
                        "echo Running uenvcmd ...;" \
                        "run uenvcmd;" \
                "fi;" \
-               "if run loaduimage; then " \
+               "if run loadzimage; then " \
+                       "if test -n $dtbfile; then " \
+                               "if run loadfdt; then " \
+                                       "run mmcbootfdt;" \
+                               "fi;" \
+                       "fi;" \
                        "run mmcboot;" \
                "fi;" \
        "fi;" \