summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Murphy <dmurphy@ti.com>2013-06-11 11:22:30 -0500
committerTom Rini <trini@ti.com>2013-06-18 10:43:29 -0400
commit45dbbf29bb58934d7c75b38429927b058ff69f9c (patch)
tree40583b45b881b2d4bcfb1d4499d7d009579fcf35
parent3de7c28c29f4fae7de95a189afed13dfe6b6e9ac (diff)
downloadu-boot-imx-45dbbf29bb58934d7c75b38429927b058ff69f9c.zip
u-boot-imx-45dbbf29bb58934d7c75b38429927b058ff69f9c.tar.gz
u-boot-imx-45dbbf29bb58934d7c75b38429927b058ff69f9c.tar.bz2
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 <dmurphy@ti.com> Reviewed-by: Tom Rini <trini@ti.com>
-rw-r--r--include/configs/dra7xx_evm.h3
-rw-r--r--include/configs/omap5_common.h4
-rw-r--r--include/configs/omap5_uevm.h2
3 files changed, 8 insertions, 1 deletions
diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h
index 0eea28c..c11f005 100644
--- a/include/configs/dra7xx_evm.h
+++ b/include/configs/dra7xx_evm.h
@@ -41,4 +41,7 @@
#define CONFIG_BAUDRATE 115200
#define CONFIG_SYS_OMAP_ABE_SYSCK
+
+#define CONSOLEDEV "ttyO0"
+
#endif /* __CONFIG_DRA7XX_EVM_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" \
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index e792b1b..46dacc2 100644
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -55,5 +55,7 @@
#define CONFIG_SYS_PROMPT "OMAP5432 uEVM # "
+#define CONSOLEDEV "ttyO2"
+
#define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC 16296
#endif /* __CONFIG_OMAP5_EVM_H */