From b25e38fc36e13fa8037fa4d37fe909d1d6e6f372 Mon Sep 17 00:00:00 2001
From: Remy Bohmer <linux@bohmer.net>
Date: Thu, 29 Oct 2009 14:24:22 +0100
Subject: [PATCH] Repair build fail in case CONFIG_PPC=n and CONFIG_FIT=y
Signed-off-by: Remy Bohmer <linux@bohmer.net>
---
common/cmd_bootm.c | 2 +-
include/image.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 8f835985616..32fd9bb3f3c 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 5a424e6a942..04b62d154fe 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 */
--
GitLab