diff mbox series

[U-Boot,2/5] arm64: xilinx: Enable generic of_board_dtb

Message ID 747b5150ded3169619ae76b62d61eeae14c2d6e7.1570098813.git.michal.simek@xilinx.com
State Deferred
Headers show
Series xilinx: Introduce Zynq/ZynqMP virtual defconfig | expand

Commit Message

Michal Simek Oct. 3, 2019, 10:33 a.m. UTC 
From: Ibai Erkiaga <ibai.erkiaga-elorza@xilinx.com>

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>
---

 board/xilinx/Kconfig        | 5 +++--
 board/xilinx/common/board.c | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/board/xilinx/Kconfig b/board/xilinx/Kconfig
index 4f290339a094..cb272eafda7a 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 3d95609ba757..0d796e21df6f 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 %llx\n", (u64)fw_dtb);