commit-grub
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[1857] 2008-09-07 Robert Millan <address@hidden>


From: Robert Millan
Subject: [1857] 2008-09-07 Robert Millan <address@hidden>
Date: Sun, 07 Sep 2008 16:09:21 +0000

Revision: 1857
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1857
Author:   robertmh
Date:     2008-09-07 16:09:21 +0000 (Sun, 07 Sep 2008)

Log Message:
-----------
2008-09-07  Robert Millan  <address@hidden>

        * conf/i386.rmk: New file.  Provides declaration for building
        `cpuid.mod'.
        * conf/i386-pc.rmk (pkglib_MODULES): Remove `cpuid.mod'.
        (cpuid_mod_SOURCES, cpuid_mod_CFLAGS, cpuid_mod_LDFLAGS): Remove
        variables.
        Include `conf/i386.mk'.
        * conf/i386-efi.rmk: Likewise.
        * conf/x86_64-efi.rmk: Likewise.
        * conf/i386-coreboot.rmk: Likewise.
        * conf/i386-ieee1275.rmk: Likewise.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/conf/i386-coreboot.mk
    trunk/grub2/conf/i386-coreboot.rmk
    trunk/grub2/conf/i386-efi.mk
    trunk/grub2/conf/i386-efi.rmk
    trunk/grub2/conf/i386-ieee1275.mk
    trunk/grub2/conf/i386-ieee1275.rmk
    trunk/grub2/conf/i386-pc.mk
    trunk/grub2/conf/i386-pc.rmk
    trunk/grub2/conf/x86_64-efi.mk
    trunk/grub2/conf/x86_64-efi.rmk

Added Paths:
-----------
    trunk/grub2/conf/i386.mk
    trunk/grub2/conf/i386.rmk

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-09-07 15:55:58 UTC (rev 1856)
+++ trunk/grub2/ChangeLog       2008-09-07 16:09:21 UTC (rev 1857)
@@ -1,3 +1,16 @@
+2008-09-07  Robert Millan  <address@hidden>
+
+       * conf/i386.rmk: New file.  Provides declaration for building
+       `cpuid.mod'.
+       * conf/i386-pc.rmk (pkglib_MODULES): Remove `cpuid.mod'.
+       (cpuid_mod_SOURCES, cpuid_mod_CFLAGS, cpuid_mod_LDFLAGS): Remove
+       variables.
+       Include `conf/i386.mk'.
+       * conf/i386-efi.rmk: Likewise.
+       * conf/x86_64-efi.rmk: Likewise.
+       * conf/i386-coreboot.rmk: Likewise.
+       * conf/i386-ieee1275.rmk: Likewise.
+
 2008-09-07  Vesa Jääskeläinen  <address@hidden>
 
        Based on patch created by Colin D Bennett <address@hidden>.

Modified: trunk/grub2/conf/i386-coreboot.mk
===================================================================
--- trunk/grub2/conf/i386-coreboot.mk   2008-09-07 15:55:58 UTC (rev 1856)
+++ trunk/grub2/conf/i386-coreboot.mk   2008-09-07 16:09:21 UTC (rev 1857)
@@ -573,7 +573,7 @@
 # Modules.
 pkglib_MODULES = _linux.mod linux.mod normal.mod       \
        _multiboot.mod multiboot.mod aout.mod           \
-       play.mod cpuid.mod serial.mod ata.mod           \
+       play.mod serial.mod ata.mod                     \
        memdisk.mod pci.mod lspci.mod reboot.mod        \
        halt.mod datetime.mod date.mod datehook.mod
 
@@ -1516,63 +1516,6 @@
 play_mod_CFLAGS = $(COMMON_CFLAGS)
 play_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For cpuid.mod.
-cpuid_mod_SOURCES = commands/i386/cpuid.c
-CLEANFILES += cpuid.mod mod-cpuid.o mod-cpuid.c pre-cpuid.o 
cpuid_mod-commands_i386_cpuid.o und-cpuid.lst
-ifneq ($(cpuid_mod_EXPORTS),no)
-CLEANFILES += def-cpuid.lst
-DEFSYMFILES += def-cpuid.lst
-endif
-MOSTLYCLEANFILES += cpuid_mod-commands_i386_cpuid.d
-UNDSYMFILES += und-cpuid.lst
-
-cpuid.mod: pre-cpuid.o mod-cpuid.o $(TARGET_OBJ2ELF)
-       -rm -f $@
-       $(TARGET_CC) $(cpuid_mod_LDFLAGS) $(TARGET_LDFLAGS) $(MODULE_LDFLAGS) 
-Wl,-r,-d -o $@ pre-cpuid.o mod-cpuid.o
-       if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
-       $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
-
-pre-cpuid.o: $(cpuid_mod_DEPENDENCIES) cpuid_mod-commands_i386_cpuid.o
-       -rm -f $@
-       $(TARGET_CC) $(cpuid_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
cpuid_mod-commands_i386_cpuid.o
-
-mod-cpuid.o: mod-cpuid.c
-       $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cpuid_mod_CFLAGS) -c 
-o $@ $<
-
-mod-cpuid.c: moddep.lst genmodsrc.sh
-       sh $(srcdir)/genmodsrc.sh 'cpuid' $< > $@ || (rm -f $@; exit 1)
-
-ifneq ($(cpuid_mod_EXPORTS),no)
-def-cpuid.lst: pre-cpuid.o
-       $(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 cpuid/' > $@
-endif
-
-und-cpuid.lst: pre-cpuid.o
-       echo 'cpuid' > $@
-       $(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-cpuid_mod-commands_i386_cpuid.o: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES)
-       $(TARGET_CC) -Icommands/i386 -I$(srcdir)/commands/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(cpuid_mod_CFLAGS) -MD -c -o $@ $<
--include cpuid_mod-commands_i386_cpuid.d
-
-CLEANFILES += cmd-cpuid_mod-commands_i386_cpuid.lst 
fs-cpuid_mod-commands_i386_cpuid.lst partmap-cpuid_mod-commands_i386_cpuid.lst
-COMMANDFILES += cmd-cpuid_mod-commands_i386_cpuid.lst
-FSFILES += fs-cpuid_mod-commands_i386_cpuid.lst
-PARTMAPFILES += partmap-cpuid_mod-commands_i386_cpuid.lst
-
-cmd-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh cpuid > $@ || (rm -f 
$@; exit 1)
-
-fs-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh cpuid > $@ || (rm -f 
$@; exit 1)
-
-partmap-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh cpuid > $@ || (rm 
-f $@; exit 1)
-
-
-cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
-cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For ata.mod.
 ata_mod_SOURCES = disk/ata.c
 CLEANFILES += ata.mod mod-ata.o mod-ata.c pre-ata.o ata_mod-disk_ata.o 
und-ata.lst
@@ -1991,4 +1934,5 @@
 datehook_mod_CFLAGS = $(COMMON_CFLAGS)
 datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk

Modified: trunk/grub2/conf/i386-coreboot.rmk
===================================================================
--- trunk/grub2/conf/i386-coreboot.rmk  2008-09-07 15:55:58 UTC (rev 1856)
+++ trunk/grub2/conf/i386-coreboot.rmk  2008-09-07 16:09:21 UTC (rev 1857)
@@ -94,7 +94,7 @@
 # Modules.
 pkglib_MODULES = _linux.mod linux.mod normal.mod       \
        _multiboot.mod multiboot.mod aout.mod           \
-       play.mod cpuid.mod serial.mod ata.mod           \
+       play.mod serial.mod ata.mod                     \
        memdisk.mod pci.mod lspci.mod reboot.mod        \
        halt.mod datetime.mod date.mod datehook.mod
 
@@ -156,11 +156,6 @@
 play_mod_CFLAGS = $(COMMON_CFLAGS)
 play_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For cpuid.mod.
-cpuid_mod_SOURCES = commands/i386/cpuid.c
-cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
-cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For ata.mod.
 ata_mod_SOURCES = disk/ata.c
 ata_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -196,4 +191,5 @@
 datehook_mod_CFLAGS = $(COMMON_CFLAGS)
 datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk

Modified: trunk/grub2/conf/i386-efi.mk
===================================================================
--- trunk/grub2/conf/i386-efi.mk        2008-09-07 15:55:58 UTC (rev 1856)
+++ trunk/grub2/conf/i386-efi.mk        2008-09-07 16:09:21 UTC (rev 1857)
@@ -119,7 +119,7 @@
 
 # Modules.
 pkglib_MODULES = kernel.mod normal.mod _chain.mod chain.mod appleldr.mod \
-       _linux.mod linux.mod cpuid.mod halt.mod reboot.mod pci.mod lspci.mod \
+       _linux.mod linux.mod halt.mod reboot.mod pci.mod lspci.mod \
        datetime.mod date.mod datehook.mod
 
 # For kernel.mod.
@@ -1349,63 +1349,6 @@
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For cpuid.mod.
-cpuid_mod_SOURCES = commands/i386/cpuid.c
-CLEANFILES += cpuid.mod mod-cpuid.o mod-cpuid.c pre-cpuid.o 
cpuid_mod-commands_i386_cpuid.o und-cpuid.lst
-ifneq ($(cpuid_mod_EXPORTS),no)
-CLEANFILES += def-cpuid.lst
-DEFSYMFILES += def-cpuid.lst
-endif
-MOSTLYCLEANFILES += cpuid_mod-commands_i386_cpuid.d
-UNDSYMFILES += und-cpuid.lst
-
-cpuid.mod: pre-cpuid.o mod-cpuid.o $(TARGET_OBJ2ELF)
-       -rm -f $@
-       $(TARGET_CC) $(cpuid_mod_LDFLAGS) $(TARGET_LDFLAGS) $(MODULE_LDFLAGS) 
-Wl,-r,-d -o $@ pre-cpuid.o mod-cpuid.o
-       if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
-       $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
-
-pre-cpuid.o: $(cpuid_mod_DEPENDENCIES) cpuid_mod-commands_i386_cpuid.o
-       -rm -f $@
-       $(TARGET_CC) $(cpuid_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
cpuid_mod-commands_i386_cpuid.o
-
-mod-cpuid.o: mod-cpuid.c
-       $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cpuid_mod_CFLAGS) -c 
-o $@ $<
-
-mod-cpuid.c: moddep.lst genmodsrc.sh
-       sh $(srcdir)/genmodsrc.sh 'cpuid' $< > $@ || (rm -f $@; exit 1)
-
-ifneq ($(cpuid_mod_EXPORTS),no)
-def-cpuid.lst: pre-cpuid.o
-       $(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 cpuid/' > $@
-endif
-
-und-cpuid.lst: pre-cpuid.o
-       echo 'cpuid' > $@
-       $(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-cpuid_mod-commands_i386_cpuid.o: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES)
-       $(TARGET_CC) -Icommands/i386 -I$(srcdir)/commands/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(cpuid_mod_CFLAGS) -MD -c -o $@ $<
--include cpuid_mod-commands_i386_cpuid.d
-
-CLEANFILES += cmd-cpuid_mod-commands_i386_cpuid.lst 
fs-cpuid_mod-commands_i386_cpuid.lst partmap-cpuid_mod-commands_i386_cpuid.lst
-COMMANDFILES += cmd-cpuid_mod-commands_i386_cpuid.lst
-FSFILES += fs-cpuid_mod-commands_i386_cpuid.lst
-PARTMAPFILES += partmap-cpuid_mod-commands_i386_cpuid.lst
-
-cmd-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh cpuid > $@ || (rm -f 
$@; exit 1)
-
-fs-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh cpuid > $@ || (rm -f 
$@; exit 1)
-
-partmap-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh cpuid > $@ || (rm 
-f $@; exit 1)
-
-
-cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
-cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod.
 halt_mod_SOURCES = commands/halt.c
 CLEANFILES += halt.mod mod-halt.o mod-halt.c pre-halt.o 
halt_mod-commands_halt.o und-halt.lst
@@ -1824,4 +1767,5 @@
 datehook_mod_CFLAGS = $(COMMON_CFLAGS)
 datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk

Modified: trunk/grub2/conf/i386-efi.rmk
===================================================================
--- trunk/grub2/conf/i386-efi.rmk       2008-09-07 15:55:58 UTC (rev 1856)
+++ trunk/grub2/conf/i386-efi.rmk       2008-09-07 16:09:21 UTC (rev 1857)
@@ -76,7 +76,7 @@
 
 # Modules.
 pkglib_MODULES = kernel.mod normal.mod _chain.mod chain.mod appleldr.mod \
-       _linux.mod linux.mod cpuid.mod halt.mod reboot.mod pci.mod lspci.mod \
+       _linux.mod linux.mod halt.mod reboot.mod pci.mod lspci.mod \
        datetime.mod date.mod datehook.mod
 
 # For kernel.mod.
@@ -144,11 +144,6 @@
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For cpuid.mod.
-cpuid_mod_SOURCES = commands/i386/cpuid.c
-cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
-cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod.
 halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -184,4 +179,5 @@
 datehook_mod_CFLAGS = $(COMMON_CFLAGS)
 datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk

Modified: trunk/grub2/conf/i386-ieee1275.mk
===================================================================
--- trunk/grub2/conf/i386-ieee1275.mk   2008-09-07 15:55:58 UTC (rev 1856)
+++ trunk/grub2/conf/i386-ieee1275.mk   2008-09-07 16:09:21 UTC (rev 1857)
@@ -589,7 +589,7 @@
 
 
 # Modules.
-pkglib_MODULES = normal.mod halt.mod reboot.mod suspend.mod cpuid.mod  \
+pkglib_MODULES = normal.mod halt.mod reboot.mod suspend.mod            \
        multiboot.mod _multiboot.mod aout.mod serial.mod linux.mod      \
        _linux.mod nand.mod memdisk.mod pci.mod lspci.mod datetime.mod  \
        date.mod datehook.mod
@@ -1304,63 +1304,6 @@
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For cpuid.mod.
-cpuid_mod_SOURCES = commands/i386/cpuid.c
-CLEANFILES += cpuid.mod mod-cpuid.o mod-cpuid.c pre-cpuid.o 
cpuid_mod-commands_i386_cpuid.o und-cpuid.lst
-ifneq ($(cpuid_mod_EXPORTS),no)
-CLEANFILES += def-cpuid.lst
-DEFSYMFILES += def-cpuid.lst
-endif
-MOSTLYCLEANFILES += cpuid_mod-commands_i386_cpuid.d
-UNDSYMFILES += und-cpuid.lst
-
-cpuid.mod: pre-cpuid.o mod-cpuid.o $(TARGET_OBJ2ELF)
-       -rm -f $@
-       $(TARGET_CC) $(cpuid_mod_LDFLAGS) $(TARGET_LDFLAGS) $(MODULE_LDFLAGS) 
-Wl,-r,-d -o $@ pre-cpuid.o mod-cpuid.o
-       if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
-       $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
-
-pre-cpuid.o: $(cpuid_mod_DEPENDENCIES) cpuid_mod-commands_i386_cpuid.o
-       -rm -f $@
-       $(TARGET_CC) $(cpuid_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
cpuid_mod-commands_i386_cpuid.o
-
-mod-cpuid.o: mod-cpuid.c
-       $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cpuid_mod_CFLAGS) -c 
-o $@ $<
-
-mod-cpuid.c: moddep.lst genmodsrc.sh
-       sh $(srcdir)/genmodsrc.sh 'cpuid' $< > $@ || (rm -f $@; exit 1)
-
-ifneq ($(cpuid_mod_EXPORTS),no)
-def-cpuid.lst: pre-cpuid.o
-       $(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 cpuid/' > $@
-endif
-
-und-cpuid.lst: pre-cpuid.o
-       echo 'cpuid' > $@
-       $(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-cpuid_mod-commands_i386_cpuid.o: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES)
-       $(TARGET_CC) -Icommands/i386 -I$(srcdir)/commands/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(cpuid_mod_CFLAGS) -MD -c -o $@ $<
--include cpuid_mod-commands_i386_cpuid.d
-
-CLEANFILES += cmd-cpuid_mod-commands_i386_cpuid.lst 
fs-cpuid_mod-commands_i386_cpuid.lst partmap-cpuid_mod-commands_i386_cpuid.lst
-COMMANDFILES += cmd-cpuid_mod-commands_i386_cpuid.lst
-FSFILES += fs-cpuid_mod-commands_i386_cpuid.lst
-PARTMAPFILES += partmap-cpuid_mod-commands_i386_cpuid.lst
-
-cmd-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh cpuid > $@ || (rm -f 
$@; exit 1)
-
-fs-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh cpuid > $@ || (rm -f 
$@; exit 1)
-
-partmap-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh cpuid > $@ || (rm 
-f $@; exit 1)
-
-
-cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
-cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For serial.mod.
 serial_mod_SOURCES = term/i386/pc/serial.c
 CLEANFILES += serial.mod mod-serial.o mod-serial.c pre-serial.o 
serial_mod-term_i386_pc_serial.o und-serial.lst
@@ -1950,4 +1893,5 @@
 datehook_mod_CFLAGS = $(COMMON_CFLAGS)
 datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk

Modified: trunk/grub2/conf/i386-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/i386-ieee1275.rmk  2008-09-07 15:55:58 UTC (rev 1856)
+++ trunk/grub2/conf/i386-ieee1275.rmk  2008-09-07 16:09:21 UTC (rev 1857)
@@ -96,7 +96,7 @@
 grub_install_SOURCES = util/ieee1275/grub-install.in
 
 # Modules.
-pkglib_MODULES = normal.mod halt.mod reboot.mod suspend.mod cpuid.mod  \
+pkglib_MODULES = normal.mod halt.mod reboot.mod suspend.mod            \
        multiboot.mod _multiboot.mod aout.mod serial.mod linux.mod      \
        _linux.mod nand.mod memdisk.mod pci.mod lspci.mod datetime.mod  \
        date.mod datehook.mod
@@ -143,11 +143,6 @@
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
 halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For cpuid.mod.
-cpuid_mod_SOURCES = commands/i386/cpuid.c
-cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
-cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For serial.mod.
 serial_mod_SOURCES = term/i386/pc/serial.c
 serial_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -198,4 +193,5 @@
 datehook_mod_CFLAGS = $(COMMON_CFLAGS)
 datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk

Modified: trunk/grub2/conf/i386-pc.mk
===================================================================
--- trunk/grub2/conf/i386-pc.mk 2008-09-07 15:55:58 UTC (rev 1856)
+++ trunk/grub2/conf/i386-pc.mk 2008-09-07 16:09:21 UTC (rev 1857)
@@ -928,7 +928,7 @@
 pkglib_MODULES = biosdisk.mod _chain.mod _linux.mod linux.mod normal.mod \
        _multiboot.mod chain.mod multiboot.mod reboot.mod halt.mod      \
        vbe.mod vbetest.mod vbeinfo.mod video.mod gfxterm.mod \
-       videotest.mod play.mod bitmap.mod tga.mod cpuid.mod serial.mod  \
+       videotest.mod play.mod bitmap.mod tga.mod serial.mod    \
        ata.mod vga.mod memdisk.mod jpeg.mod png.mod pci.mod lspci.mod \
        aout.mod _bsd.mod bsd.mod pxe.mod pxecmd.mod datetime.mod date.mod \
        datehook.mod
@@ -2463,63 +2463,6 @@
 tga_mod_CFLAGS = $(COMMON_CFLAGS)
 tga_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For cpuid.mod.
-cpuid_mod_SOURCES = commands/i386/cpuid.c
-CLEANFILES += cpuid.mod mod-cpuid.o mod-cpuid.c pre-cpuid.o 
cpuid_mod-commands_i386_cpuid.o und-cpuid.lst
-ifneq ($(cpuid_mod_EXPORTS),no)
-CLEANFILES += def-cpuid.lst
-DEFSYMFILES += def-cpuid.lst
-endif
-MOSTLYCLEANFILES += cpuid_mod-commands_i386_cpuid.d
-UNDSYMFILES += und-cpuid.lst
-
-cpuid.mod: pre-cpuid.o mod-cpuid.o $(TARGET_OBJ2ELF)
-       -rm -f $@
-       $(TARGET_CC) $(cpuid_mod_LDFLAGS) $(TARGET_LDFLAGS) $(MODULE_LDFLAGS) 
-Wl,-r,-d -o $@ pre-cpuid.o mod-cpuid.o
-       if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
-       $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
-
-pre-cpuid.o: $(cpuid_mod_DEPENDENCIES) cpuid_mod-commands_i386_cpuid.o
-       -rm -f $@
-       $(TARGET_CC) $(cpuid_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
cpuid_mod-commands_i386_cpuid.o
-
-mod-cpuid.o: mod-cpuid.c
-       $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cpuid_mod_CFLAGS) -c 
-o $@ $<
-
-mod-cpuid.c: moddep.lst genmodsrc.sh
-       sh $(srcdir)/genmodsrc.sh 'cpuid' $< > $@ || (rm -f $@; exit 1)
-
-ifneq ($(cpuid_mod_EXPORTS),no)
-def-cpuid.lst: pre-cpuid.o
-       $(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 cpuid/' > $@
-endif
-
-und-cpuid.lst: pre-cpuid.o
-       echo 'cpuid' > $@
-       $(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-cpuid_mod-commands_i386_cpuid.o: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES)
-       $(TARGET_CC) -Icommands/i386 -I$(srcdir)/commands/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(cpuid_mod_CFLAGS) -MD -c -o $@ $<
--include cpuid_mod-commands_i386_cpuid.d
-
-CLEANFILES += cmd-cpuid_mod-commands_i386_cpuid.lst 
fs-cpuid_mod-commands_i386_cpuid.lst partmap-cpuid_mod-commands_i386_cpuid.lst
-COMMANDFILES += cmd-cpuid_mod-commands_i386_cpuid.lst
-FSFILES += fs-cpuid_mod-commands_i386_cpuid.lst
-PARTMAPFILES += partmap-cpuid_mod-commands_i386_cpuid.lst
-
-cmd-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh cpuid > $@ || (rm -f 
$@; exit 1)
-
-fs-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh cpuid > $@ || (rm -f 
$@; exit 1)
-
-partmap-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh cpuid > $@ || (rm 
-f $@; exit 1)
-
-
-cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
-cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For ata.mod.
 ata_mod_SOURCES = disk/ata.c
 CLEANFILES += ata.mod mod-ata.o mod-ata.c pre-ata.o ata_mod-disk_ata.o 
und-ata.lst
@@ -3394,4 +3337,5 @@
 datehook_mod_CFLAGS = $(COMMON_CFLAGS)
 datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk

Modified: trunk/grub2/conf/i386-pc.rmk
===================================================================
--- trunk/grub2/conf/i386-pc.rmk        2008-09-07 15:55:58 UTC (rev 1856)
+++ trunk/grub2/conf/i386-pc.rmk        2008-09-07 16:09:21 UTC (rev 1857)
@@ -163,7 +163,7 @@
 pkglib_MODULES = biosdisk.mod _chain.mod _linux.mod linux.mod normal.mod \
        _multiboot.mod chain.mod multiboot.mod reboot.mod halt.mod      \
        vbe.mod vbetest.mod vbeinfo.mod video.mod gfxterm.mod \
-       videotest.mod play.mod bitmap.mod tga.mod cpuid.mod serial.mod  \
+       videotest.mod play.mod bitmap.mod tga.mod serial.mod    \
        ata.mod vga.mod memdisk.mod jpeg.mod png.mod pci.mod lspci.mod \
        aout.mod _bsd.mod bsd.mod pxe.mod pxecmd.mod datetime.mod date.mod \
        datehook.mod
@@ -278,11 +278,6 @@
 tga_mod_CFLAGS = $(COMMON_CFLAGS)
 tga_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For cpuid.mod.
-cpuid_mod_SOURCES = commands/i386/cpuid.c
-cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
-cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For ata.mod.
 ata_mod_SOURCES = disk/ata.c
 ata_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -358,4 +353,5 @@
 datehook_mod_CFLAGS = $(COMMON_CFLAGS)
 datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk

Added: trunk/grub2/conf/i386.mk
===================================================================
--- trunk/grub2/conf/i386.mk                            (rev 0)
+++ trunk/grub2/conf/i386.mk    2008-09-07 16:09:21 UTC (rev 1857)
@@ -0,0 +1,61 @@
+# -*- makefile -*-
+# Generated by genmk.rb, please don't edit!
+
+pkglib_MODULES += cpuid.mod
+
+# For cpuid.mod.
+cpuid_mod_SOURCES = commands/i386/cpuid.c
+CLEANFILES += cpuid.mod mod-cpuid.o mod-cpuid.c pre-cpuid.o 
cpuid_mod-commands_i386_cpuid.o und-cpuid.lst
+ifneq ($(cpuid_mod_EXPORTS),no)
+CLEANFILES += def-cpuid.lst
+DEFSYMFILES += def-cpuid.lst
+endif
+MOSTLYCLEANFILES += cpuid_mod-commands_i386_cpuid.d
+UNDSYMFILES += und-cpuid.lst
+
+cpuid.mod: pre-cpuid.o mod-cpuid.o $(TARGET_OBJ2ELF)
+       -rm -f $@
+       $(TARGET_CC) $(cpuid_mod_LDFLAGS) $(TARGET_LDFLAGS) $(MODULE_LDFLAGS) 
-Wl,-r,-d -o $@ pre-cpuid.o mod-cpuid.o
+       if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
+       $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
+
+pre-cpuid.o: $(cpuid_mod_DEPENDENCIES) cpuid_mod-commands_i386_cpuid.o
+       -rm -f $@
+       $(TARGET_CC) $(cpuid_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
cpuid_mod-commands_i386_cpuid.o
+
+mod-cpuid.o: mod-cpuid.c
+       $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cpuid_mod_CFLAGS) -c 
-o $@ $<
+
+mod-cpuid.c: moddep.lst genmodsrc.sh
+       sh $(srcdir)/genmodsrc.sh 'cpuid' $< > $@ || (rm -f $@; exit 1)
+
+ifneq ($(cpuid_mod_EXPORTS),no)
+def-cpuid.lst: pre-cpuid.o
+       $(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 cpuid/' > $@
+endif
+
+und-cpuid.lst: pre-cpuid.o
+       echo 'cpuid' > $@
+       $(NM) -u -P -p $< | cut -f1 -d' ' >> $@
+
+cpuid_mod-commands_i386_cpuid.o: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES)
+       $(TARGET_CC) -Icommands/i386 -I$(srcdir)/commands/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(cpuid_mod_CFLAGS) -MD -c -o $@ $<
+-include cpuid_mod-commands_i386_cpuid.d
+
+CLEANFILES += cmd-cpuid_mod-commands_i386_cpuid.lst 
fs-cpuid_mod-commands_i386_cpuid.lst partmap-cpuid_mod-commands_i386_cpuid.lst
+COMMANDFILES += cmd-cpuid_mod-commands_i386_cpuid.lst
+FSFILES += fs-cpuid_mod-commands_i386_cpuid.lst
+PARTMAPFILES += partmap-cpuid_mod-commands_i386_cpuid.lst
+
+cmd-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) gencmdlist.sh
+       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh cpuid > $@ || (rm -f 
$@; exit 1)
+
+fs-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) genfslist.sh
+       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh cpuid > $@ || (rm -f 
$@; exit 1)
+
+partmap-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) genpartmaplist.sh
+       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh cpuid > $@ || (rm 
-f $@; exit 1)
+
+
+cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
+cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)

Added: trunk/grub2/conf/i386.rmk
===================================================================
--- trunk/grub2/conf/i386.rmk                           (rev 0)
+++ trunk/grub2/conf/i386.rmk   2008-09-07 16:09:21 UTC (rev 1857)
@@ -0,0 +1,8 @@
+# -*- makefile -*-
+
+pkglib_MODULES += cpuid.mod
+
+# For cpuid.mod.
+cpuid_mod_SOURCES = commands/i386/cpuid.c
+cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
+cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)

Modified: trunk/grub2/conf/x86_64-efi.mk
===================================================================
--- trunk/grub2/conf/x86_64-efi.mk      2008-09-07 15:55:58 UTC (rev 1856)
+++ trunk/grub2/conf/x86_64-efi.mk      2008-09-07 16:09:21 UTC (rev 1857)
@@ -103,7 +103,7 @@
 
 # Modules.
 pkglib_MODULES = kernel.mod normal.mod _chain.mod chain.mod appleldr.mod \
-       cpuid.mod halt.mod reboot.mod _linux.mod linux.mod pci.mod lspci.mod \
+       halt.mod reboot.mod _linux.mod linux.mod pci.mod lspci.mod \
        datetime.mod date.mod datehook.mod
 
 # For kernel.mod.
@@ -1352,63 +1352,6 @@
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For cpuid.mod.
-cpuid_mod_SOURCES = commands/i386/cpuid.c
-CLEANFILES += cpuid.mod mod-cpuid.o mod-cpuid.c pre-cpuid.o 
cpuid_mod-commands_i386_cpuid.o und-cpuid.lst
-ifneq ($(cpuid_mod_EXPORTS),no)
-CLEANFILES += def-cpuid.lst
-DEFSYMFILES += def-cpuid.lst
-endif
-MOSTLYCLEANFILES += cpuid_mod-commands_i386_cpuid.d
-UNDSYMFILES += und-cpuid.lst
-
-cpuid.mod: pre-cpuid.o mod-cpuid.o $(TARGET_OBJ2ELF)
-       -rm -f $@
-       $(TARGET_CC) $(cpuid_mod_LDFLAGS) $(TARGET_LDFLAGS) $(MODULE_LDFLAGS) 
-Wl,-r,-d -o $@ pre-cpuid.o mod-cpuid.o
-       if test ! -z $(TARGET_OBJ2ELF); then ./$(TARGET_OBJ2ELF) $@ || (rm -f 
$@; exit 1); fi
-       $(STRIP) --strip-unneeded -K grub_mod_init -K grub_mod_fini -K 
_grub_mod_init -K _grub_mod_fini -R .note -R .comment $@
-
-pre-cpuid.o: $(cpuid_mod_DEPENDENCIES) cpuid_mod-commands_i386_cpuid.o
-       -rm -f $@
-       $(TARGET_CC) $(cpuid_mod_LDFLAGS) $(TARGET_LDFLAGS) -Wl,-r,-d -o $@ 
cpuid_mod-commands_i386_cpuid.o
-
-mod-cpuid.o: mod-cpuid.c
-       $(TARGET_CC) $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) $(cpuid_mod_CFLAGS) -c 
-o $@ $<
-
-mod-cpuid.c: moddep.lst genmodsrc.sh
-       sh $(srcdir)/genmodsrc.sh 'cpuid' $< > $@ || (rm -f $@; exit 1)
-
-ifneq ($(cpuid_mod_EXPORTS),no)
-def-cpuid.lst: pre-cpuid.o
-       $(NM) -g --defined-only -P -p $< | sed 's/^\([^ ]*\).*/\1 cpuid/' > $@
-endif
-
-und-cpuid.lst: pre-cpuid.o
-       echo 'cpuid' > $@
-       $(NM) -u -P -p $< | cut -f1 -d' ' >> $@
-
-cpuid_mod-commands_i386_cpuid.o: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES)
-       $(TARGET_CC) -Icommands/i386 -I$(srcdir)/commands/i386 
$(TARGET_CPPFLAGS)  $(TARGET_CFLAGS) $(cpuid_mod_CFLAGS) -MD -c -o $@ $<
--include cpuid_mod-commands_i386_cpuid.d
-
-CLEANFILES += cmd-cpuid_mod-commands_i386_cpuid.lst 
fs-cpuid_mod-commands_i386_cpuid.lst partmap-cpuid_mod-commands_i386_cpuid.lst
-COMMANDFILES += cmd-cpuid_mod-commands_i386_cpuid.lst
-FSFILES += fs-cpuid_mod-commands_i386_cpuid.lst
-PARTMAPFILES += partmap-cpuid_mod-commands_i386_cpuid.lst
-
-cmd-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) gencmdlist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/gencmdlist.sh cpuid > $@ || (rm -f 
$@; exit 1)
-
-fs-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) genfslist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/genfslist.sh cpuid > $@ || (rm -f 
$@; exit 1)
-
-partmap-cpuid_mod-commands_i386_cpuid.lst: commands/i386/cpuid.c 
$(commands/i386/cpuid.c_DEPENDENCIES) genpartmaplist.sh
-       set -e;           $(TARGET_CC) -Icommands/i386 
-I$(srcdir)/commands/i386 $(TARGET_CPPFLAGS) $(TARGET_CFLAGS) 
$(cpuid_mod_CFLAGS) -E $<    | sh $(srcdir)/genpartmaplist.sh cpuid > $@ || (rm 
-f $@; exit 1)
-
-
-cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
-cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod.
 halt_mod_SOURCES = commands/halt.c
 CLEANFILES += halt.mod mod-halt.o mod-halt.c pre-halt.o 
halt_mod-commands_halt.o und-halt.lst
@@ -1827,4 +1770,5 @@
 datehook_mod_CFLAGS = $(COMMON_CFLAGS)
 datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk

Modified: trunk/grub2/conf/x86_64-efi.rmk
===================================================================
--- trunk/grub2/conf/x86_64-efi.rmk     2008-09-07 15:55:58 UTC (rev 1856)
+++ trunk/grub2/conf/x86_64-efi.rmk     2008-09-07 16:09:21 UTC (rev 1857)
@@ -78,7 +78,7 @@
 
 # Modules.
 pkglib_MODULES = kernel.mod normal.mod _chain.mod chain.mod appleldr.mod \
-       cpuid.mod halt.mod reboot.mod _linux.mod linux.mod pci.mod lspci.mod \
+       halt.mod reboot.mod _linux.mod linux.mod pci.mod lspci.mod \
        datetime.mod date.mod datehook.mod
 
 # For kernel.mod.
@@ -146,11 +146,6 @@
 linux_mod_CFLAGS = $(COMMON_CFLAGS)
 linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
-# For cpuid.mod.
-cpuid_mod_SOURCES = commands/i386/cpuid.c
-cpuid_mod_CFLAGS = $(COMMON_CFLAGS)
-cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
-
 # For halt.mod.
 halt_mod_SOURCES = commands/halt.c
 halt_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -186,4 +181,5 @@
 datehook_mod_CFLAGS = $(COMMON_CFLAGS)
 datehook_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
+include $(srcdir)/conf/i386.mk
 include $(srcdir)/conf/common.mk






reply via email to

[Prev in Thread] Current Thread [Next in Thread]