[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[2360] 2009-06-22 Robert Millan <address@hidden>
From: |
Robert Millan |
Subject: |
[2360] 2009-06-22 Robert Millan <address@hidden> |
Date: |
Mon, 22 Jun 2009 19:23:22 +0000 |
Revision: 2360
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2360
Author: robertmh
Date: 2009-06-22 19:23:22 +0000 (Mon, 22 Jun 2009)
Log Message:
-----------
2009-06-22 Robert Millan <address@hidden>
* conf/i386-pc.rmk (GRUB_MEMORY_MACHINE_LINK_ADDR): Rename to ...
(GRUB_KERNEL_MACHINE_LINK_ADDR): ... this. Update all users.
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/conf/i386-pc.rmk
trunk/grub2/util/i386/pc/grub-mkimage.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-06-22 18:04:37 UTC (rev 2359)
+++ trunk/grub2/ChangeLog 2009-06-22 19:23:22 UTC (rev 2360)
@@ -1,5 +1,10 @@
2009-06-22 Robert Millan <address@hidden>
+ * conf/i386-pc.rmk (GRUB_MEMORY_MACHINE_LINK_ADDR): Rename to ...
+ (GRUB_KERNEL_MACHINE_LINK_ADDR): ... this. Update all users.
+
+2009-06-22 Robert Millan <address@hidden>
+
* conf/i386-pc.rmk (kernel_img_SOURCES): Add `kern/i386/misc.S'.
* conf/i386-ieee1275.rmk: Likewise.
* conf/i386-coreboot.rmk: Likewise.
Modified: trunk/grub2/conf/i386-pc.rmk
===================================================================
--- trunk/grub2/conf/i386-pc.rmk 2009-06-22 18:04:37 UTC (rev 2359)
+++ trunk/grub2/conf/i386-pc.rmk 2009-06-22 19:23:22 UTC (rev 2360)
@@ -1,6 +1,6 @@
# -*- makefile -*-
-GRUB_MEMORY_MACHINE_LINK_ADDR = 0x8200
+GRUB_KERNEL_MACHINE_LINK_ADDR = 0x8200
COMMON_ASFLAGS = -nostdinc -fno-builtin -m32
COMMON_CFLAGS = -fno-builtin -mrtd -mregparm=3 -m32
@@ -69,7 +69,7 @@
machine/kernel.h machine/pxe.h i386/pit.h list.h handler.h command.h
kernel_img_CFLAGS = $(COMMON_CFLAGS) $(TARGET_IMG_CFLAGS)
kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
$(TARGET_IMG_LDFLAGS)$(GRUB_MEMORY_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
+kernel_img_LDFLAGS = $(COMMON_LDFLAGS)
$(TARGET_IMG_LDFLAGS)$(GRUB_KERNEL_MACHINE_LINK_ADDR) $(COMMON_CFLAGS)
kernel_img_FORMAT = binary
MOSTLYCLEANFILES += symlist.c kernel_syms.lst
@@ -97,7 +97,7 @@
grub_mkimage_SOURCES = util/i386/pc/grub-mkimage.c util/misc.c \
util/resolve.c lib/LzmaEnc.c lib/LzFind.c
endif
-grub_mkimage_CFLAGS =
-DGRUB_MEMORY_MACHINE_LINK_ADDR=$(GRUB_MEMORY_MACHINE_LINK_ADDR)
+grub_mkimage_CFLAGS =
-DGRUB_KERNEL_MACHINE_LINK_ADDR=$(GRUB_KERNEL_MACHINE_LINK_ADDR)
util/i386/pc/grub-mkimage.c_DEPENDENCIES = Makefile
# For grub-setup.
Modified: trunk/grub2/util/i386/pc/grub-mkimage.c
===================================================================
--- trunk/grub2/util/i386/pc/grub-mkimage.c 2009-06-22 18:04:37 UTC (rev
2359)
+++ trunk/grub2/util/i386/pc/grub-mkimage.c 2009-06-22 19:23:22 UTC (rev
2360)
@@ -270,9 +270,9 @@
= grub_cpu_to_le32 (-2);
}
- if (GRUB_MEMORY_MACHINE_LINK_ADDR + core_size > GRUB_MEMORY_MACHINE_UPPER)
+ if (GRUB_KERNEL_MACHINE_LINK_ADDR + core_size > GRUB_MEMORY_MACHINE_UPPER)
grub_util_error ("Core image is too big (%p > %p)\n",
- GRUB_MEMORY_MACHINE_LINK_ADDR + core_size,
GRUB_MEMORY_MACHINE_UPPER);
+ GRUB_KERNEL_MACHINE_LINK_ADDR + core_size,
GRUB_MEMORY_MACHINE_UPPER);
grub_util_write_image (core_img, core_size, out);
free (kernel_img);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [2360] 2009-06-22 Robert Millan <address@hidden>,
Robert Millan <=