From: Michal Simek Date: Mon, 4 Jan 2021 10:07:28 +0000 (+0100) Subject: xilinx: common: Do not touch CONFIG_XILINX_OF_BOARD_DTB_ADDR in SPL X-Git-Url: http://git.dujemihanovic.xyz/%22http:/www.sics.se/static/%7B%7B%20%24style.Permalink%20%7D%7D?a=commitdiff_plain;h=a672b9871b57fa1f1e86faa33360a49e218b9c57;p=u-boot.git xilinx: common: Do not touch CONFIG_XILINX_OF_BOARD_DTB_ADDR in SPL This hook is used in full U-Boot that's why there is no reason to touch this location from SPL. The hook was introduced for QEMU usage but none is really running SPL on QEMU that's why it shouldn't break any usecase. Signed-off-by: Michal Simek --- diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index 9f651db734..df19aeadd0 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -324,7 +324,8 @@ void *board_fdt_blob_setup(void) { void *fdt_blob; - if (!IS_ENABLED(CONFIG_VERSAL_NO_DDR) && + if (!IS_ENABLED(CONFIG_SPL_BUILD) && + !IS_ENABLED(CONFIG_VERSAL_NO_DDR) && !IS_ENABLED(CONFIG_VERSAL_NO_DDR)) { fdt_blob = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR;