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

image: Drop one #ifdef for FIT

Browse Source 
Drop the #ifdef from near the end of select_ramdisk(). Move some variables
to the top of the function to make this work.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2022-08-28 12:32:49 -06:00
committed by Tom Rini
parent 0f81af4897
commit f7659f69f7
1 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
boot/image-board.c
View File

@@ -322,14 +322,16 @@ int genimg_has_config(bootm_headers_t *images)
static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch, static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch,
ulong *rd_datap, ulong *rd_lenp) ulong *rd_datap, ulong *rd_lenp)
{ {
const char *fit_uname_config;
const char *fit_uname_ramdisk;
bool done = false; bool done = false;
int rd_noffset;
ulong rd_addr; ulong rd_addr;
char *buf; char *buf;
#if CONFIG_IS_ENABLED(FIT) #if CONFIG_IS_ENABLED(FIT)
const char *fit_uname_config = images->fit_uname_cfg; fit_uname_config = images->fit_uname_cfg;
const char *fit_uname_ramdisk = NULL; fit_uname_ramdisk = NULL;
int rd_noffset;
if (select) { if (select) {
ulong default_addr; ulong default_addr;
@@ -403,24 +405,23 @@ static int select_ramdisk(bootm_headers_t *images, const char *select, u8 arch,
done = true; done = true;
} }
break; break;
#if CONFIG_IS_ENABLED(FIT)
case IMAGE_FORMAT_FIT: case IMAGE_FORMAT_FIT:
rd_noffset = fit_image_load(images, if (CONFIG_IS_ENABLED(FIT)) {
rd_addr, &fit_uname_ramdisk, rd_noffset = fit_image_load(images, rd_addr,
&fit_uname_config, arch, &fit_uname_ramdisk, &fit_uname_config,
IH_TYPE_RAMDISK, arch, IH_TYPE_RAMDISK,
BOOTSTAGE_ID_FIT_RD_START, BOOTSTAGE_ID_FIT_RD_START,
FIT_LOAD_OPTIONAL_NON_ZERO, FIT_LOAD_OPTIONAL_NON_ZERO,
rd_datap, rd_lenp); rd_datap, rd_lenp);
if (rd_noffset < 0) if (rd_noffset < 0)
return rd_noffset; return rd_noffset;
images->fit_hdr_rd = map_sysmem(rd_addr, 0); images->fit_hdr_rd = map_sysmem(rd_addr, 0);
images->fit_uname_rd = fit_uname_ramdisk; images->fit_uname_rd = fit_uname_ramdisk;
images->fit_noffset_rd = rd_noffset; images->fit_noffset_rd = rd_noffset;
done = true; done = true;
}
break; break;
#endif
case IMAGE_FORMAT_ANDROID: case IMAGE_FORMAT_ANDROID:
if (IS_ENABLED(CONFIG_ANDROID_BOOT_IMAGE)) { if (IS_ENABLED(CONFIG_ANDROID_BOOT_IMAGE)) {
void *ptr = map_sysmem(images->os.start, 0); void *ptr = map_sysmem(images->os.start, 0);