Changeset 1f5c9c96 in mainline for boot/Makefile.grub

Timestamp:

2011-12-02T17:29:43Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

b8b1e631, c3887ad

Parents:

c48f6ab

Message:

implement multiboot v2 specification and use it in GRUB for UEFI

• improve multiboot v1 code, move defines to a common location
• rename VESA framebuffer stuff to generic "boot framebuffer"
• small collateral changes

File:

• boot/Makefile.grub (modified) (2 diffs)

boot/Makefile.grub

@@ -39 +39 @@
 ifeq ($(GRUB_ARCH),pc)
         BOOT_CONFIG = $(BOOT)/grub/i386-pc/grub.cfg
+        MULTIBOOT_CMD = multiboot
+        MODULE_CMD = module
 endif
 ifeq ($(GRUB_ARCH),efi)
         BOOT_CONFIG = $(BOOT)/grub/grub.cfg
+        MULTIBOOT_CMD = multiboot2
+        MODULE_CMD = module2
 endif
 
@@ -69 +73 @@
         echo "" >> $(BOOT_CONFIG)
         
+ifeq ($(GRUB_ARCH),pc)
+        echo "insmod vbe" >> $(BOOT_CONFIG)
+        echo "insmod vga" >> $(BOOT_CONFIG)
+endif
+ifeq ($(GRUB_ARCH),efi)
+        echo "insmod efi_gop" >> $(BOOT_CONFIG)
+        echo "insmod efi_uga" >> $(BOOT_CONFIG)
+endif
+        echo "" >> $(BOOT_CONFIG)
+        
         echo "menuentry 'HelenOS $(RELEASE)' --class helenos --class os {" >> $(BOOT_CONFIG)
         for module in $(MODULES) ; do \
                 echo "  echo 'Loading $$module'" >> $(BOOT_CONFIG) ; \
                 if [ "$$module" = "kernel.bin" ] ; then \
-                        echo "  multiboot /boot/$$module" >> $(BOOT_CONFIG) ; \
+                        echo "  $(MULTIBOOT_CMD) /boot/$$module" >> $(BOOT_CONFIG) ; \
                 else \
-                        echo "  module /boot/$$module" >> $(BOOT_CONFIG) ; \
+                        echo "  $(MODULE_CMD) /boot/$$module" >> $(BOOT_CONFIG) ; \
                 fi \
         done