Signed-off-by: Remy Bohmer linux@bohmer.net --- common/cmd_bootm.c | 2 +- include/image.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-)

Index: u-boot-git-28102009/common/cmd_bootm.c =================================================================== --- u-boot-git-28102009.orig/common/cmd_bootm.c 2009-10-29 12:00:33.000000000 +0100 +++ u-boot-git-28102009/common/cmd_bootm.c 2009-10-29 12:00:34.000000000 +0100 @@ -525,7 +525,7 @@ int do_bootm_subcommand (cmd_tbl_t *cmdt } 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(); Index: u-boot-git-28102009/include/image.h =================================================================== --- u-boot-git-28102009.orig/include/image.h 2009-10-29 14:09:38.000000000 +0100 +++ u-boot-git-28102009/include/image.h 2009-10-29 14:09:52.000000000 +0100 @@ -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 */