projects
/
seabios.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b29200c
)
grml...
coreboot
author
Bernhard Urban
<lewurm@gmail.com>
Fri, 6 Apr 2012 12:25:10 +0000
(14:25 +0200)
committer
Bernhard Urban
<lewurm@gmail.com>
Fri, 6 Apr 2012 12:25:10 +0000
(14:25 +0200)
src/boot.c
patch
|
blob
|
history
src/post.c
patch
|
blob
|
history
diff --git
a/src/boot.c
b/src/boot.c
index e26dad1ea54e7777e2f5d4f8249fb74dc3a2e8a3..9dd37fd57478d7522fb5251f85f64db88f9b479e 100644
(file)
--- a/
src/boot.c
+++ b/
src/boot.c
@@
-380,6
+380,9
@@
interactive_bootmenu(void)
u32 menutime = romfile_loadint("etc/boot-menu-wait", DEFAULT_BOOTMENU_WAIT);
enable_bootsplash();
u32 menutime = romfile_loadint("etc/boot-menu-wait", DEFAULT_BOOTMENU_WAIT);
enable_bootsplash();
+ if (1 == 1) {
+ return;
+ }
int scan_code = get_keystroke(menutime);
disable_bootsplash();
if (scan_code != 0x86)
int scan_code = get_keystroke(menutime);
disable_bootsplash();
if (scan_code != 0x86)
@@
-461,11
+464,14
@@
boot_prep(void)
// XXX - show available drives?
// Allow user to modify BCV/IPL order.
// XXX - show available drives?
// Allow user to modify BCV/IPL order.
+ dprintf(3, "[wurm] bp1\n");
interactive_bootmenu();
interactive_bootmenu();
+ dprintf(3, "[wurm] bp2\n");
wait_threads();
// Map drives and populate BEV list
struct bootentry_s *pos = BootList;
wait_threads();
// Map drives and populate BEV list
struct bootentry_s *pos = BootList;
+ dprintf(3, "[wurm] bp3\n");
while (pos) {
switch (pos->type) {
case IPL_TYPE_BCV:
while (pos) {
switch (pos->type) {
case IPL_TYPE_BCV:
@@
-489,10
+495,12
@@
boot_prep(void)
}
pos = pos->next;
}
}
pos = pos->next;
}
+ dprintf(3, "[wurm] bp4\n");
// If nothing added a floppy/hd boot - add it manually.
add_bev(IPL_TYPE_FLOPPY, 0);
add_bev(IPL_TYPE_HARDDISK, 0);
// If nothing added a floppy/hd boot - add it manually.
add_bev(IPL_TYPE_FLOPPY, 0);
add_bev(IPL_TYPE_HARDDISK, 0);
+ dprintf(3, "[wurm] bp5\n");
}
}
diff --git
a/src/post.c
b/src/post.c
index 7c76959f23611f68638dc049c629e66ee5867450..cf7501ebbd67e475c0b2c6fd30f11b7051cd9f5e 100644
(file)
--- a/
src/post.c
+++ b/
src/post.c
@@
-266,24
+266,32
@@
maininit(void)
}
// Run option roms
}
// Run option roms
+ dprintf(3, "[wurm] optionrom_setup\n");
optionrom_setup();
// Run BCVs and show optional boot menu
optionrom_setup();
// Run BCVs and show optional boot menu
+ dprintf(3, "[wurm] boot_prep\n");
boot_prep();
// Finalize data structures before boot
boot_prep();
// Finalize data structures before boot
+ dprintf(3, "[wurm] cdemu_setup\n");
cdemu_setup();
cdemu_setup();
+ dprintf(3, "[wurm] pmm_finalize\n");
pmm_finalize();
pmm_finalize();
+ dprintf(3, "[wurm] malloc_finalize\n");
malloc_finalize();
malloc_finalize();
+ dprintf(3, "[wurm] memmap_finalize\n");
memmap_finalize();
// Setup bios checksum.
BiosChecksum -= checksum((u8*)BUILD_BIOS_ADDR, BUILD_BIOS_SIZE);
// Write protect bios memory.
memmap_finalize();
// Setup bios checksum.
BiosChecksum -= checksum((u8*)BUILD_BIOS_ADDR, BUILD_BIOS_SIZE);
// Write protect bios memory.
+ dprintf(3, "[wurm] make_bios_readonly\n");
make_bios_readonly();
// Invoke int 19 to start boot process.
make_bios_readonly();
// Invoke int 19 to start boot process.
+ dprintf(3, "[wurm] startBoot\n");
startBoot();
}
startBoot();
}