random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

fdt: Drop OF_CONTROL check in fdtdec_setup()

Browse Source 
This function should only be called when OF_CONTROL is enabled. It
fails in fdtdec_prepare_fdt() anyway, since gd->fdt_blob stays as NULL
if OF_CONTROL is not enabled.

Drop this useless check.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-12-16 20:59:29 -07:00 committed by Tom Rini
parent 931511d089
commit b5199380fc
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/fdtdec.c
View File

@ -1624,16 +1624,15 @@ static void setup_multi_dtb_fit(void)
int fdtdec_setup(void) int fdtdec_setup(void)
{ {
int ret; int ret;
#if CONFIG_IS_ENABLED(OF_CONTROL) #ifdef CONFIG_OF_EMBED
# ifdef CONFIG_OF_EMBED
/* Get a pointer to the FDT */ /* Get a pointer to the FDT */
gd->fdt_blob = dtb_dt_embedded(); gd->fdt_blob = dtb_dt_embedded();
# elif defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE) #elif defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE)
/* Allow the board to override the fdt address. */ /* Allow the board to override the fdt address. */
gd->fdt_blob = board_fdt_blob_setup(&ret); gd->fdt_blob = board_fdt_blob_setup(&ret);
if (ret) if (ret)
return ret; return ret;
# endif #endif
if (!IS_ENABLED(CONFIG_SPL_BUILD)) { if (!IS_ENABLED(CONFIG_SPL_BUILD)) {
/* Allow the early environment to override the fdt address */ /* Allow the early environment to override the fdt address */
gd->fdt_blob = map_sysmem(env_get_ulong("fdtcontroladdr", 16, gd->fdt_blob = map_sysmem(env_get_ulong("fdtcontroladdr", 16,
@ -1642,7 +1641,6 @@ int fdtdec_setup(void)
if (CONFIG_IS_ENABLED(MULTI_DTB_FIT)) if (CONFIG_IS_ENABLED(MULTI_DTB_FIT))
setup_multi_dtb_fit(); setup_multi_dtb_fit();
#endif
ret = fdtdec_prepare_fdt(); ret = fdtdec_prepare_fdt();
if (!ret) if (!ret)