arm64: xilinx: Enable generic of_board_dtb

Modify the configuration naming to be generic to xilinx rather than
specific to Versal. The offset value is different for Zynq and ZynqMP
to avoid overlapping with FSBL.

Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Ibai Erkiaga 2019-10-02 15:57:37 +01:00 committed by Michal Simek
parent fec657bebd
commit f4e7e61193
2 changed files with 4 additions and 3 deletions

View File

@ -40,9 +40,10 @@ config XILINX_PS_INIT_FILE
endif
config VERSAL_OF_BOARD_DTB_ADDR
config XILINX_OF_BOARD_DTB_ADDR
hex
default 0x1000
default 0x1000 if ARCH_VERSAL
default 0x100000 if ARCH_ZYNQ || ARCH_ZYNQMP
depends on OF_BOARD
help
Offset in the memory where the board configuration DTB is placed.

View File

@ -40,7 +40,7 @@ int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
#if defined(CONFIG_OF_BOARD)
void *board_fdt_blob_setup(void)
{
static void *fw_dtb = (void *)CONFIG_VERSAL_OF_BOARD_DTB_ADDR;
static void *fw_dtb = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR;
if (fdt_magic(fw_dtb) != FDT_MAGIC) {
printf("DTB is not passed via %p\n", fw_dtb);