[PATCH] xilinx: common: Fix CONFIG_XILINX_OF_BOARD_DTB_ADDR handling for ZynqMP

[Michal Simek]

út 2. 2. 2021 v 13:40 odesílatel Michal Simek <michal.simek at xilinx.com> napsal:
>
> Fix bug introduced by commit listed below. It is for cases where Versal or
> ZynqMP don't have DDR mapped. Later SPL was also excluded by
> commit a672b9871b57 ("xilinx: common: Do not touch
> CONFIG_XILINX_OF_BOARD_DTB_ADDR in SPL").
>
> Fixes: 506009fc1022 ("xilinx: common: Change macro handling in board_fdt_blob_setup()")
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
>  board/xilinx/common/board.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
> index 4df10bf18941..a2f2fde64b65 100644
> --- a/board/xilinx/common/board.c
> +++ b/board/xilinx/common/board.c
> @@ -326,7 +326,7 @@ void *board_fdt_blob_setup(void)
>
>         if (!IS_ENABLED(CONFIG_SPL_BUILD) &&
>             !IS_ENABLED(CONFIG_VERSAL_NO_DDR) &&
> -           !IS_ENABLED(CONFIG_VERSAL_NO_DDR)) {
> +           !IS_ENABLED(CONFIG_ZYNQMP_NO_DDR)) {
>                 fdt_blob = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR;
>
>                 if (fdt_magic(fdt_blob) == FDT_MAGIC)
> --
> 2.30.0
>

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