diff options
author | Simon Glass <sjg@chromium.org> | 2021-12-17 06:59:26 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2021-12-23 18:24:39 +0300 |
commit | d893b8ad095f952829933c79b09345ae0c8ebd6b (patch) | |
tree | 33b98e5fde0c09a388da06f8734af0c158763fd8 | |
parent | b4b6daf38d49c73f670bbf1654b568bca222fa79 (diff) | |
download | u-boot-d893b8ad095f952829933c79b09345ae0c8ebd6b.tar.xz |
fdt: Drop CONFIG_SPL_BUILD check in fdtdec_setup()
Move this to the header file to clean up the C code.
Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r-- | include/fdtdec.h | 14 | ||||
-rw-r--r-- | lib/fdtdec.c | 6 |
2 files changed, 15 insertions, 5 deletions
diff --git a/include/fdtdec.h b/include/fdtdec.h index 6c7ab887b2..68786111a4 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -111,6 +111,20 @@ struct fdt_pci_addr { extern u8 __dtb_dt_begin[]; /* embedded device tree blob */ extern u8 __dtb_dt_spl_begin[]; /* embedded device tree blob for SPL/TPL */ +/* Get a pointer to the embedded devicetree, if there is one, else NULL */ +static inline u8 *dtb_dt_embedded(void) +{ +#ifdef CONFIG_OF_EMBED +# ifdef CONFIG_SPL_BUILD + return __dtb_dt_spl_begin; +# else + return __dtb_dt_begin; +# endif +#else + return NULL; +#endif +} + /** * Compute the size of a resource. * diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 4967ab8707..fbdc92c081 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1629,11 +1629,7 @@ int fdtdec_setup(void) #if CONFIG_IS_ENABLED(OF_CONTROL) # ifdef CONFIG_OF_EMBED /* Get a pointer to the FDT */ -# ifdef CONFIG_SPL_BUILD - gd->fdt_blob = __dtb_dt_spl_begin; -# else - gd->fdt_blob = __dtb_dt_begin; -# endif + gd->fdt_blob = dtb_dt_embedded(); # elif defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE) /* Allow the board to override the fdt address. */ gd->fdt_blob = board_fdt_blob_setup(&ret); |