arm64: versal: Move common board dtb search

Move the exisiting function of getting board dtb from versal to a common
Xilinx folder.

Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza@xilinx.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/arm/mach-versal/Kconfig b/arch/arm/mach-versal/Kconfig
index 06a03529246445bb1fad9f02c634cb61b8d41278..a08e5ae41490011f98d9b11b78ae06333fdb9b5a 100644 (file)
--- a/arch/arm/mach-versal/Kconfig
+++ b/arch/arm/mach-versal/Kconfig
@@ -36,11 +36,6 @@ config COUNTER_FREQUENCY
 config ZYNQ_SDHCI_MAX_FREQ
        default 200000000
 
-config VERSAL_OF_BOARD_DTB_ADDR
-       hex
-       default 0x1000
-       depends on OF_BOARD
-
 config IOU_SWITCH_DIVISOR0
        hex "IOU switch divisor0"
        default 0x20

diff --git a/arch/arm/mach-versal/cpu.c b/arch/arm/mach-versal/cpu.c
index db9622582748efdf4f5f9d93a2d1e95218752b58..49f1e51c8ea52c38857d7fb6fd8f364712da955a 100644 (file)
--- a/arch/arm/mach-versal/cpu.c
+++ b/arch/arm/mach-versal/cpu.c
@@ -108,20 +108,6 @@ int reserve_mmu(void)
 }
 #endif
 
-#if defined(CONFIG_OF_BOARD)
-void *board_fdt_blob_setup(void)
-{
-       static void *fw_dtb = (void *)CONFIG_VERSAL_OF_BOARD_DTB_ADDR;
-
-       if (fdt_magic(fw_dtb) != FDT_MAGIC) {
-               printf("DTB is not passed via %llx\n", (u64)fw_dtb);
-               return NULL;
-       }
-
-       return fw_dtb;
-}
-#endif
-
 int versal_pm_request(u32 api_id, u32 arg0, u32 arg1, u32 arg2,
                      u32 arg3, u32 *ret_payload)
 {

diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig
index 37bec5fae29d2571dfc96b41bacecddfc1ce6598..4f290339a094f25ffe73291aea3233ea6c8d3e41 100644 (file)
--- a/board/xilinx/Kconfig
+++ b/board/xilinx/Kconfig
@@ -39,3 +39,10 @@ config XILINX_PS_INIT_FILE
             before the build.
 
 endif
+
+config VERSAL_OF_BOARD_DTB_ADDR
+       hex
+       default 0x1000
+       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 7e6340bad6d4cd1acdc6ed76ab0f614a9f19646f..f66973bc66c369a783c1494764ef8dba6896580f 100644 (file)
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -36,3 +36,17 @@ int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
 
        return ret;
 }
+
+#if defined(CONFIG_OF_BOARD)
+void *board_fdt_blob_setup(void)
+{
+       static void *fw_dtb = (void *)CONFIG_VERSAL_OF_BOARD_DTB_ADDR;
+
+       if (fdt_magic(fw_dtb) != FDT_MAGIC) {
+               printf("DTB is not passed via %p\n", fw_dtb);
+               return NULL;
+       }
+
+       return fw_dtb;
+}
+#endif

diff --git a/board/xilinx/versal/Makefile b/board/xilinx/versal/Makefile
index 2b812765ee2f0889164c043553dbf732b870e705..e9307d7fa6909a32b3675f171fc0cb1ea386552f 100644 (file)
--- a/board/xilinx/versal/Makefile
+++ b/board/xilinx/versal/Makefile
@@ -5,3 +5,4 @@
 #
 
 obj-y  := board.o
+obj-y  += ../common/board.o