[U-Boot] [PATCH v2] arm: dra7xx: Update the EXTRA_ENV_SETTINGS

Dan Murphy dmurphy at ti.com
Tue Jun 4 17:26:06 CEST 2013


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 <dmurphy at ti.com>
---
v2 - Updated with side bar maintainer comments.
 include/configs/omap5_common.h |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h
index deb5e9f..c5061dd 100644
--- a/include/configs/omap5_common.h
+++ b/include/configs/omap5_common.h
@@ -142,9 +142,15 @@
 #define PARTS_DEFAULT
 #endif
 
+#ifdef CONFIG_DRA7XX
+#define CONFIG_CONSOLE_DEV		"ttyO0"
+#else
+#define CONFIG_CONSOLE_DEV		"ttyO2"
+#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"loadaddr=0x82000000\0" \
-	"console=ttyO2,115200n8\0" \
+	"console=" CONFIG_CONSOLE_DEV ",115200n8\0" \
 	"fdt_high=0xffffffff\0" \
 	"fdtaddr=0x80f80000\0" \
 	"bootpart=0:2\0" \
@@ -174,7 +180,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 $board_name = dra7xx; then " \
+			"setenv fdtfile dra7-evm.dtb; fi;\0 " \
 	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile};\0" \
 
 #define CONFIG_BOOTCOMMAND \
-- 
1.7.5.4



More information about the U-Boot mailing list