Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-26 15:28:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fdt: Drop #ifdefs with MULTI_DTB_FIT

Browse source 
Refactor the code to drop the #ifdefs for this feature.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2021-12-16 20:59:25 -07:00 • committed by Tom Rini
parent 3f51f78cbd
commit b4b6daf38d
3 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dts/Kconfig
View file

@ -177,7 +177,6 @@ endchoice
config MULTI_DTB_FIT_UNCOMPRESS_SZ config MULTI_DTB_FIT_UNCOMPRESS_SZ
hex "Size of memory reserved to uncompress the DTBs" hex "Size of memory reserved to uncompress the DTBs"
depends on (MULTI_DTB_FIT_GZIP || MULTI_DTB_FIT_LZO)
default 0x8000 default 0x8000
help help
This is the size of this area where the DTBs are uncompressed. This is the size of this area where the DTBs are uncompressed.

8
include/asm-generic/global_data.h
View file

@ -512,6 +512,14 @@ static_assert(sizeof(struct global_data) == GD_SIZE);
#define gd_acpi_ctx() NULL #define gd_acpi_ctx() NULL
#endif #endif
#if CONFIG_IS_ENABLED(MULTI_DTB_FIT)
#define gd_multi_dtb_fit() gd->multi_dtb_fit
#define gd_set_multi_dtb_fit(_dtb) gd->multi_dtb_fit = _dtb
#else
#define gd_multi_dtb_fit() NULL
#define gd_set_multi_dtb_fit(_dtb)
#endif
/** /**
* enum gd_flags - global data flags * enum gd_flags - global data flags
* *

25
lib/fdtdec.c
View file

@ -1146,11 +1146,10 @@ int fdtdec_setup_mem_size_base_lowest(void)
return 0; return 0;
} }
#if CONFIG_IS_ENABLED(MULTI_DTB_FIT)
# if CONFIG_IS_ENABLED(MULTI_DTB_FIT_GZIP) ||\
CONFIG_IS_ENABLED(MULTI_DTB_FIT_LZO)
static int uncompress_blob(const void *src, ulong sz_src, void **dstp) static int uncompress_blob(const void *src, ulong sz_src, void **dstp)
{ {
#if CONFIG_IS_ENABLED(MULTI_DTB_FIT_GZIP) ||\
CONFIG_IS_ENABLED(MULTI_DTB_FIT_LZO)
size_t sz_out = CONFIG_VAL(MULTI_DTB_FIT_UNCOMPRESS_SZ); size_t sz_out = CONFIG_VAL(MULTI_DTB_FIT_UNCOMPRESS_SZ);
bool gzip = 0, lzo = 0; bool gzip = 0, lzo = 0;
ulong sz_in = sz_src; ulong sz_in = sz_src;
@ -1197,16 +1196,12 @@ static int uncompress_blob(const void *src, ulong sz_src, void **dstp)
return -EBADMSG; return -EBADMSG;
} }
*dstp = dst; *dstp = dst;
return 0; #else
}
# else
static int uncompress_blob(const void *src, ulong sz_src, void **dstp)
{
*dstp = (void *)src; *dstp = (void *)src;
*dstp = (void *)src;
#endif
return 0; return 0;
} }
# endif
#endif
#if defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE) #if defined(CONFIG_OF_BOARD) || defined(CONFIG_OF_SEPARATE)
/* /*
@ -1606,7 +1601,6 @@ __weak int fdtdec_board_setup(const void *fdt_blob)
*/ */
static void setup_multi_dtb_fit(void) static void setup_multi_dtb_fit(void)
{ {
# if CONFIG_IS_ENABLED(MULTI_DTB_FIT)
void *blob; void *blob;
/* /*
@ -1624,10 +1618,9 @@ static void setup_multi_dtb_fit(void)
*/ */
blob = locate_dtb_in_fit(gd->fdt_blob); blob = locate_dtb_in_fit(gd->fdt_blob);
if (blob) { if (blob) {
gd->multi_dtb_fit = gd->fdt_blob; gd_set_multi_dtb_fit(gd->fdt_blob);
gd->fdt_blob = blob; gd->fdt_blob = blob;
} }
#endif /* # MULTI_DTB_FIT */
} }
int fdtdec_setup(void) int fdtdec_setup(void)
@ -1664,7 +1657,6 @@ int fdtdec_setup(void)
return ret; return ret;
} }
#if CONFIG_IS_ENABLED(MULTI_DTB_FIT)
int fdtdec_resetup(int *rescan) int fdtdec_resetup(int *rescan)
{ {
void *fdt_blob; void *fdt_blob;
@ -1675,8 +1667,8 @@ int fdtdec_resetup(int *rescan)
* FIT image stillpresent there. Save the time and space * FIT image stillpresent there. Save the time and space
* required to uncompress it again. * required to uncompress it again.
*/ */
if (gd->multi_dtb_fit) { if (gd_multi_dtb_fit()) {
fdt_blob = locate_dtb_in_fit(gd->multi_dtb_fit); fdt_blob = locate_dtb_in_fit(gd_multi_dtb_fit());
if (fdt_blob == gd->fdt_blob) { if (fdt_blob == gd->fdt_blob) {
/* /*
@ -1700,7 +1692,6 @@ int fdtdec_resetup(int *rescan)
*rescan = 0; *rescan = 0;
return 0; return 0;
} }
#endif
int fdtdec_decode_ram_size(const void *blob, const char *area, int board_id, int fdtdec_decode_ram_size(const void *blob, const char *area, int board_id,
phys_addr_t *basep, phys_size_t *sizep, phys_addr_t *basep, phys_size_t *sizep,