]> git.sur5r.net Git - u-boot/commitdiff
imx: ventana: make model env var automatic and non-overridable
authorTim Harvey <tharvey@gateworks.com>
Tue, 26 May 2015 18:04:55 +0000 (11:04 -0700)
committerStefano Babic <sbabic@denx.de>
Mon, 1 Jun 2015 07:48:23 +0000 (09:48 +0200)
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>
board/gateworks/gw_ventana/gw_ventana.c

index ae3cc84557cb2d104d2eeb69b16eab6953b426c3..e3737d13985c0af43e3c69b377b802822e5038d8 100644 (file)
@@ -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 */