From a71432151f9ca10ef235b96a083c3bdb1fbb97cb Mon Sep 17 00:00:00 2001 From: Dan Murphy Date: Thu, 6 Jun 2013 13:27:06 -0500 Subject: 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 Reviewed-by: Tom Rini --- include/configs/omap5_common.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/configs/omap5_common.h') diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h index ddf2ad4..deecf4d 100644 --- a/include/configs/omap5_common.h +++ b/include/configs/omap5_common.h @@ -139,6 +139,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" \ @@ -166,7 +167,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 \ -- cgit v1.1 From 45dbbf29bb58934d7c75b38429927b058ff69f9c Mon Sep 17 00:00:00 2001 From: Dan Murphy Date: Tue, 11 Jun 2013 11:22:30 -0500 Subject: arm: dra7xx: Update the EXTRA_ENV_SETTINGS Update the EXTRA_ENV_SETTING for the dra7xx. The console needs to be set to ttyO0 and the findfdt needs to be updated to load the dra7xx-evm.dtb file. Signed-off-by: Dan Murphy Reviewed-by: Tom Rini --- include/configs/omap5_common.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include/configs/omap5_common.h') diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h index deecf4d..b87ee42 100644 --- a/include/configs/omap5_common.h +++ b/include/configs/omap5_common.h @@ -136,7 +136,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x82000000\0" \ - "console=ttyO2,115200n8\0" \ + "console=" CONSOLEDEV ",115200n8\0" \ "fdt_high=0xffffffff\0" \ "fdtaddr=0x80f80000\0" \ "fdtfile=undefined\0" \ @@ -168,6 +168,8 @@ "findfdt="\ "if test $board_name = omap5_uevm; then " \ "setenv fdtfile omap5-uevm.dtb; fi; " \ + "if test $board_name = dra7xx; then " \ + "setenv fdtfile dra7-evm.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" \ -- cgit v1.1