diff options
author | Michael Brown <mcb30@ipxe.org> | 2013-11-18 14:07:37 +0000 |
---|---|---|
committer | Michael Brown <mcb30@ipxe.org> | 2013-11-27 11:27:50 +0000 |
commit | 3102866a7f17cc0e0bd89bf6d2690d4a39c1f546 (patch) | |
tree | 005ef958be5f5eace6a383cfa65910a6e41561e6 /src/core | |
parent | 1312c467ee6b3e158b1babb13735114dce8c3690 (diff) | |
download | ipxe-3102866a7f17cc0e0bd89bf6d2690d4a39c1f546.tar.gz |
[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>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
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" ); |