From f4e7e611936942fb15994d22a398707028416081 Mon Sep 17 00:00:00 2001 From: Ibai Erkiaga Date: Wed, 2 Oct 2019 15:57:37 +0100 Subject: [PATCH] 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 Signed-off-by: Michal Simek --- board/xilinx/Kconfig | 5 +++-- board/xilinx/common/board.c | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig index 4f290339a0..cb272eafda 100644 --- a/board/xilinx/Kconfig +++ b/board/xilinx/Kconfig @@ -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. diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index f66973bc66..1c28263cb8 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -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); -- 2.25.1