leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xilinx: common: Change macro handling in board_fdt_blob_setup()

Browse Source 
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>
This commit is contained in:
Michal Simek 2021-01-04 11:03:36 +01:00
parent 2784befbd7
commit 506009fc10
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
board/xilinx/common/board.c
View File

@ -324,25 +324,29 @@ void *board_fdt_blob_setup(void)
{ {
void *fdt_blob; void *fdt_blob;
#if !defined(CONFIG_VERSAL_NO_DDR) && !defined(CONFIG_ZYNQMP_NO_DDR) if (!IS_ENABLED(CONFIG_VERSAL_NO_DDR) &&
!IS_ENABLED(CONFIG_VERSAL_NO_DDR)) {
fdt_blob = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR; fdt_blob = (void *)CONFIG_XILINX_OF_BOARD_DTB_ADDR;
if (fdt_magic(fdt_blob) == FDT_MAGIC) if (fdt_magic(fdt_blob) == FDT_MAGIC)
return fdt_blob; return fdt_blob;
debug("DTB is not passed via %p\n", fdt_blob); debug("DTB is not passed via %p\n", fdt_blob);
#endif }
#ifdef CONFIG_SPL_BUILD if (IS_ENABLED(CONFIG_SPL_BUILD)) {
/* FDT is at end of BSS unless it is in a different memory region */ /*
* FDT is at end of BSS unless it is in a different memory
* region
*/
if (IS_ENABLED(CONFIG_SPL_SEPARATE_BSS)) if (IS_ENABLED(CONFIG_SPL_SEPARATE_BSS))
fdt_blob = (ulong *)&_image_binary_end; fdt_blob = (ulong *)&_image_binary_end;
else else
fdt_blob = (ulong *)&__bss_end; fdt_blob = (ulong *)&__bss_end;
#else } else {
/* FDT is at end of image */ /* FDT is at end of image */
fdt_blob = (ulong *)&_end; fdt_blob = (ulong *)&_end;
#endif }
if (fdt_magic(fdt_blob) == FDT_MAGIC) if (fdt_magic(fdt_blob) == FDT_MAGIC)
return fdt_blob; return fdt_blob;