Selaa lähdekoodia

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

Signed-off-by: Remy Bohmer <linux@bohmer.net>
Remy Bohmer 15 vuotta sitten
vanhempi
commit
b25e38fc36
2 muutettua tiedostoa jossa 1 lisäystä ja 3 poistoa
  1. 1 1
      common/cmd_bootm.c
  2. 0 2
      include/image.h

+ 1 - 1
common/cmd_bootm.c

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

+ 0 - 2
include/image.h

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