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

fdtdec: make CONFIG_OF_PRIOR_STAGE available in SPL

Browse Source 
The current preprocessor logic prevents CONFIG_OF_PRIOR_STAGE from being
used in U-Boot SPL. Change the logic to also make it available in U-Boot
SPL.

Signed-off-by: Lukas Auer <lukas.auer@aisec.fraunhofer.de>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Anup Patel <anup.patel@wdc.com>
This commit is contained in:
Lukas Auer 2019-08-21 21:14:40 +02:00 committed by Andes
parent 50b4b80f59
commit c4f603f723
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/fdtdec.h
View File

@ -54,7 +54,7 @@ struct bd_info;
#define SPL_BUILD 0 #define SPL_BUILD 0
#endif #endif
#if CONFIG_IS_ENABLED(OF_PRIOR_STAGE) #ifdef CONFIG_OF_PRIOR_STAGE
extern phys_addr_t prior_stage_fdt_address; extern phys_addr_t prior_stage_fdt_address;
#endif #endif

6
lib/fdtdec.c
View File

@ -1535,16 +1535,14 @@ int fdtdec_setup(void)
puts("Failed to read control FDT\n"); puts("Failed to read control FDT\n");
return -1; return -1;
} }
# elif defined(CONFIG_OF_PRIOR_STAGE)
gd->fdt_blob = (void *)prior_stage_fdt_address;
# endif # endif
# ifndef CONFIG_SPL_BUILD # ifndef CONFIG_SPL_BUILD
/* Allow the early environment to override the fdt address */ /* Allow the early environment to override the fdt address */
# if CONFIG_IS_ENABLED(OF_PRIOR_STAGE)
gd->fdt_blob = (void *)prior_stage_fdt_address;
# else
gd->fdt_blob = map_sysmem gd->fdt_blob = map_sysmem
(env_get_ulong("fdtcontroladdr", 16, (env_get_ulong("fdtcontroladdr", 16,
(unsigned long)map_to_sysmem(gd->fdt_blob)), 0); (unsigned long)map_to_sysmem(gd->fdt_blob)), 0);
# endif
# endif # endif
# if CONFIG_IS_ENABLED(MULTI_DTB_FIT) # if CONFIG_IS_ENABLED(MULTI_DTB_FIT)