From: Wolfgang Denk Date: Mon, 18 Oct 2010 22:52:25 +0200 Subject: [U-Boot] [PATCH v3 4/7] FDT: only call boot_get_fdt from generic code In-Reply-To: <1286999857-13790-5-git-send-email-john.rigby@linaro.org> References: <1285775292-15060-1-git-send-email-john.rigby@linaro.org> <1286999857-13790-5-git-send-email-john.rigby@linaro.org> Message-ID: <20101018205225.EDEE41359B3@gemini.denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear John Rigby, In message <1286999857-13790-5-git-send-email-john.rigby@linaro.org> you wrote: > 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 > CC: Scott McNutt > CC: Michal Simek > CC: Thomas Chou > --- > arch/microblaze/lib/bootm.c | 14 +++++--------- > arch/nios2/lib/bootm.c | 8 +++----- > common/cmd_bootm.c | 2 -- > 3 files changed, 8 insertions(+), 16 deletions(-) Applied to u-boot-arm, thanks. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de There's no sense in being precise when you don't even know what you're talking about. -- John von Neumann