dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-11-01 02:45:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

image: Reduce variable scope in boot_get_ramdisk()

Browse Source 
Move the variables declarations to where they are needed, to reduce the
number of #ifdefs needed.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass
2021-09-25 19:43:36 -06:00
committed by Tom Rini
parent 1df654a6af
commit 78f88790e3
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
common/image-board.c
View File

@@ -337,18 +337,8 @@ int genimg_has_config(bootm_headers_t *images)
int boot_get_ramdisk(int argc, char *const argv[], bootm_headers_t *images, int boot_get_ramdisk(int argc, char *const argv[], bootm_headers_t *images,
u8 arch, ulong *rd_start, ulong *rd_end) u8 arch, ulong *rd_start, ulong *rd_end)
{ {
ulong rd_addr, rd_load;
ulong rd_data, rd_len; ulong rd_data, rd_len;
#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
const image_header_t *rd_hdr;
#endif
void *buf; void *buf;
#if CONFIG_IS_ENABLED(FIT)
const char *fit_uname_config = images->fit_uname_cfg;
const char *fit_uname_ramdisk = NULL;
ulong default_addr;
int rd_noffset;
#endif
const char *select = NULL; const char *select = NULL;
*rd_start = 0; *rd_start = 0;
@@ -373,8 +363,15 @@ int boot_get_ramdisk(int argc, char *const argv[], bootm_headers_t *images,
rd_len = 0; rd_len = 0;
rd_data = 0; rd_data = 0;
} else if (select || genimg_has_config(images)) { } else if (select || genimg_has_config(images)) {
ulong rd_addr, rd_load;
#if CONFIG_IS_ENABLED(FIT) #if CONFIG_IS_ENABLED(FIT)
const char *fit_uname_config = images->fit_uname_cfg;
const char *fit_uname_ramdisk = NULL;
int rd_noffset;
if (select) { if (select) {
ulong default_addr;
/* /*
* If the init ramdisk comes from the FIT image and * If the init ramdisk comes from the FIT image and
* the FIT image address is omitted in the command * the FIT image address is omitted in the command
@@ -427,7 +424,9 @@ int boot_get_ramdisk(int argc, char *const argv[], bootm_headers_t *images,
buf = map_sysmem(rd_addr, 0); buf = map_sysmem(rd_addr, 0);
switch (genimg_get_format(buf)) { switch (genimg_get_format(buf)) {
#if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT) #if CONFIG_IS_ENABLED(LEGACY_IMAGE_FORMAT)
case IMAGE_FORMAT_LEGACY: case IMAGE_FORMAT_LEGACY: {
const image_header_t *rd_hdr;
printf("## Loading init Ramdisk from Legacy Image at %08lx ...\n", printf("## Loading init Ramdisk from Legacy Image at %08lx ...\n",
rd_addr); rd_addr);
@@ -442,6 +441,7 @@ int boot_get_ramdisk(int argc, char *const argv[], bootm_headers_t *images,
rd_len = image_get_data_size(rd_hdr); rd_len = image_get_data_size(rd_hdr);
rd_load = image_get_load(rd_hdr); rd_load = image_get_load(rd_hdr);
break; break;
}
#endif #endif
#if CONFIG_IS_ENABLED(FIT) #if CONFIG_IS_ENABLED(FIT)
case IMAGE_FORMAT_FIT: case IMAGE_FORMAT_FIT: