arm: omap: Add check for fdtfile in the findfdt macro
PATCH 1/1 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 <[email protected]>
--- include/configs/am335x_evm.h | 7 ++++--- include/configs/omap4_common.h | 5 ++++- include/configs/omap5_common.h | 5 ++++- 3 files changed, 12 insertions(+), 5 deletions(-)
include/configs/am335x_evm.h +4 -3
@@ -60,7 +60,7 @@"rdaddr=0x81000000\0" \"bootdir=/boot\0" \"bootfile=uImage\0" \ -"fdtfile=\0" \ +"fdtfile=undefined\0" \"console=ttyO0,115200n8\0" \"optargs=\0" \"mtdids=" MTDIDS_DEFAULT "\0" \
@@ -145,8 +145,9 @@"if test $board_name = A33515BB; then " \"setenv fdtfile am335x-evm.dtb; fi; " \"if test $board_name = A335X_SK; then " \ - "setenv fdtfile am335x-evmsk.dtb; fi\0" \ - +"setenv fdtfile am335x-evmsk.dtb; fi " \ +"if test $fdtfile = undefined; then " \ + "echo WARNING: Could not determine device tree to use; fi; \0"#endif #define CONFIG_BOOTCOMMAND \
include/configs/omap4_common.h +4 -1
@@ -154,6 +154,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" \
@@ -182,7 +183,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 \
include/configs/omap5_common.h +4 -1
@@ -147,6 +147,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" \
@@ -174,7 +175,9 @@"bootz ${loadaddr} - ${fdtaddr}\0" \"findfdt=" \"if test $board_name = omap5_uevm; then " \ -"setenv fdtfile omap5-uevm.dtb; fi;\0 " \ +"setenv fdtfile omap5-uevm.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 \
Signature · 1 line
1.7.5.4
PATCH 1/1 arm: omap: Add check for fdtfile in the findfdt macro
Quoted 5 lines · Dan Murphy
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 <[email protected]>
Reviewed-by Tom Rini <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130611/d4429d7c/attachment.pgp>