summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2012-12-05 14:46:31 +0000
committerTom Rini <trini@ti.com>2012-12-11 13:17:33 -0700
commit75b3afc66532abcc7256933b3bcac712574bca2d (patch)
tree00f5c641a9ae5d83498e9da5914262ca8544df3d /common
parentff048ea916f74a40c18b5aaa5f357dce1c75bffa (diff)
downloadu-boot-imx-75b3afc66532abcc7256933b3bcac712574bca2d.zip
u-boot-imx-75b3afc66532abcc7256933b3bcac712574bca2d.tar.gz
u-boot-imx-75b3afc66532abcc7256933b3bcac712574bca2d.tar.bz2
Fix use of conditional LMB
This code was not guarded with CONFIG_LMB so failed to build on x86. Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common')
-rw-r--r--common/cmd_bootm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 4dbe952..f7595c0 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -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,