mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-24 12:44:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

arm64: zynqmp: Add support for OF_SEPARATE with board DTB

Browse Source 
OF_BOARD and OF_SEPARATE can use board specific board_fdt_blob_setup().

OF_BOARD option is mostly used for picking up DTB from certain location.

OF_SEPARATE option is used when DTB is appended after u-boot binary.

This board specific function is aligned with current version in
lib/fdtdec.c with checking CONFIG_XILINX_OF_BOARD_DTB_ADDR address first.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Michal Simek 2019-12-19 17:45:15 +01:00
parent db5b253f01
commit fc274a5932
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/xilinx/Kconfig
View File

@ -44,7 +44,7 @@ config XILINX_OF_BOARD_DTB_ADDR
hex
default 0x1000 if ARCH_VERSAL
default 0x100000 if ARCH_ZYNQ || ARCH_ZYNQMP
depends on OF_BOARD
depends on OF_BOARD || OF_SEPARATE
help
Offset in the memory where the board configuration DTB is placed.

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

@ -5,6 +5,7 @@
*/
#include <common.h>
#include <asm/sections.h>
#include <dm/uclass.h>
#include <i2c.h>
@ -37,16 +38,32 @@ int zynq_board_read_rom_ethaddr(unsigned char *ethaddr)
return ret;
}
#if defined(CONFIG_OF_BOARD)
#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;
if (fdt_magic(fdt_blob) != FDT_MAGIC) {
printf("DTB is not passed via %p\n", fdt_blob);
return NULL;
}
if (fdt_magic(fdt_blob) == FDT_MAGIC)
return fdt_blob;
return fdt_blob;
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 (fdt_magic(fdt_blob) == FDT_MAGIC)
return fdt_blob;
debug("DTB is also not passed via %p\n", fdt_blob);
return NULL;
}
#endif