vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Unified grub-mkimage achieved

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-04-26 13:11:43 +02:00
parent 94ac790645
commit 0253aeb7a1
7 changed files with 836 additions and 714 deletions
Download patch file Download diff file Expand all files Collapse all files

1
conf/common.rmk
View file

@ -18,7 +18,6 @@ endif
bin_UTILITIES += grub-mkimage
grub_mkimage_SOURCES = gnulib/progname.c util/grub-mkimage.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-mkimage.c_DEPENDENCIES = Makefile
# For grub-probe.

4
conf/i386-pc.rmk
View file

@ -1,7 +1,5 @@
# -*- makefile -*-
GRUB_KERNEL_MACHINE_LINK_ADDR = 0x8200
COMMON_CFLAGS = -mrtd -mregparm=3
# Images.
@ -58,7 +56,7 @@ kernel_img_HEADERS += machine/biosdisk.h machine/vga.h machine/vbe.h \
machine/pxe.h i386/pit.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_LDFLAGS += $(COMMON_LDFLAGS) $(TARGET_IMG_LDFLAGS)0x8200 $(COMMON_CFLAGS)
# Utilities.
sbin_UTILITIES = grub-setup