From: Michael Brown <mcb30@ipxe.org>
Date: Mon, 18 Nov 2013 14:07:37 +0000 (+0000)
Subject: [main] Defer "initialising devices" message until initialising devices
X-Git-Tag: v1.20.1~1358
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3102866a7f17cc0e0bd89bf6d2690d4a39c1f546;p=thirdparty%2Fipxe.git

[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 <mcb30@ipxe.org>
---

diff --git a/src/core/main.c b/src/core/main.c
index 8ad912d43..c55ca26cb 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" );