diff options
| author | Scott Wood <scottwood@freescale.com> | 2012-12-14 16:03:55 -0600 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2012-12-14 16:03:55 -0600 |
| commit | 88c5c68ffa277bf01b3254cf5a059e2cbe07be97 (patch) | |
| tree | f56b444a1c85d94d6a386df090def099632489fe /common/cmd_bootm.c | |
| parent | 0b38fffbe413fc0725c750d046ca62c23fca196e (diff) | |
| parent | 6e9005bd96ff0f0548a787ffafee10664a57a8e1 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 4dbe952bb0..f7595c0311 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, |