[2357] 2009-06-22 Robert Millan <[email protected]>
Robert Millan <[email protected]> Mon, 22 Jun 2009 10:27:27 +0000
| Newsgroups | gmane.comp.boot-loaders.grub.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 2357
http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2357
Author: robertmh
Date: 2009-06-22 10:27:26 +0000 (Mon, 22 Jun 2009)
Log Message:
-----------
2009-06-22 Robert Millan <[email protected]>
* conf/i386-ieee1275.rmk (pkglib_PROGRAMS): Replace `kernel.elf'
with `kernel.img'.
(kernel_elf_SOURCES): Rename to ...
(kernel_img_SOURCES): ... this.
(kernel_elf_HEADERS): Rename to ...
(kernel_img_HEADERS): ... this. Update all users.
(kernel_elf_ASFLAGS): Rename to ...
(kernel_img_ASFLAGS): ... this.
(kernel_elf_CFLAGS): Rename to ...
(kernel_img_CFLAGS): ... this.
(kernel_elf_LDFLAGS): Rename to ...
(kernel_img_LDFLAGS): ... this.
* conf/i386-coreboot.rmk: Likewise.
* conf/powerpc-ieee1275.rmk: Likewise.
* util/elf/grub-mkimage.c (add_segments): Replace "kernel.elf"
with "kernel.img".
Modified Paths:
--------------
trunk/grub2/ChangeLog
trunk/grub2/conf/i386-coreboot.rmk
trunk/grub2/conf/i386-ieee1275.rmk
trunk/grub2/conf/powerpc-ieee1275.rmk
trunk/grub2/util/elf/grub-mkimage.c
Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog 2009-06-21 23:55:23 UTC (rev 2356)
+++ trunk/grub2/ChangeLog 2009-06-22 10:27:26 UTC (rev 2357)
@@ -1,3 +1,23 @@
+2009-06-22 Robert Millan <[email protected]>
+
+ * conf/i386-ieee1275.rmk (pkglib_PROGRAMS): Replace `kernel.elf'
+ with `kernel.img'.
+ (kernel_elf_SOURCES): Rename to ...
+ (kernel_img_SOURCES): ... this.
+ (kernel_elf_HEADERS): Rename to ...
+ (kernel_img_HEADERS): ... this. Update all users.
+ (kernel_elf_ASFLAGS): Rename to ...
+ (kernel_img_ASFLAGS): ... this.
+ (kernel_elf_CFLAGS): Rename to ...
+ (kernel_img_CFLAGS): ... this.
+ (kernel_elf_LDFLAGS): Rename to ...
+ (kernel_img_LDFLAGS): ... this.
+ * conf/i386-coreboot.rmk: Likewise.
+ * conf/powerpc-ieee1275.rmk: Likewise.
+
+ * util/elf/grub-mkimage.c (add_segments): Replace "kernel.elf"
+ with "kernel.img".
+
2009-06-21 Pavel Roskin <[email protected]>
* loader/powerpc/ieee1275/linux.c (offset_phdr): Fix prototypes
Modified: trunk/grub2/conf/i386-coreboot.rmk
===================================================================
--- trunk/grub2/conf/i386-coreboot.rmk 2009-06-21 23:55:23 UTC (rev 2356)
+++ trunk/grub2/conf/i386-coreboot.rmk 2009-06-22 10:27:26 UTC (rev 2357)
@@ -8,10 +8,10 @@
script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
# Images.
-pkglib_PROGRAMS = kernel.elf
+pkglib_PROGRAMS = kernel.img
-# For kernel.elf.
-kernel_elf_SOURCES = kern/i386/coreboot/startup.S \
+# For kernel.img.
+kernel_img_SOURCES = kern/i386/coreboot/startup.S \
kern/i386/coreboot/init.c \
kern/i386/multiboot_mmap.c \
kern/main.c kern/device.c \
@@ -26,22 +26,22 @@
kern/env.c \
term/i386/pc/vga_text.c term/i386/vga_common.c \
symlist.c
-kernel_elf_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
+kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
partition.h pc_partition.h reader.h symbol.h term.h time.h types.h \
machine/boot.h machine/console.h machine/init.h \
machine/memory.h machine/loader.h list.h handler.h command.h
-kernel_elf_CFLAGS = $(COMMON_CFLAGS)
-kernel_elf_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_elf_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x8200,-Bstatic
+kernel_img_CFLAGS = $(COMMON_CFLAGS)
+kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
+kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x8200,-Bstatic
MOSTLYCLEANFILES += symlist.c kernel_syms.lst
DEFSYMFILES += kernel_syms.lst
-symlist.c: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h gensymlist.sh
+symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h genkernsyms.sh
+kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
# Utilities.
Modified: trunk/grub2/conf/i386-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/i386-ieee1275.rmk 2009-06-21 23:55:23 UTC (rev 2356)
+++ trunk/grub2/conf/i386-ieee1275.rmk 2009-06-22 10:27:26 UTC (rev 2357)
@@ -8,10 +8,10 @@
script/sh/lexer.c_DEPENDENCIES = grub_script.tab.h
# Images.
-pkglib_PROGRAMS = kernel.elf
+pkglib_PROGRAMS = kernel.img
-# For kernel.elf.
-kernel_elf_SOURCES = kern/i386/ieee1275/startup.S kern/i386/ieee1275/init.c \
+# For kernel.img.
+kernel_img_SOURCES = kern/i386/ieee1275/startup.S kern/i386/ieee1275/init.c \
kern/ieee1275/init.c \
kern/ieee1275/mmap.c \
kern/ieee1275/cmain.c kern/ieee1275/openfw.c \
@@ -27,22 +27,22 @@
term/ieee1275/ofconsole.c \
disk/ieee1275/ofdisk.c \
symlist.c
-kernel_elf_HEADERS = cache.h device.h disk.h dl.h elf.h elfload.h \
+kernel_img_HEADERS = cache.h device.h disk.h dl.h elf.h elfload.h \
env.h err.h file.h fs.h kernel.h loader.h misc.h mm.h net.h parser.h \
partition.h pc_partition.h reader.h symbol.h term.h time.h types.h \
ieee1275/ieee1275.h machine/kernel.h machine/loader.h machine/memory.h \
list.h handler.h command.h
-kernel_elf_CFLAGS = $(COMMON_CFLAGS)
-kernel_elf_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_elf_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x10000,-Bstatic
+kernel_img_CFLAGS = $(COMMON_CFLAGS)
+kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
+kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -Wl,-N,-S,-Ttext,0x10000,-Bstatic
MOSTLYCLEANFILES += symlist.c kernel_syms.lst
DEFSYMFILES += kernel_syms.lst
-symlist.c: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h gensymlist.sh
+symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h genkernsyms.sh
+kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
# Utilities.
Modified: trunk/grub2/conf/powerpc-ieee1275.rmk
===================================================================
--- trunk/grub2/conf/powerpc-ieee1275.rmk 2009-06-21 23:55:23 UTC (rev 2356)
+++ trunk/grub2/conf/powerpc-ieee1275.rmk 2009-06-22 10:27:26 UTC (rev 2357)
@@ -13,20 +13,20 @@
MOSTLYCLEANFILES += symlist.c kernel_syms.lst
DEFSYMFILES += kernel_syms.lst
-kernel_elf_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
+kernel_img_HEADERS = boot.h cache.h device.h disk.h dl.h elf.h elfload.h \
env.h err.h file.h fs.h kernel.h misc.h mm.h net.h parser.h reader.h \
symbol.h term.h time.h types.h powerpc/libgcc.h loader.h partition.h \
pc_partition.h ieee1275/ieee1275.h machine/kernel.h handler.h list.h \
command.h
-symlist.c: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h gensymlist.sh
+symlist.c: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h gensymlist.sh
/bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
-kernel_syms.lst: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h genkernsyms.sh
+kernel_syms.lst: $(addprefix include/grub/,$(kernel_img_HEADERS)) config.h genkernsyms.sh
/bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1)
# Programs
-pkglib_PROGRAMS = kernel.elf
+pkglib_PROGRAMS = kernel.img
# Utilities.
sbin_UTILITIES = grub-mkdevicemap
@@ -82,7 +82,7 @@
grub_emu_LDFLAGS = $(LIBCURSES)
-kernel_elf_SOURCES = kern/powerpc/ieee1275/startup.S kern/ieee1275/cmain.c \
+kernel_img_SOURCES = kern/powerpc/ieee1275/startup.S kern/ieee1275/cmain.c \
kern/ieee1275/ieee1275.c kern/main.c kern/device.c \
kern/disk.c kern/dl.c kern/err.c kern/file.c kern/fs.c \
kern/misc.c kern/mm.c kern/reader.c kern/term.c \
@@ -95,9 +95,9 @@
kern/parser.c kern/partition.c kern/env.c kern/powerpc/dl.c \
kern/generic/millisleep.c kern/time.c \
symlist.c kern/powerpc/cache.S
-kernel_elf_CFLAGS = $(COMMON_CFLAGS)
-kernel_elf_ASFLAGS = $(COMMON_ASFLAGS)
-kernel_elf_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
+kernel_img_CFLAGS = $(COMMON_CFLAGS)
+kernel_img_ASFLAGS = $(COMMON_ASFLAGS)
+kernel_img_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \
-Wl,-N,-S,-Ttext,0x200000,-Bstatic
# Scripts.
Modified: trunk/grub2/util/elf/grub-mkimage.c
===================================================================
--- trunk/grub2/util/elf/grub-mkimage.c 2009-06-21 23:55:23 UTC (rev 2356)
+++ trunk/grub2/util/elf/grub-mkimage.c 2009-06-22 10:27:26 UTC (rev 2357)
@@ -193,7 +193,7 @@
int i, phdr_size;
/* Read ELF header. */
- kernel_path = grub_util_get_path (dir, "kernel.elf");
+ kernel_path = grub_util_get_path (dir, "kernel.img");
in = fopen (kernel_path, "rb");
if (! in)
grub_util_error ("cannot open %s", kernel_path);