diff options
| author | Michal Simek | 2021-01-04 11:03:36 +0100 |
|---|---|---|
| committer | Michal Simek | 2021-01-20 08:34:53 +0100 |
| commit | 506009fc1022d5b883e95502e1c5dc38ac1da127 (patch) | |
| tree | 38aff71f011a5b2bd9e37cb98159df5eda24f786 /board/xilinx/common/board.c | |
| parent | 2784befbd7ef21b77ad246ce258f06e4aa711d81 (diff) | |
xilinx: common: Change macro handling in board_fdt_blob_setup()
Remove ifdef logic which is handled by preprocessor and move it link time
optimization to get full compile code coverage.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'board/xilinx/common/board.c')
| -rw-r--r-- | board/xilinx/common/board.c | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index cdc06a39ce5..9f651db734c 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -324,25 +324,29 @@ void *board_fdt_blob_setup(void) { void *fdt_blob; -#if !defined(CONFIG_VERSAL_NO_DDR) && !defined(CONFIG_ZYNQMP_NO_DDR) - fdt_blob = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR; + if (!IS_ENABLED(CONFIG_VERSAL_NO_DDR) && + !IS_ENABLED(CONFIG_VERSAL_NO_DDR)) { + fdt_blob = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR; - if (fdt_magic(fdt_blob) == FDT_MAGIC) - return fdt_blob; + if (fdt_magic(fdt_blob) == FDT_MAGIC) + return fdt_blob; - debug("DTB is not passed via %p\n", fdt_blob); -#endif + debug("DTB is not passed via %p\n", fdt_blob); + } -#ifdef CONFIG_SPL_BUILD - /* FDT is at end of BSS unless it is in a different memory region */ - if (IS_ENABLED(CONFIG_SPL_SEPARATE_BSS)) - fdt_blob = (ulong *)&_image_binary_end; - else - fdt_blob = (ulong *)&__bss_end; -#else - /* FDT is at end of image */ - fdt_blob = (ulong *)&_end; -#endif + if (IS_ENABLED(CONFIG_SPL_BUILD)) { + /* + * FDT is at end of BSS unless it is in a different memory + * region + */ + if (IS_ENABLED(CONFIG_SPL_SEPARATE_BSS)) + fdt_blob = (ulong *)&_image_binary_end; + else + fdt_blob = (ulong *)&__bss_end; + } else { + /* FDT is at end of image */ + fdt_blob = (ulong *)&_end; + } if (fdt_magic(fdt_blob) == FDT_MAGIC) return fdt_blob; |