FDT: only call boot_get_fdt from generic code
authorJohn Rigby <john.rigby@linaro.org>
Wed, 13 Oct 2010 19:57:34 +0000 (13:57 -0600)
committerWolfgang Denk <wd@denx.de>
Mon, 18 Oct 2010 20:52:10 +0000 (22:52 +0200)
commit5a75e121075a63f312ae07409477b6f686840a93
treeed3bf92da428f7cec1cdc1a5689deae6d38ce7ae
parenta6bd9e83abc811d5cade88cb5e7caf93b4f7abe1
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>
arch/microblaze/lib/bootm.c
arch/nios2/lib/bootm.c
common/cmd_bootm.c