diff options
| author | etaIneLp <33374857+etaIneLp@users.noreply.github.com> | 2020-05-27 10:36:14 -0400 |
|---|---|---|
| committer | Andreas Kling <kling@serenityos.org> | 2020-05-28 00:50:55 +0200 |
| commit | 7bc871ca8dd851605bfd67cb5be1538d009aa56b (patch) | |
| tree | 26e7af8afdfd69ef1a7c6e1aad1927fa25349783 /Kernel | |
| parent | eae4843712a87fdbfe2c5aba94c3f3e304935277 (diff) | |
| download | serenity-7bc871ca8dd851605bfd67cb5be1538d009aa56b.zip | |
Kernel: Stop bootloader from setting video mode with Multiboot
Meta: Update INSTALL.md and grub configs for new boot_mode option
Diffstat (limited to 'Kernel')
| -rw-r--r-- | Kernel/Arch/i386/Boot/boot.S | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Kernel/Arch/i386/Boot/boot.S b/Kernel/Arch/i386/Boot/boot.S index 601a50a7ac..f52db9d726 100644 --- a/Kernel/Arch/i386/Boot/boot.S +++ b/Kernel/Arch/i386/Boot/boot.S @@ -1,8 +1,7 @@ .set MULTIBOOT_MAGIC, 0x1badb002 .set MULTIBOOT_PAGE_ALIGN, 0x1 .set MULTIBOOT_MEMORY_INFO, 0x2 -.set MULTIBOOT_VIDEO_MODE, 0x4 -.set multiboot_flags, MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO | MULTIBOOT_VIDEO_MODE +.set multiboot_flags, MULTIBOOT_PAGE_ALIGN | MULTIBOOT_MEMORY_INFO .set multiboot_checksum, -(MULTIBOOT_MAGIC + multiboot_flags) .section .multiboot @@ -20,12 +19,6 @@ .long 0x00000000 /* bss_end_addr */ .long 0x00000000 /* entry_addr */ -/* for MULTIBOOT_VIDEO_MODE */ -.long 0x00000000 /* mode_type */ -.long 1280 /* width */ -.long 1024 /* height */ -.long 32 /* depth */ - .section .stack, "aw", @nobits stack_bottom: .skip 32768 |