From: Dan Murphy Date: Tue, 11 Jun 2013 16:22:30 +0000 (-0500) Subject: arm: dra7xx: Update the EXTRA_ENV_SETTINGS X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=45dbbf29bb58934d7c75b38429927b058ff69f9c;p=u-boot.git 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 --- diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 0eea28c80a..c11f005535 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 deecf4ddab..b87ee42286 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 e792b1b5c7..46dacc2074 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 */