Aren/toaruos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix GRUB boot stuff

Browse Source
This commit is contained in:
Kevin Lange 2014-03-16 18:54:32 -07:00
parent 0a08fa257e
commit aa8ac11dd2
3 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
image-builder/boot/grub/grub.cfg
View File

@ -4,26 +4,35 @@ insmod video_bochs
insmod video_cirrus
set root='(hd0,msdos1)'
menuentry 'Graphical Mode' {
multiboot /boot/toaruos-kernel vid=preset,1024,768 hdd=0
menuentry 'Normal Boot' {
multiboot /boot/toaruos-kernel vid=preset,1024,768 root=/dev/hda0
module /mod/zero.ko
module /mod/random.ko
module /mod/serial.ko
module /mod/procfs.ko
module /mod/tmpfs.ko
module /mod/ata.ko
module /mod/dospart.ko
module /mod/ext2.ko
module /mod/ps2kbd.ko
module /mod/ps2mouse.ko
set gfxpayload=1024x768x32
boot
}
menuentry 'Graphical Terminal' {
multiboot /boot/toaruos-kernel vid=preset,1024,768 single hdd=0
set gfxpayload=1024x768x32
boot
}
menuentry 'VGA Terminal' {
multiboot /boot/toaruos-kernel vgaterm hdd=0
set gfxpayload=text
boot
}
menuentry 'Debug Mode' {
multiboot /boot/toaruos-kernel kernel-term=0 vgaterm hdd=0
multiboot /boot/toaruos-kernel vgaterm root=/dev/hda0
module /mod/zero.ko
module /mod/random.ko
module /mod/serial.ko
module /mod/procfs.ko
module /mod/tmpfs.ko
module /mod/ata.ko
module /mod/dospart.ko
module /mod/ext2.ko
module /mod/debug_shell.ko
set gfxpayload=text
boot
}

4
kernel/start.s
View File

@ -18,12 +18,10 @@ mboot:
MULTIBOOT_MEMORY_INFO equ 1<<1
; We would really, really like graphics...
MULTIBOOT_USE_GFX equ 1<<2
; ELF data
MULTIBOOT_ELF_INFO equ 1<<5
; We are multiboot compatible!
MULTIBOOT_HEADER_MAGIC equ 0x1BADB002
; Load up those flags.
MULTIBOOT_HEADER_FLAGS equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_USE_GFX | MULTIBOOT_ELF_INFO
MULTIBOOT_HEADER_FLAGS equ MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_USE_GFX
; Checksum the result
MULTIBOOT_CHECKSUM equ -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
; Load the headers into the binary image.

5
modules/dospart.c
View File

@ -105,11 +105,6 @@ static int read_partition_map(char * name) {
}
static int dospart_initialize(void) {
kprint_to_file = kopen("/dev/ttyS0",0);
debug_level = 0;
debug_print(WARNING, "Hello world!");
for (char l = 'a'; l < 'z'; ++l) {
char name[64];
sprintf(name, "/dev/hd%c", l);