summaryrefslogtreecommitdiffstats
path: root/include/configs/omap4_common.h
diff options
context:
space:
mode:
authorDan Murphy <dmurphy@ti.com>2013-06-06 13:27:06 -0500
committerTom Rini <trini@ti.com>2013-06-18 10:43:29 -0400
commita71432151f9ca10ef235b96a083c3bdb1fbb97cb (patch)
treef15600e5cee280ab8f8b3b673d080df976e01e73 /include/configs/omap4_common.h
parent7ea7f689cab5bf715255e22c31aeefb23259afe5 (diff)
downloadblackbird-obmc-uboot-a71432151f9ca10ef235b96a083c3bdb1fbb97cb.tar.gz
blackbird-obmc-uboot-a71432151f9ca10ef235b96a083c3bdb1fbb97cb.zip
arm: omap: Add check for fdtfile in the findfdt macro
In the omap4, omap5 and am335x common files add a check to ensure that the fdtfile is defined after the findfdt macro has run. If the file is not defined then warn the user that the dtb file is not defined. Signed-off-by: Dan Murphy <dmurphy@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
Diffstat (limited to 'include/configs/omap4_common.h')
-rw-r--r--include/configs/omap4_common.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
index 3e5d36b21e..f47d52e2d0 100644
--- a/include/configs/omap4_common.h
+++ b/include/configs/omap4_common.h
@@ -150,6 +150,7 @@
"console=ttyO2,115200n8\0" \
"fdt_high=0xffffffff\0" \
"fdtaddr=0x80f80000\0" \
+ "fdtfile=undefined\0" \
"bootpart=0:2\0" \
"bootdir=/boot\0" \
"bootfile=zImage\0" \
@@ -178,7 +179,9 @@
"if test $board_name = panda; then " \
"setenv fdtfile omap4-panda.dtb; fi;" \
"if test $board_name = panda-es; then " \
- "setenv fdtfile omap4-panda-es.dtb; fi; \0" \
+ "setenv fdtfile omap4-panda-es.dtb; fi;" \
+ "if test $fdtfile = undefined; then " \
+ "echo WARNING: Could not determine device tree to use; fi; \0" \
"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
#define CONFIG_BOOTCOMMAND \
OpenPOWER on IntegriCloud