diff options
author | Michael Brown | 2006-05-02 23:10:45 +0200 |
---|---|---|
committer | Michael Brown | 2006-05-02 23:10:45 +0200 |
commit | f8f75cef5bba0edfd17e4ca1fe176f8c640a4781 (patch) | |
tree | cd3c5a183cc0794e37e8ea93c91d5c070f47a7f0 /src | |
parent | Typo (diff) | |
download | ipxe-f8f75cef5bba0edfd17e4ca1fe176f8c640a4781.tar.gz ipxe-f8f75cef5bba0edfd17e4ca1fe176f8c640a4781.tar.xz ipxe-f8f75cef5bba0edfd17e4ca1fe176f8c640a4781.zip |
BSS is now zeroed by libprefix (along with the otherwise non-zeroable
portions such as the stack) during the installation process.
init_fns() are called from main(). We need to think about initial
control flow some more.
Diffstat (limited to 'src')
-rw-r--r-- | src/arch/i386/prefix/dskprefix.S | 3 | ||||
-rw-r--r-- | src/core/main.c | 18 |
2 files changed, 3 insertions, 18 deletions
diff --git a/src/arch/i386/prefix/dskprefix.S b/src/arch/i386/prefix/dskprefix.S index a2f62198..fff0be41 100644 --- a/src/arch/i386/prefix/dskprefix.S +++ b/src/arch/i386/prefix/dskprefix.S @@ -356,9 +356,6 @@ start_runtime: lret .section ".text16", "awx", @progbits 1: - pushl $initialise - data32 call prot_call - popl %eax /* discard */ pushl $main data32 call prot_call popl %eax /* discard */ diff --git a/src/core/main.c b/src/core/main.c index f6448e80..13aae4cf 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -141,21 +141,6 @@ static int exit_status; static int initialized; -/************************************************************************** - * initialise() - perform any C-level initialisation - * - * This does not include initialising the NIC, but it does include - * e.g. getting the memory map, relocating to high memory, - * initialising the console, etc. - ************************************************************************** - */ -void initialise ( void ) { - /* Zero the BSS */ - memset ( _bss, 0, _ebss - _bss ); - - /* Call all registered initialisation functions */ - call_init_fns (); -} /************************************************************************** MAIN - Kick off routine @@ -165,6 +150,9 @@ int main ( void ) { void *image_context; int skip = 0; + /* Call all registered initialisation functions */ + call_init_fns (); + /* Print out configuration */ print_config(); |