@@ -138,6 +138,7 @@
*/
#define CONFIG_BOOTDELAY 3
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_OVERWRITE
@@ -145,6 +146,7 @@
"loadaddr=0x82000000\0" \
"console=ttyO2,115200n8\0" \
"fdt_high=0xffffffff\0" \
+ "fdtaddr=0x88000000\0" \
"usbtty=cdc_acm\0" \
"vram=16M\0" \
"mmcdev=0\0" \
@@ -153,7 +155,9 @@
"mmcargs=setenv bootargs console=${console} " \
"vram=${vram} " \
"root=${mmcroot} " \
- "rootfstype=${mmcrootfstype}\0" \
+ "rootfstype=${mmcrootfstype}; " \
+ "run findfdt; " \
+ "fatload mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \
"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
"source ${loadaddr}\0" \
@@ -163,7 +167,12 @@
"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
"mmcboot=echo Booting from mmc${mmcdev} ...; " \
"run mmcargs; " \
- "bootm ${loadaddr}\0" \
+ "bootm ${loadaddr} - ${fdtaddr}\0" \
+ "findfdt="\
+ "if test $board_name = sdp4430; then " \
+ "setenv fdtfile omap4-sdp.dtb; fi; " \
+ "if test $board_name = panda; then " \
+ "setenv fdtfile omap4-panda.dtb; fi\0" \
#define CONFIG_BOOTCOMMAND \
"mmc dev ${mmcdev}; if mmc rescan; then " \
@@ -137,6 +137,7 @@
*/
#define CONFIG_BOOTDELAY 3
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
#define CONFIG_ENV_OVERWRITE
@@ -144,6 +145,7 @@
"loadaddr=0x82000000\0" \
"console=ttyO2,115200n8\0" \
"fdt_high=0xffffffff\0" \
+ "fdtaddr=0x88000000\0" \
"usbtty=cdc_acm\0" \
"vram=16M\0" \
"mmcdev=0\0" \
@@ -152,7 +154,9 @@
"mmcargs=setenv bootargs console=${console} " \
"vram=${vram} " \
"root=${mmcroot} " \
- "rootfstype=${mmcrootfstype}\0" \
+ "rootfstype=${mmcrootfstype}; " \
+ "run findfdt; " \
+ "fatload mmc ${mmcdev} ${fdtaddr} ${fdtfile}\0" \
"loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \
"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
"source ${loadaddr}\0" \
@@ -162,7 +166,10 @@
"loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
"mmcboot=echo Booting from mmc${mmcdev} ...; " \
"run mmcargs; " \
- "bootm ${loadaddr}\0" \
+ "bootm ${loadaddr} - ${fdtaddr}\0" \
+ "findfdt="\
+ "if test $board_name = omap5_uevm; then " \
+ "setenv fdtfile omap5-uevm.dtb; fi;\0 " \
#define CONFIG_BOOTCOMMAND \
"mmc dev ${mmcdev}; if mmc rescan; then " \
Now with kernel moving to all device tree, the default boot command is changed to pass the device tree blob. Also, adding the findfdt command to get the dt-blob based on the board. Thanks to Tom Rini <trini@ti.com> for suggesting this. Signed-off-by: Sricharan R <r.sricharan@ti.com> --- [V2] Corrected the board file name for omap4 boards in findfdt command include/configs/omap4_common.h | 13 +++++++++++-- include/configs/omap5_common.h | 11 +++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-)