diff options
| author | Simon Glass <sjg@chromium.org> | 2021-12-16 20:59:31 -0700 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-12-23 10:24:40 -0500 |
| commit | 985503439762c3168aeb80f529bb9bbcd773dd2c (patch) | |
| tree | f3f235f227689bf3c6260a6af3d5a930b6941966 /include/fdtdec.h | |
| parent | ba83d8593bde7aec6055ea5fe200b8db6f1b0810 (diff) | |
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>
Diffstat (limited to 'include/fdtdec.h')
| -rw-r--r-- | include/fdtdec.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/fdtdec.h b/include/fdtdec.h index 68786111a4..68a36f1058 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -1170,10 +1170,13 @@ int fdtdec_resetup(int *rescan); /** * 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 + * @returns new devicetree blob pointer */ void *board_fdt_blob_setup(int *err); |