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 <thar...@gateworks.com>
---
 board/gateworks/gw_ventana/gw_ventana.c | 7 +------
 1 file changed, 1 insertion(+), 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 */
-- 
1.9.1

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to