summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/configs/km/keymile-common.h5
-rw-r--r--include/configs/km/km-powerpc.h1
-rw-r--r--include/configs/km/km_arm.h6
-rw-r--r--include/configs/km/kmp204x-common.h1
4 files changed, 11 insertions, 2 deletions
diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h
index 2fc1ea8328..91b29b35ba 100644
--- a/include/configs/km/keymile-common.h
+++ b/include/configs/km/keymile-common.h
@@ -141,8 +141,9 @@
* - 'release': for a standalone system kernel/rootfs from flash
*/
#define CONFIG_KM_DEF_ENV_BOOTTARGETS \
- "subbootcmds=ubiattach ubicopy cramfsloadfdt set_fdthigh " \
- "cramfsloadkernel flashargs add_default addpanic boot\0"\
+ "subbootcmds=ubiattach ubicopy checkfdt cramfsloadfdt " \
+ "set_fdthigh cramfsloadkernel flashargs add_default " \
+ "addpanic boot\0" \
"develop=" \
"tftp 200000 scripts/develop-${arch}.txt && " \
"env import -t 200000 ${filesize} && " \
diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h
index eb85a74919..20ef036027 100644
--- a/include/configs/km/km-powerpc.h
+++ b/include/configs/km/km-powerpc.h
@@ -79,6 +79,7 @@
" ${filesize} && " \
"protect on " __stringify(BOOTFLASH_START) " +${filesize}\0"\
"set_fdthigh=true\0" \
+ "checkfdt=true\0" \
""
#endif /* __CONFIG_KEYMILE_POWERPC_H */
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index 77487ead5a..54aa6fb3b6 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -82,6 +82,12 @@
"u-boot="__stringify(CONFIG_HOSTNAME) "/u-boot.kwb\0" \
CONFIG_KM_UPDATE_UBOOT \
"set_fdthigh=setenv fdt_high ${kernelmem}\0" \
+ "checkfdt=" \
+ "if cramfsls fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb; " \
+ "then true; else setenv cramfsloadfdt true; " \
+ "setenv boot bootm ${load_addr_r}; " \
+ "echo No FDT found, booting with the kernel " \
+ "appended one; fi\0" \
""
#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */
diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index 8a3c74e1db..e163edb1e8 100644
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -457,6 +457,7 @@ int get_scl(void);
"sf probe 0;sf erase 0 +${filesize};" \
"sf write ${load_addr_r} 0 ${filesize};\0" \
"set_fdthigh=true\0" \
+ "checkfdt=true\0" \
""
#define CONFIG_HW_ENV_SETTINGS \