diff options
| author | Peter Hoyes <Peter.Hoyes@arm.com> | 2021-11-11 09:26:02 +0000 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-01-04 22:48:48 -0500 |
| commit | 2661397464e47d45cd25bbc5e6b9de7594b3268d (patch) | |
| tree | 8e898c3878143d62624a25df30cf33e77bb4e8c6 /board/armltd/vexpress64/vexpress64.c | |
| parent | 90f262a6951f530ec60bf78a681b117f625cbe3f (diff) | |
| download | u-boot-2661397464e47d45cd25bbc5e6b9de7594b3268d.zip u-boot-2661397464e47d45cd25bbc5e6b9de7594b3268d.tar.gz u-boot-2661397464e47d45cd25bbc5e6b9de7594b3268d.tar.bz2 | |
vexpress64: Enable OF_CONTROL and OF_BOARD for VExpress64
Capture x0 in lowlevel_init.S as potential fdt address. Modify
board_fdt_blob_setup to use fdt address from either vexpress_aemv8.h
or lowlevel_init.S.
Signed-off-by: Peter Hoyes <Peter.Hoyes@arm.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
Diffstat (limited to 'board/armltd/vexpress64/vexpress64.c')
| -rw-r--r-- | board/armltd/vexpress64/vexpress64.c | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index d2f307c..d17b463 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -85,7 +85,15 @@ int dram_init_banksize(void) return 0; } +/* Assigned in lowlevel_init.S + * Push the variable into the .data section so that it + * does not get cleared later. + */ +unsigned long __section(".data") prior_stage_fdt_address; + #ifdef CONFIG_OF_BOARD + +#ifdef CONFIG_TARGET_VEXPRESS64_JUNO #define JUNO_FLASH_SEC_SIZE (256 * 1024) static phys_addr_t find_dtb_in_nor_flash(const char *partname) { @@ -130,9 +138,11 @@ static phys_addr_t find_dtb_in_nor_flash(const char *partname) return ~0; } +#endif void *board_fdt_blob_setup(int *err) { +#ifdef CONFIG_TARGET_VEXPRESS64_JUNO phys_addr_t fdt_rom_addr = find_dtb_in_nor_flash(CONFIG_JUNO_DTB_PART); *err = 0; @@ -142,6 +152,22 @@ void *board_fdt_blob_setup(int *err) } return (void *)fdt_rom_addr; +#endif + +#ifdef VEXPRESS_FDT_ADDR + if (fdt_magic(VEXPRESS_FDT_ADDR) == FDT_MAGIC) { + *err = 0; + return (void *)VEXPRESS_FDT_ADDR; + } +#endif + + if (fdt_magic(prior_stage_fdt_address) == FDT_MAGIC) { + *err = 0; + return (void *)prior_stage_fdt_address; + } + + *err = -ENXIO; + return NULL; } #endif |