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

fdt: Don't call board_fdt_blob_setup() without OF_BOARD 

At present this override function is called even when OF_BOARD is not
enabled. This makes it impossible to disable this feature and in fact
makes the OF_BOARD option useless.

Reinstate its intended purpose, so that it is possible to switch between
the appended devicetree and one provided by the board's custom function.

A follower patch adds warnings for this scenario, but for now we don't
have a Kconfig that definitively tells us that OF_BOARD should be used.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-12-16 20:59:31 -07:00 committed by Tom Rini
parent ba83d8593b
commit 9855034397
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/fdtdec.h
View File

@ -1170,10 +1170,13 @@ int fdtdec_resetup(int *rescan);
/** /**
* Board-specific FDT initialization. Returns the address to a device tree blob. * Board-specific FDT initialization. Returns the address to a device tree blob.
* Called when CONFIG_OF_BOARD is defined, or if CONFIG_OF_SEPARATE is defined *
* and the board implements it. * Called when CONFIG_OF_BOARD is defined.
*
* The existing devicetree is available at gd->fdt_blob
* *
* @err internal error code if we fail to setup a DTB * @err internal error code if we fail to setup a DTB
* @returns new devicetree blob pointer
*/ */
void *board_fdt_blob_setup(int *err); void *board_fdt_blob_setup(int *err);

21
lib/fdtdec.c
View File

@ -1203,15 +1203,15 @@ static int uncompress_blob(const void *src, ulong sz_src, void **dstp)
return 0; return 0;
} }
/* /**
* For CONFIG_OF_SEPARATE, the board may optionally implement this to * fdt_find_separate() - Find a devicetree at the end of the image
* provide and/or fixup the fdt. *
* @return pointer to FDT blob
*/ */
__weak void *board_fdt_blob_setup(int *err) static void *fdt_find_separate(void)
{ {
void *fdt_blob = NULL; void *fdt_blob = NULL;
*err = 0;
#ifdef CONFIG_SPL_BUILD #ifdef 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))
@ -1626,13 +1626,16 @@ int fdtdec_setup(void)
int ret; int ret;
/* The devicetree is typically appended to U-Boot */ /* The devicetree is typically appended to U-Boot */
if (IS_ENABLED(CONFIG_OF_SEPARATE) || IS_ENABLED(CONFIG_OF_BOARD)) { if (IS_ENABLED(CONFIG_OF_SEPARATE))
/* Allow the board to override the fdt address. */ gd->fdt_blob = fdt_find_separate();
else /* embed dtb in ELF file for testing / development */
gd->fdt_blob = dtb_dt_embedded();
/* Allow the board to override the fdt address. */
if (IS_ENABLED(CONFIG_OF_BOARD)) {
gd->fdt_blob = board_fdt_blob_setup(&ret); gd->fdt_blob = board_fdt_blob_setup(&ret);
if (ret) if (ret)
return ret; return ret;
} else { /* embed dtb in ELF file for testing / development */
gd->fdt_blob = dtb_dt_embedded();
} }
if (!IS_ENABLED(CONFIG_SPL_BUILD)) { if (!IS_ENABLED(CONFIG_SPL_BUILD)) {