@@ -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
@@ -109,27 +109,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)
- return fw_dtb;
-
- printf("DTB is not passed via 0x%llx\n", (u64)fw_dtb);
-
- /* Try to look at FDT is at end of image */
- fw_dtb = (ulong *)&_end;
-
- if (fdt_magic(fw_dtb) == FDT_MAGIC)
- return fw_dtb;
-
- printf("DTB is also not passed via 0x%llx\n", (u64)fw_dtb);
- return NULL;
-}
-#endif
-
int versal_pm_request(u32 api_id, u32 arg0, u32 arg1, u32 arg2,
u32 arg3, u32 *ret_payload)
{
@@ -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.
@@ -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 %llx\n", (u64)fw_dtb);
+ return NULL;
+ }
+
+ return fw_dtb;
+}
+#endif