Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

sunxi: board: Set fdtfile to match the DT chosen by SPL

Browse source 
Previously, fdtfile was always the value in CONFIG_DEFAULT_DEVICE_TREE.
This meant that, regardless of the DT chosen by SPL (either by changing
the header in the image or by the selection code at runtime), Linux
always used the default DT.

By using the name from the SPL header (which, because of the previous
commit, always matches the DT used by U-Boot proper), Linux also sees
the same board as U-Boot/SPL, even if the boot script later loads a DT
from disk.

Acked-by: Maxime Ripard <mripard@kernel.org>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Jagan Teki <jagan@amarulasolutions.com>
[Andre: remove no longer needed CONFIG_SPL_LOAD_FIT guards]
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
This commit is contained in:
Samuel Holland 2020-10-24 10:21:54 -05:00 committed by Andre Przywara
parent 41530cf681
commit 20f3ee31c3
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
board/sunxi/board.c
View file

@ -320,7 +320,6 @@ static struct boot_file_head * get_spl_header(uint8_t req_version)
return spl; return spl;
} }
#ifdef CONFIG_SPL_LOAD_FIT
static const char *get_spl_dt_name(void) static const char *get_spl_dt_name(void)
{ {
struct boot_file_head *spl = get_spl_header(SPL_DT_HEADER_VERSION); struct boot_file_head *spl = get_spl_header(SPL_DT_HEADER_VERSION);
@ -331,7 +330,6 @@ static const char *get_spl_dt_name(void)
return NULL; return NULL;
} }
#endif
int dram_init(void) int dram_init(void)
{ {
@ -857,6 +855,7 @@ static void setup_environment(const void *fdt)
int misc_init_r(void) int misc_init_r(void)
{ {
const char *spl_dt_name;
uint boot; uint boot;
env_set("fel_booted", NULL); env_set("fel_booted", NULL);
@ -875,6 +874,16 @@ int misc_init_r(void)
env_set("mmc_bootdev", "1"); env_set("mmc_bootdev", "1");
} }
/* Set fdtfile to match the FIT configuration chosen in SPL. */
spl_dt_name = get_spl_dt_name();
if (spl_dt_name) {
char *prefix = IS_ENABLED(CONFIG_ARM64) ? "allwinner/" : "";
char str[64];
snprintf(str, sizeof(str), "%s%s.dtb", prefix, spl_dt_name);
env_set("fdtfile", str);
}
setup_environment(gd->fdt_blob); setup_environment(gd->fdt_blob);
#ifdef CONFIG_USB_ETHER #ifdef CONFIG_USB_ETHER