mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-08-20 08:58:52 +09:00
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>
This commit is contained in:
parent
7ea7f689ca
commit
a71432151f
@ -60,7 +60,7 @@
|
|||||||
"rdaddr=0x81000000\0" \
|
"rdaddr=0x81000000\0" \
|
||||||
"bootdir=/boot\0" \
|
"bootdir=/boot\0" \
|
||||||
"bootfile=uImage\0" \
|
"bootfile=uImage\0" \
|
||||||
"fdtfile=\0" \
|
"fdtfile=undefined\0" \
|
||||||
"console=ttyO0,115200n8\0" \
|
"console=ttyO0,115200n8\0" \
|
||||||
"optargs=\0" \
|
"optargs=\0" \
|
||||||
"mtdids=" MTDIDS_DEFAULT "\0" \
|
"mtdids=" MTDIDS_DEFAULT "\0" \
|
||||||
@ -145,8 +145,9 @@
|
|||||||
"if test $board_name = A33515BB; then " \
|
"if test $board_name = A33515BB; then " \
|
||||||
"setenv fdtfile am335x-evm.dtb; fi; " \
|
"setenv fdtfile am335x-evm.dtb; fi; " \
|
||||||
"if test $board_name = A335X_SK; then " \
|
"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
|
#endif
|
||||||
|
|
||||||
#define CONFIG_BOOTCOMMAND \
|
#define CONFIG_BOOTCOMMAND \
|
||||||
|
@ -150,6 +150,7 @@
|
|||||||
"console=ttyO2,115200n8\0" \
|
"console=ttyO2,115200n8\0" \
|
||||||
"fdt_high=0xffffffff\0" \
|
"fdt_high=0xffffffff\0" \
|
||||||
"fdtaddr=0x80f80000\0" \
|
"fdtaddr=0x80f80000\0" \
|
||||||
|
"fdtfile=undefined\0" \
|
||||||
"bootpart=0:2\0" \
|
"bootpart=0:2\0" \
|
||||||
"bootdir=/boot\0" \
|
"bootdir=/boot\0" \
|
||||||
"bootfile=zImage\0" \
|
"bootfile=zImage\0" \
|
||||||
@ -178,7 +179,9 @@
|
|||||||
"if test $board_name = panda; then " \
|
"if test $board_name = panda; then " \
|
||||||
"setenv fdtfile omap4-panda.dtb; fi;" \
|
"setenv fdtfile omap4-panda.dtb; fi;" \
|
||||||
"if test $board_name = panda-es; then " \
|
"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" \
|
"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
|
||||||
|
|
||||||
#define CONFIG_BOOTCOMMAND \
|
#define CONFIG_BOOTCOMMAND \
|
||||||
|
@ -139,6 +139,7 @@
|
|||||||
"console=ttyO2,115200n8\0" \
|
"console=ttyO2,115200n8\0" \
|
||||||
"fdt_high=0xffffffff\0" \
|
"fdt_high=0xffffffff\0" \
|
||||||
"fdtaddr=0x80f80000\0" \
|
"fdtaddr=0x80f80000\0" \
|
||||||
|
"fdtfile=undefined\0" \
|
||||||
"bootpart=0:2\0" \
|
"bootpart=0:2\0" \
|
||||||
"bootdir=/boot\0" \
|
"bootdir=/boot\0" \
|
||||||
"bootfile=zImage\0" \
|
"bootfile=zImage\0" \
|
||||||
@ -166,7 +167,9 @@
|
|||||||
"bootz ${loadaddr} - ${fdtaddr}\0" \
|
"bootz ${loadaddr} - ${fdtaddr}\0" \
|
||||||
"findfdt="\
|
"findfdt="\
|
||||||
"if test $board_name = omap5_uevm; then " \
|
"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" \
|
"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \
|
||||||
|
|
||||||
#define CONFIG_BOOTCOMMAND \
|
#define CONFIG_BOOTCOMMAND \
|
||||||
|
Loading…
Reference in New Issue
Block a user