diff options
author | Kevin O'Connor <kevin@koconnor.net> | 2013-02-08 21:00:46 -0500 |
---|---|---|
committer | Kevin O'Connor <kevin@koconnor.net> | 2013-02-08 21:28:25 -0500 |
commit | b1885fc3a7998fe91f488a5e54705e606223dc4c (patch) | |
tree | 11ee3b681caaf9bc0f0f3e35abdd6401932a0ddd /src/post.c | |
parent | 9e4d41cd7c157a1d7037b06f9d830a7dfc6d1441 (diff) | |
download | seabios-hppa-b1885fc3a7998fe91f488a5e54705e606223dc4c.zip seabios-hppa-b1885fc3a7998fe91f488a5e54705e606223dc4c.tar.gz seabios-hppa-b1885fc3a7998fe91f488a5e54705e606223dc4c.tar.bz2 |
Undo incorrect assumptions about Xen in commit 6ca0460f.
Xen invokes SeaBIOS via entry_post, not entry_elf. As a result commit
6ca0460f broke Xen. This change effectively undoes that commit.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'src/post.c')
-rw-r--r-- | src/post.c | 30 |
1 files changed, 7 insertions, 23 deletions
@@ -315,9 +315,6 @@ reloc_preinit(void *f, void *arg) void VISIBLE32INIT dopost(void) { - // Check if we are running under Xen. - xen_preinit(); - // Detect ram and setup internal malloc. qemu_cfg_preinit(); if (CONFIG_COREBOOT) @@ -332,30 +329,17 @@ dopost(void) reloc_preinit(maininit, NULL); } -// Startup debug output and display software version. -static void -debug_splash(void) +// Entry point for Power On Self Test (POST) - the BIOS initilization +// phase. This function makes the memory at 0xc0000-0xfffff +// read/writable and then calls dopost(). +void VISIBLE32FLAT +handle_post(void) { debug_serial_preinit(); dprintf(1, "Start bios (version %s)\n", VERSION); -} -// Entry point for Power On Self Test (POST) when running under -// xen/coreboot. -void VISIBLE32INIT -handle_elf(void) -{ - debug_splash(); - dopost(); -} - -// Entry point for Power On Self Test (POST) when running under -// qemu/kvm/bochs. Under qemu the memory at 0xc0000-0xfffff may be -// read-only, so unlock the ram as the first step of booting. -void VISIBLE32FLAT -handle_post(void) -{ - debug_splash(); + // Check if we are running under Xen. + xen_preinit(); // Allow writes to modify bios area (0xf0000) make_bios_writable(); |