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>

diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig
index 4f290339a094f25ffe73291aea3233ea6c8d3e41..cb272eafda7a7497b62067f4c7362652d1248de5 100644 (file)
--- 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 f66973bc66c369a783c1494764ef8dba6896580f..1c28263cb8895529977ef43642d646ac177be001 100644 (file)
--- 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);