[PATCH] arm64: xilinx: Never touch DDR if system has no DDR

[PATCH] arm64: xilinx: Never touch DDR if system has no DDR

[Michal Simek]

If DDR is not mapped do not touch it. Default
XILINX_OF_BOARD_DTB_ADDR is pointing to DDR.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

Depends on https://lists.denx.de/pipermail/u-boot/2020-March/403953.html
---
 board/xilinx/common/board.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index f87e2e91059e..e83c692f2174 100644
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -41,12 +41,16 @@ int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
 #if defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE)
 void *board_fdt_blob_setup(void)
 {
-	static void *fdt_blob = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR;
+	static void *fdt_blob;
+
+#if !defined(CONFIG_VERSAL_NO_DDR) && !defined(CONFIG_ZYNQMP_NO_DDR)
+	fdt_blob = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR;
 
 	if (fdt_magic(fdt_blob) == FDT_MAGIC)
 		return fdt_blob;
 
 	debug("DTB is not passed via %p\n", fdt_blob);
+#endif
 
 #ifdef CONFIG_SPL_BUILD
 	/* FDT is at end of BSS unless it is in a different memory region */
-- 
2.25.1

[PATCH] arm64: xilinx: Never touch DDR if system has no DDR

[Michal Simek]

po 23. 3. 2020 v 15:46 odes?latel Michal Simek <michal.simek@xilinx.com> napsal:
>
> If DDR is not mapped do not touch it. Default
> XILINX_OF_BOARD_DTB_ADDR is pointing to DDR.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---
>
> Depends on https://lists.denx.de/pipermail/u-boot/2020-March/403953.html
> ---
>  board/xilinx/common/board.c | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
> index f87e2e91059e..e83c692f2174 100644
> --- a/board/xilinx/common/board.c
> +++ b/board/xilinx/common/board.c
> @@ -41,12 +41,16 @@ int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
>  #if defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE)
>  void *board_fdt_blob_setup(void)
>  {
> -       static void *fdt_blob = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR;
> +       static void *fdt_blob;
> +
> +#if !defined(CONFIG_VERSAL_NO_DDR) && !defined(CONFIG_ZYNQMP_NO_DDR)
> +       fdt_blob = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR;
>
>         if (fdt_magic(fdt_blob) == FDT_MAGIC)
>                 return fdt_blob;
>
>         debug("DTB is not passed via %p\n", fdt_blob);
> +#endif
>
>  #ifdef CONFIG_SPL_BUILD
>         /* FDT is at end of BSS unless it is in a different memory region */
> --
> 2.25.1
>

Applied.
M

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs