diff options
| author | John Rigby <john.rigby@linaro.org> | 2010-10-13 13:57:34 -0600 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-10-18 22:52:10 +0200 |
| commit | 5a75e121075a63f312ae07409477b6f686840a93 (patch) | |
| tree | ed3bf92da428f7cec1cdc1a5689deae6d38ce7ae /common/cmd_bootm.c | |
| parent | a6bd9e83abc811d5cade88cb5e7caf93b4f7abe1 (diff) | |
| download | u-boot-imx-5a75e121075a63f312ae07409477b6f686840a93.zip u-boot-imx-5a75e121075a63f312ae07409477b6f686840a93.tar.gz u-boot-imx-5a75e121075a63f312ae07409477b6f686840a93.tar.bz2 | |
FDT: only call boot_get_fdt from generic code
All arches except nios2 and microblaze call boot_get_fdt
from bootm_start in common/cmd_bootm.c.
Having nios2 and microblaze do so as well removes code from
their respective do_bootm_linux routines and allows removal of
a nasty ifdef from bootm_start.
In the case where boot_get_fdt returns an error bootm_start
returns and the platform specific do_bootm_linux routines
will never get called.
Also only check argv[3] for an fdt addr if argc > 3 first.
This is already the case for nios2.
Signed-off-by: John Rigby <john.rigby@linaro.org>
CC: Scott McNutt <smcnutt@psyent.com>
CC: Michal Simek <monstr@monstr.eu>
CC: Thomas Chou <thomas@wytron.com.tw>
Acked-by: Wolfgang Denk <wd@denx.de>
Acked-by: Michal Simek <monstr@monstr.eu>
Tested-by: Thomas Chou <thomas@wytron.com.tw>
Diffstat (limited to 'common/cmd_bootm.c')
| -rw-r--r-- | common/cmd_bootm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index db59e6f..25bc39c 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -308,7 +308,6 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] } #if defined(CONFIG_OF_LIBFDT) -#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SPARC) /* find flattened device tree */ ret = boot_get_fdt (flag, argc, argv, &images, &images.ft_addr, &images.ft_len); @@ -319,7 +318,6 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[] set_working_fdt_addr(images.ft_addr); #endif -#endif } images.os.start = (ulong)os_hdr; |