diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-11 23:54:37 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2006-10-11 23:54:37 +0200 |
| commit | 7e2a24dca9a3213f0b4941562e4387e20bec3e2d (patch) | |
| tree | d04e0a5852637f365621cea6691c78d3d5e55d3d /common/cmd_bootm.c | |
| parent | fb883a521e04437acfe989de3e152b2e4866856b (diff) | |
| parent | 7376eb87aaa601f728f9b8e5e9cd2711a67f529e (diff) | |
| download | u-boot-7e2a24dca9a3213f0b4941562e4387e20bec3e2d.tar.gz u-boot-7e2a24dca9a3213f0b4941562e4387e20bec3e2d.tar.xz u-boot-7e2a24dca9a3213f0b4941562e4387e20bec3e2d.zip | |
Merge with http://opensource.freescale.com/pub/scm/u-boot-85xx.git#for_wd
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index bc84ae3da9..d913f5cb2d 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -510,7 +510,7 @@ fixup_silent_linux () #endif /* CONFIG_SILENT_CONSOLE */ #ifdef CONFIG_PPC -static void +static void __attribute__((noinline)) do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], ulong addr, @@ -625,7 +625,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, /* Look for a '-' which indicates to ignore the ramdisk argument */ if (argc >= 3 && strcmp(argv[2], "-") == 0) { debug ("Skipping initrd\n"); - data = 0; + len = data = 0; } else #endif @@ -900,8 +900,6 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end); #else - ft_setup(of_flat_tree, kbd, initrd_start, initrd_end); - /* ft_dump_blob(of_flat_tree); */ #if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500) unlock_ram_in_cache(); @@ -917,9 +915,12 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, if (getenv("disable_of") != NULL) (*kernel) ((bd_t *)of_flat_tree, initrd_start, initrd_end, cmd_start, cmd_end); - else + else { + ft_setup(of_flat_tree, kbd, initrd_start, initrd_end); + /* ft_dump_blob(of_flat_tree); */ (*kernel) ((bd_t *)of_flat_tree, (ulong)kernel, 0, 0, 0); - + } + #endif } #endif /* CONFIG_PPC */ |