From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 20 Jan 2010 19:51:00 +0000 (+0100)
Subject: merge mainline into setpci
X-Git-Tag: 1.98~139^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b47ee804400dbec8978f8daa20d0a90e20b1a15;p=thirdparty%2Fgrub.git

merge mainline into setpci
---

5b47ee804400dbec8978f8daa20d0a90e20b1a15
diff --cc conf/i386.rmk
index 2c1edf62f,88b06aded..d240858fe
--- a/conf/i386.rmk
+++ b/conf/i386.rmk
@@@ -26,8 -26,18 +26,24 @@@ ata_mod_SOURCES = disk/ata.
  ata_mod_CFLAGS = $(COMMON_CFLAGS)
  ata_mod_LDFLAGS = $(COMMON_LDFLAGS)
  
 +# For setpci.mod
 +pkglib_MODULES += setpci.mod
 +setpci_mod_SOURCES = commands/setpci.c
 +setpci_mod_CFLAGS = $(COMMON_CFLAGS)
 +setpci_mod_LDFLAGS = $(COMMON_LDFLAGS)
++
+ pkglib_MODULES += multiboot.mod
+ multiboot_mod_SOURCES = loader/i386/multiboot.c \
+ 			loader/i386/multiboot_mbi.c \
+                         loader/multiboot_loader.c
+ multiboot_mod_CFLAGS = $(COMMON_CFLAGS)
+ multiboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ multiboot_mod_ASFLAGS = $(COMMON_ASFLAGS)
+ 
+ pkglib_MODULES += multiboot2.mod
+ multiboot2_mod_SOURCES = loader/i386/multiboot.c \
+ 			 loader/i386/multiboot_mbi.c \
+                          loader/multiboot_loader.c
+ multiboot2_mod_CFLAGS = $(COMMON_CFLAGS) -DGRUB_USE_MULTIBOOT2
+ multiboot2_mod_LDFLAGS = $(COMMON_LDFLAGS)
+ multiboot2_mod_ASFLAGS = $(COMMON_ASFLAGS)