From 3102866a7f17cc0e0bd89bf6d2690d4a39c1f546 Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Mon, 18 Nov 2013 14:07:37 +0000 Subject: [PATCH] [main] Defer "initialising devices" message until initialising devices Allow the "initialising devices" message to show up on consoles which require initialisation, by deferring it until after initialise() has completed. Signed-off-by: Michael Brown --- src/core/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/core/main.c b/src/core/main.c index 8ad912d4..c55ca26c 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -27,9 +27,11 @@ FILE_LICENCE ( GPL2_OR_LATER ); */ __asmcall int main ( void ) { + /* Perform one-time-only initialisation (e.g. heap) */ + initialise(); + /* Some devices take an unreasonably long time to initialise */ printf ( PRODUCT_SHORT_NAME " initialising devices..." ); - initialise(); startup(); printf ( "ok\n" );