Merge branch 'master' of git://git.denx.de/u-boot-arm

[oweals/u-boot.git] / include / configs / km / keymile-common.h

diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index a4e0f7cf686909e8ac0c139ec58b67ab0ae32f2a..517f46a3a3301b736c40262ad0390ff9a78894ba 100644 (file)
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -141,8 +141,8 @@
  * - 'release': for a standalone system                kernel/rootfs from flash
  */
 #define CONFIG_KM_DEF_ENV_BOOTTARGETS                                  \
-       "subbootcmds=ubiattach ubicopy cramfsloadfdt cramfsloadkernel " \
-               "flashargs add_default addpanic boot\0"                 \
+       "subbootcmds=ubiattach ubicopy cramfsloadfdt set_fdthigh "      \
+               "cramfsloadkernel flashargs add_default addpanic boot\0"\
        "develop="                                                      \
                "tftp 200000 scripts/develop-${arch}.txt && "           \
                "env import -t 200000 ${filesize} && "                  \
@@ -226,6 +226,7 @@
        CONFIG_KM_DEF_ENV_FLASH_BOOT                                    \
        CONFIG_KM_DEF_ENV_CONSTANTS                                     \
        "altbootcmd=run bootcmd\0"                                      \
+       "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0"                   \
        "bootcmd=km_checkbidhwk &&  "                                   \
                "setenv bootcmd \'if km_checktestboot; then; "          \
                                "setenv boot_bank ${test_bank}; else; " \
@@ -235,6 +236,10 @@
                        "run ${subbootcmds}; reset\' && "               \
                "saveenv && saveenv && boot\0"                          \
        "bootlimit=3\0"                                                 \
+       "cramfsloadfdt="                                                \
+               "cramfsload ${fdt_addr_r} "                             \
+               "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0"             \
+       "fdt_addr_r="__stringify(CONFIG_KM_FDT_ADDR) "\0"               \
        "init=/sbin/init-overlay.sh\0"                                  \
        "load_addr_r="__stringify(CONFIG_KM_KERNEL_ADDR) "\0"           \
        "load=tftpboot ${load_addr_r} ${u-boot}\0"                      \