Changes in boot/Makefile.grub [84176f3:a43dfcb] in mainline

File:

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

boot/Makefile.grub

@@ -31 +31 @@
 include Makefile.common
 
-GRUB = grub/$(BARCH)-$(GRUB_ARCH)
+GRUB = grub.$(GRUB_ARCH)
 BOOT = $(DISTROOT)/boot
 BOOT_CONFIG = $(BOOT)/grub/grub.cfg
@@ -64 +64 @@
 endif
 
-ifeq ($(GRUB_LOADER),multiboot)
         for module in $(COMPONENTS) ; do \
                 cp "$$module" $(BOOT)/ ; \
         done
-endif
-ifeq ($(GRUB_LOADER),chainloader)
-        cp "$(BOOT_OUTPUT)" $(BOOT)/
-endif
 
         echo "set default=0" > $(BOOT_CONFIG)
@@ -88 +83 @@
 
         echo "menuentry 'HelenOS $(RELEASE)' --class helenos --class os {" >> $(BOOT_CONFIG)
-ifeq ($(GRUB_LOADER),multiboot)
         for module in $(MODULES) ; do \
                 echo "  echo 'Loading $$module'" >> $(BOOT_CONFIG) ; \
@@ -97 +91 @@
                 fi \
         done
-endif
-ifeq ($(GRUB_LOADER),chainloader)
-        echo "  echo 'Loading $(BOOT_OUTPUT)'" >> $(BOOT_CONFIG)
-        echo "  chainloader /boot/$(BOOT_OUTPUT)" >> $(BOOT_CONFIG)
-        echo "  boot" >> $(BOOT_CONFIG)
-endif
         echo "}" >> $(BOOT_CONFIG)