summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTim Harvey <tharvey@gateworks.com>2015-05-26 11:04:55 -0700
committerStefano Babic <sbabic@denx.de>2015-06-01 09:48:23 +0200
commit40c746758c4b9fabf07fbfa3b4ed9e907b4c8fd5 (patch)
tree7755b681d6f66a79a792f6a9ef77a90891c40abc /board
parent9a83a8154590ebfbdbe32579b97c501ca240a706 (diff)
downloadu-boot-imx-40c746758c4b9fabf07fbfa3b4ed9e907b4c8fd5.zip
u-boot-imx-40c746758c4b9fabf07fbfa3b4ed9e907b4c8fd5.tar.gz
u-boot-imx-40c746758c4b9fabf07fbfa3b4ed9e907b4c8fd5.tar.bz2
imx: ventana: make model env var automatic and non-overridable
We want to model env var to always reflect what was in the EEPROM. There is no point in allowing a user to override this. Signed-off-by: Tim Harvey <tharvey@gateworks.com>
Diffstat (limited to 'board')
-rw-r--r--board/gateworks/gw_ventana/gw_ventana.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c
index ae3cc84..e3737d1 100644
--- a/board/gateworks/gw_ventana/gw_ventana.c
+++ b/board/gateworks/gw_ventana/gw_ventana.c
@@ -685,8 +685,7 @@ int misc_init_r(void)
memset(str, 0, sizeof(str));
for (i = 0; i < (sizeof(str)-1) && info->model[i]; i++)
str[i] = tolower(info->model[i]);
- if (!getenv("model"))
- setenv("model", str);
+ setenv("model", str);
if (!getenv("fdt_file")) {
sprintf(fdt, "%s-%s.dtb", cputype, str);
setenv("fdt_file", fdt);
@@ -827,10 +826,6 @@ int ft_board_setup(void *blob, bd_t *bd)
printf(" Set display timings for %s...\n", display);
}
- if (!model) {
- puts("invalid board info: Leaving FDT fully enabled\n");
- return 0;
- }
printf(" Adjusting FDT per EEPROM for %s...\n", model);
/* board serial number */