merge mainline into rescue-efi

[grub2.git] / conf / i386-pc.rmk

diff --git a/conf/i386-pc.rmk b/conf/i386-pc.rmk
index 19c9965439f2f4fdac7866ddeac727294c3cbd7e..8e50ee88916e4f0d9f8834f17bb1c9c9e4e1243a 100644 (file)
--- a/conf/i386-pc.rmk
+++ b/conf/i386-pc.rmk
@@ -1,12 +1,9 @@
 # -*- makefile -*-
 
-GRUB_KERNEL_MACHINE_LINK_ADDR = 0x8200
-
 COMMON_CFLAGS = -mrtd -mregparm=3
 
 # Images.
-pkglib_IMAGES = boot.img cdboot.img diskboot.img kernel.img lnxboot.img \
-       pxeboot.img
+pkglib_IMAGES = boot.img cdboot.img diskboot.img lnxboot.img pxeboot.img
 
 # For boot.img.
 boot_img_SOURCES = boot/i386/pc/boot.S
@@ -39,6 +36,7 @@ cdboot_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x7C00
 cdboot_img_FORMAT = binary
 
 # For kernel.img.
+pkglib_PROGRAMS = kernel.img
 kernel_img_SOURCES = kern/i386/pc/startup.S \
        kern/i386/misc.S \
        kern/main.c kern/device.c \
@@ -55,40 +53,33 @@ kernel_img_SOURCES = kern/i386/pc/startup.S \
        term/i386/pc/console.c term/i386/vga_common.c \
        symlist.c
 kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
-       machine/pxe.h i386/pit.h machine/init.h
+       machine/pxe.h i386/pit.h machine/kernel.h
 kernel_img_CFLAGS = $(COMMON_CFLAGS)  $(TARGET_IMG_CFLAGS)
 kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
-kernel_img_FORMAT = binary
+kernel_img_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x8200 $(COMMON_CFLAGS)
 
 # Utilities.
-bin_UTILITIES = grub-mkimage
 sbin_UTILITIES = grub-setup
 
-# For grub-mkimage.
-grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkrawimage.c util/misc.c \
-       util/resolve.c lib/LzmaEnc.c lib/LzFind.c
-grub_mkimage_CFLAGS = -DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
-util/grub-mkrawimage.c_DEPENDENCIES = Makefile
-
 # For grub-setup.
 util/i386/pc/grub-setup.c_DEPENDENCIES = grub_setup_init.h
-grub_setup_SOURCES = gnulib/progname.c \
-       util/i386/pc/grub-setup.c util/hostdisk.c       \
-       util/misc.c util/getroot.c kern/device.c kern/disk.c    \
-       kern/err.c kern/misc.c kern/parser.c kern/partition.c   \
-       kern/file.c kern/fs.c kern/env.c fs/fshelp.c            \
-       \
-       fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c         \
-       fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c  \
-       fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c fs/sfs.c          \
-       fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c fs/afs_be.c        \
-       fs/befs.c fs/befs_be.c fs/tar.c                 \
-       \
-       partmap/msdos.c partmap/gpt.c                           \
-       \
-       disk/raid.c disk/mdraid_linux.c disk/lvm.c              \
-       util/raid.c util/lvm.c                  \
+grub_setup_SOURCES = gnulib/progname.c util/i386/pc/grub-setup.c       \
+       util/misc.c kern/emu/misc.c kern/emu/getroot.c                  \
+       kern/emu/hostdisk.c kern/device.c kern/disk.c kern/err.c        \
+       kern/misc.c kern/parser.c kern/partition.c kern/file.c          \
+       kern/emu/mm.c kern/fs.c kern/env.c kern/list.c fs/fshelp.c      \
+                                                                       \
+       fs/affs.c fs/cpio.c fs/ext2.c fs/fat.c fs/hfs.c                 \
+       fs/hfsplus.c fs/iso9660.c fs/udf.c fs/jfs.c fs/minix.c          \
+       fs/nilfs2.c fs/ntfs.c fs/ntfscomp.c fs/reiserfs.c               \
+       fs/sfs.c fs/ufs.c fs/ufs2.c fs/xfs.c fs/afs.c                   \
+       fs/afs_be.c fs/befs.c fs/befs_be.c fs/tar.c                     \
+                                                                       \
+       partmap/msdos.c partmap/bsdlabel.c partmap/sunpc.c              \
+       partmap/gpt.c                                                   \
+                                                                       \
+       disk/raid.c disk/mdraid_linux.c disk/lvm.c                      \
+       util/raid.c util/lvm.c                                          \
        grub_setup_init.c
 
 sbin_SCRIPTS += grub-install
@@ -183,7 +174,7 @@ vbetest_mod_CFLAGS = $(COMMON_CFLAGS)
 vbetest_mod_LDFLAGS = $(COMMON_LDFLAGS)
 
 # For vga.mod.
-vga_mod_SOURCES = term/i386/pc/vga.c
+vga_mod_SOURCES = video/i386/pc/vga.c
 vga_mod_CFLAGS = $(COMMON_CFLAGS)
 vga_mod_LDFLAGS = $(COMMON_LDFLAGS)