[U-Boot] [PATCH] Repair build failure in case PPC is not defined and FIT is beng used.

Remy Bohmer linux at bohmer.net
Wed Oct 28 22:13:41 CET 2009


Signed-off-by: Remy Bohmer <linux at bohmer.net>
---
 common/cmd_bootm.c |    2 +-
 common/image.c     |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 8f83598..32fd9bb 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/common/image.c b/common/image.c
index 6eaf41e..41b584d 100644
--- a/common/image.c
+++ b/common/image.c
@@ -1506,9 +1506,11 @@ int boot_get_fdt (int flag, int argc, char *argv[], bootm_headers_t *images,
 					fdt_blob = (char *)data;
 				}
 
+#if defined(CONFIG_PPC)
 				images->fit_hdr_fdt = fit_hdr;
 				images->fit_uname_fdt = fit_uname_fdt;
 				images->fit_noffset_fdt = fdt_noffset;
+#endif
 				break;
 			} else
 #endif
-- 
1.6.0.4



More information about the U-Boot mailing list