diff options
| author | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-11-30 10:43:04 +0100 |
|---|---|---|
| committer | Michael Brandt <Michael.Brandt@stericsson.com> | 2009-11-30 10:43:04 +0100 |
| commit | 4f47f2f1c8c46ac87c4e0a5708f950fdb59a2a17 (patch) | |
| tree | 593eeada2af1ddf0368e7e546a8d8d8ed5f3f027 /common | |
| parent | b926de66e515762d2ccbc6b79185305b88e46218 (diff) | |
| parent | 824d82997fbcf28e49081d36fdd5d3be1b92b03d (diff) | |
Merge branch 'master' of http://git.denx.de/u-boot
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bootm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 8f8359856..401bf27d1 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -129,7 +129,7 @@ int do_bootelf (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); static boot_os_fn do_bootm_integrity; #endif -boot_os_fn * boot_os[] = { +static boot_os_fn *boot_os[] = { #ifdef CONFIG_BOOTM_LINUX [IH_OS_LINUX] = do_bootm_linux, #endif @@ -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(); |