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

Repair build fail in case CONFIG_PPC=n and CONFIG_FIT=y 

Signed-off-by: Remy Bohmer <linux@bohmer.net>
This commit is contained in:
Remy Bohmer 2009-10-29 14:24:22 +01:00 committed by Wolfgang Denk
parent 41dfd8a603
commit b25e38fc36
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/cmd_bootm.c
View File

@ -524,7 +524,7 @@ int do_bootm_subcommand (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
} }
break; break;
#endif #endif
#ifdef CONFIG_OF_LIBFDT #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_SYS_BOOTMAPSZ)
case BOOTM_STATE_FDT: case BOOTM_STATE_FDT:
{ {
ulong bootmap_base = getenv_bootm_low(); ulong bootmap_base = getenv_bootm_low();

2
include/image.h
View File

@ -219,12 +219,10 @@ typedef struct bootm_headers {
const char *fit_uname_rd; /* init ramdisk subimage node unit name */ const char *fit_uname_rd; /* init ramdisk subimage node unit name */
int fit_noffset_rd; /* init ramdisk subimage node offset */ int fit_noffset_rd; /* init ramdisk subimage node offset */
#if defined(CONFIG_PPC)
void *fit_hdr_fdt; /* FDT blob FIT image header */ void *fit_hdr_fdt; /* FDT blob FIT image header */
const char *fit_uname_fdt; /* FDT blob subimage node unit name */ const char *fit_uname_fdt; /* FDT blob subimage node unit name */
int fit_noffset_fdt;/* FDT blob subimage node offset */ int fit_noffset_fdt;/* FDT blob subimage node offset */
#endif #endif
#endif
#ifndef USE_HOSTCC #ifndef USE_HOSTCC
image_info_t os; /* os image info */ image_info_t os; /* os image info */