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

image: Remove some #ifdefs from image-fit and image-fit-sig

Browse Source 
Drop the #ifdefs which are easy to remove without refactoring.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2021-09-25 19:43:39 -06:00
committed by Tom Rini
parent f33a2c1bd0
commit b53541f7f6
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/Kconfig.boot
View File

@@ -165,6 +165,16 @@ config SPL_FIT_SIGNATURE
select SPL_IMAGE_SIGN_INFO select SPL_IMAGE_SIGN_INFO
select SPL_FIT_FULL_CHECK select SPL_FIT_FULL_CHECK
config SPL_FIT_SIGNATURE_MAX_SIZE
hex "Max size of signed FIT structures in SPL"
depends on SPL_FIT_SIGNATURE
default 0x10000000
help
This option sets a max size in bytes for verified FIT uImages.
A sane value of 256MB protects corrupted DTB structures from overlapping
device memory. Assure this size does not extend past expected storage
space.
config SPL_LOAD_FIT config SPL_LOAD_FIT
bool "Enable SPL loading U-Boot as a FIT (basic fitImage features)" bool "Enable SPL loading U-Boot as a FIT (basic fitImage features)"
select SPL_FIT select SPL_FIT

8
common/image-fit-sig.c
View File

@@ -49,10 +49,8 @@ struct image_region *fit_region_make_list(const void *fit,
* Use malloc() except in SPL (to save code size). In SPL the caller * Use malloc() except in SPL (to save code size). In SPL the caller
* must allocate the array. * must allocate the array.
*/ */
#ifndef CONFIG_SPL_BUILD if (!IS_ENABLED(CONFIG_SPL_BUILD) && !region)
if (!region)
region = calloc(sizeof(*region), count); region = calloc(sizeof(*region), count);
#endif
if (!region) if (!region)
return NULL; return NULL;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
@@ -72,12 +70,10 @@ static int fit_image_setup_verify(struct image_sign_info *info,
char *algo_name; char *algo_name;
const char *padding_name; const char *padding_name;
#ifndef USE_HOSTCC if (fdt_totalsize(fit) > CONFIG_VAL(FIT_SIGNATURE_MAX_SIZE)) {
if (fdt_totalsize(fit) > CONFIG_FIT_SIGNATURE_MAX_SIZE) {
*err_msgp = "Total size too large"; *err_msgp = "Total size too large";
return 1; return 1;
} }
#endif
if (fit_image_hash_get_algo(fit, noffset, &algo_name)) { if (fit_image_hash_get_algo(fit, noffset, &algo_name)) {
*err_msgp = "Can't get hash algo property"; *err_msgp = "Can't get hash algo property";
return -1; return -1;

7
common/image-fit.c
View File

@@ -2009,9 +2009,6 @@ int fit_image_load(bootm_headers_t *images, ulong addr,
int type_ok, os_ok; int type_ok, os_ok;
ulong load, load_end, data, len; ulong load, load_end, data, len;
uint8_t os, comp; uint8_t os, comp;
#ifndef USE_HOSTCC
uint8_t os_arch;
#endif
const char *prop_name; const char *prop_name;
int ret; int ret;
@@ -2103,8 +2100,12 @@ int fit_image_load(bootm_headers_t *images, ulong addr,
} }
#ifndef USE_HOSTCC #ifndef USE_HOSTCC
{
uint8_t os_arch;
fit_image_get_arch(fit, noffset, &os_arch); fit_image_get_arch(fit, noffset, &os_arch);
images->os.arch = os_arch; images->os.arch = os_arch;
}
#endif #endif
bootstage_mark(bootstage_id + BOOTSTAGE_SUB_CHECK_ALL); bootstage_mark(bootstage_id + BOOTSTAGE_SUB_CHECK_ALL);