[freenos] r357 committed - Fix booting under certain GRUB versions: removed the Multiboot-Kludge ...
- From: codesite-noreply@xxxxxxxxxx
- To: freenos@xxxxxxxxxxxxx
- Date: Sat, 05 Sep 2009 15:28:15 +0000
Revision: 357
Author: nieklinnenbank
Date: Sat Sep 5 08:27:34 2009
Log: Fix booting under certain GRUB versions: removed the Multiboot-Kludge
flags.
These flags where previously used by the kernel to mark used memory, but
are no longer needed. GRUB instead reads the program headers from the
ELF headers.
http://code.google.com/p/freenos/source/detail?r=357
Modified:
/trunk/include/kernel/Multiboot.h
/trunk/kernel/X86/boot.S
=======================================
--- /trunk/include/kernel/Multiboot.h Mon Jun 1 15:41:52 2009
+++ /trunk/include/kernel/Multiboot.h Sat Sep 5 08:27:34 2009
@@ -29,9 +29,6 @@
/** The flags for the Multiboot header. */
#define MULTIBOOT_HEADER_FLAGS 0x00000003
-/** Marks an ELF-compatible executable. */
-#define MULTIBOOT_HEADER_ELF_FLAGS 0x00010003
-
/** Size of the multiboot header structure. */
#define MULTIBOOT_HEADER_SIZE 52
=======================================
--- /trunk/kernel/X86/boot.S Sun Jun 28 17:23:04 2009
+++ /trunk/kernel/X86/boot.S Sat Sep 5 08:27:34 2009
@@ -68,13 +68,9 @@
multibootHeader:
.long (MULTIBOOT_HEADER_MAGIC)
- .long (MULTIBOOT_HEADER_ELF_FLAGS)
- .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_ELF_FLAGS)
+ .long (MULTIBOOT_HEADER_FLAGS)
+ .long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
.long (multibootHeader)
- .long (kernelStart)
- .long (0)
- .long (1024 * 1024 * 4)
- .long (_start)
_jump_entry:
/* Disable interrupts. */
Other related posts:
- » [freenos] r357 committed - Fix booting under certain GRUB versions: removed the Multiboot-Kludge ... - codesite-noreply
