2009-11-13 Robert Millan <rmh.grub@aybabtu.com>

        Disable Multiboot2 in i386-ieee1275.  It didn't actually work, and on
        this platform we should support Multiboot1 first.

        * conf/i386-ieee1275.rmk (pkglib_MODULES): Remove `multiboot.mod'.
        (multiboot_mod_SOURCES, multiboot_mod_CFLAGS)
        (multiboot_mod_LDFLAGS, multiboot_mod_ASFLAGS): Remove.

diff --git a/ChangeLog b/ChangeLog
index 3d1046d2204e97e6c5dc98344d59cf92f93da9bb..6d7c7fe42589cb69d7cec4f85abc0490eb5c10de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-11-13  Robert Millan  <rmh.grub@aybabtu.com>
+
+       Disable Multiboot2 in i386-ieee1275.  It didn't actually work, and on
+       this platform we should support Multiboot1 first.
+
+       * conf/i386-ieee1275.rmk (pkglib_MODULES): Remove `multiboot.mod'.
+       (multiboot_mod_SOURCES, multiboot_mod_CFLAGS)
+       (multiboot_mod_LDFLAGS, multiboot_mod_ASFLAGS): Remove.
+
 2009-11-12  Robert Millan  <rmh.grub@aybabtu.com>
 
        * util/mkisofs/eltorito.c (init_boot_catalog): Handle return code

diff --git a/conf/i386-ieee1275.rmk b/conf/i386-ieee1275.rmk
index 4b640de499d59cbfaaf5f7d33efa4144386570a6..1eeba3af552bd02d691b5b545af75c33ae7c0771 100644 (file)
--- a/conf/i386-ieee1275.rmk
+++ b/conf/i386-ieee1275.rmk
@@ -110,7 +110,7 @@ grub_install_SOURCES = util/ieee1275/grub-install.in
 
 # Modules.
 pkglib_MODULES = halt.mod reboot.mod suspend.mod               \
-       multiboot.mod aout.mod serial.mod linux.mod             \
+       aout.mod serial.mod linux.mod           \
        nand.mod memdisk.mod pci.mod lspci.mod datetime.mod     \
        date.mod datehook.mod lsmmap.mod mmap.mod
 
@@ -126,15 +126,6 @@ mmap_mod_CFLAGS = $(COMMON_CFLAGS)
 mmap_mod_LDFLAGS = $(COMMON_LDFLAGS)
 mmap_mod_ASFLAGS = $(COMMON_ASFLAGS)
 
-# For multiboot.mod.
-multiboot_mod_SOURCES = loader/ieee1275/multiboot2.c \
-                       loader/i386/multiboot_helper.S \
-                        loader/multiboot2.c \
-                        loader/multiboot_loader.c
-multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
-multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
-multiboot_mod_ASFLAGS = $(COMMON_ASFLAGS)
-
 # For aout.mod.
 aout_mod_SOURCES = loader/aout.c
 aout_mod_CFLAGS = $(COMMON_CFLAGS)