From 7af26b1669b75a02e1cfaa68ac526897e790af84 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Wed, 10 Jul 2013 23:08:09 -0700 Subject: blackfin: x86: bootm: Handle PREP stage of bootm The OS function is now always called with the PREP stage. Adjust the remaining bootm OS functions to deal with this correctly. Signed-off-by: Simon Glass --- arch/blackfin/lib/boot.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch/blackfin') diff --git a/arch/blackfin/lib/boot.c b/arch/blackfin/lib/boot.c index 768a8826b5..5644d589e7 100644 --- a/arch/blackfin/lib/boot.c +++ b/arch/blackfin/lib/boot.c @@ -42,6 +42,8 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima int (*appl) (char *cmdline); char *cmdline; + if (flag & BOOTM_STATE_OS_PREP) + return 0; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) return 1; -- cgit v1.2.1