diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 8f8359856162e47b450c0d41cd779c97981c3778..32fd9bb3f3cdcaa2f9eca34f8803418850c7767e 100644
--- a/common/cmd_bootm.c
+++ b/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();
diff --git a/include/image.h b/include/image.h
index 5a424e6a9422c74933494710e1ead02a745a19f1..04b62d154fe2555749c8c13680320d7bd6857458 100644
--- a/include/image.h
+++ b/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 */