From: Lokesh Vutla Date: Mon, 14 Jul 2014 14:27:58 +0000 (+0530) Subject: ARM: DRA7xx: Update the board_name env variable X-Git-Tag: v2014.07~2 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=4ec3f6e5104034e113f6ea8ab356f78ff4ad00b8;p=u-boot ARM: DRA7xx: Update the board_name env variable Update the board_name env variable and accordingly populate the dtb file. Signed-off-by: Lokesh Vutla --- diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 073d15127c..7f19655cfe 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -82,6 +82,12 @@ int board_init(void) int board_late_init(void) { +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + if (omap_revision() == DRA722_ES1_0) + setenv("board_name", "dra72x"); + else + setenv("board_name", "dra7xx"); +#endif init_sata(0); return 0; } diff --git a/include/configs/ti_omap5_common.h b/include/configs/ti_omap5_common.h index a582fa4041..cb928ab8e6 100644 --- a/include/configs/ti_omap5_common.h +++ b/include/configs/ti_omap5_common.h @@ -67,6 +67,7 @@ #define PARTS_DEFAULT #endif +#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "console=" CONSOLEDEV ",115200n8\0" \ @@ -116,6 +117,8 @@ "setenv fdtfile omap5-uevm.dtb; fi; " \ "if test $board_name = dra7xx; then " \ "setenv fdtfile dra7-evm.dtb; fi;" \ + "if test $board_name = dra72x; then " \ + "setenv fdtfile dra72-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" \