]> git.karo-electronics.de Git - karo-tx-uboot.git/commitdiff
Fix use of conditional LMB
authorSimon Glass <sjg@chromium.org>
Wed, 5 Dec 2012 14:46:31 +0000 (14:46 +0000)
committerTom Rini <trini@ti.com>
Tue, 11 Dec 2012 20:17:33 +0000 (13:17 -0700)
This code was not guarded with CONFIG_LMB so failed to build on x86.

Signed-off-by: Simon Glass <sjg@chromium.org>
common/cmd_bootm.c

index 4dbe952bb0f56b92f40b0a67dd594f83d987e804..f7595c0311955b58acffa6efd2b19a209576ec48 100644 (file)
@@ -537,7 +537,7 @@ static int do_bootm_subcommand(cmd_tbl_t *cmdtp, int flag, int argc,
                }
                        break;
 #endif
-#if defined(CONFIG_OF_LIBFDT)
+#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_LMB)
                case BOOTM_STATE_FDT:
                {
                        boot_fdt_add_mem_rsv_regions(&images.lmb,