]> git.ipfire.org Git - thirdparty/ipxe.git/commitdiff
[main] Defer "initialising devices" message until initialising devices
authorMichael Brown <mcb30@ipxe.org>
Mon, 18 Nov 2013 14:07:37 +0000 (14:07 +0000)
committerMichael Brown <mcb30@ipxe.org>
Wed, 27 Nov 2013 11:27:50 +0000 (11:27 +0000)
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>
src/core/main.c

index 8ad912d43e8202456ac4a97a828798fd12896351..c55ca26cbf821f8dd4c38fab3f50cc0a4357648d 100644 (file)
@@ -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" );