diff options
| author | Tom Rini <trini@ti.com> | 2014-02-17 14:22:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-02-17 14:22:02 -0500 |
| commit | c4d376fd1c2bce8d64cec0431dd3f24957b6dec4 (patch) | |
| tree | de17e3a67fa4a48f3b9571bff2399cb0a24558bc /include/configs/km/keymile-common.h | |
| parent | b1ad03c242dae3712b9be66026f5d8c6f919c00b (diff) | |
| parent | 5e77a745b24d9b98aa635293972f04fd6f0c6b38 (diff) | |
| download | u-boot-imx-c4d376fd1c2bce8d64cec0431dd3f24957b6dec4.zip u-boot-imx-c4d376fd1c2bce8d64cec0431dd3f24957b6dec4.tar.gz u-boot-imx-c4d376fd1c2bce8d64cec0431dd3f24957b6dec4.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/configs/km/keymile-common.h')
| -rw-r--r-- | include/configs/km/keymile-common.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index a4e0f7c..517f46a 100644 --- 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" \ |