imx: ventana: make fdt_file1 and fdt_file2 automatic and non-overridable

The fdt_file1 and fdt_file2 vars provide fallbacks for the fdt file loading
script. There is no need to allow the user to override these as if they
want to specify the fdt, they should do so in the first attempt which is
the fdt_file var.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
This commit is contained in:
Tim Harvey 2015-05-26 11:04:56 -07:00 committed by Stefano Babic
parent 40c746758c
commit 80d1a3ee72

View File

@ -695,18 +695,14 @@ int misc_init_r(void)
*p++ = 0;
setenv("model_base", str);
if (!getenv("fdt_file1")) {
sprintf(fdt, "%s-%s.dtb", cputype, str);
setenv("fdt_file1", fdt);
}
sprintf(fdt, "%s-%s.dtb", cputype, str);
setenv("fdt_file1", fdt);
if (board_type != GW551x && board_type != GW552x)
str[4] = 'x';
str[5] = 'x';
str[6] = 0;
if (!getenv("fdt_file2")) {
sprintf(fdt, "%s-%s.dtb", cputype, str);
setenv("fdt_file2", fdt);
}
sprintf(fdt, "%s-%s.dtb", cputype, str);
setenv("fdt_file2", fdt);
}
/* initialize env from EEPROM */