From: marco_g Date: Mon, 8 May 2006 21:47:20 +0000 (+0000) Subject: 2006-05-08 Marco Gerards X-Git-Tag: 1.98~1969 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f0413bd2a08fa670051b87827c8002cd14bb90e;p=thirdparty%2Fgrub.git 2006-05-08 Marco Gerards * conf/powerpc-ieee1275.rmk (grubof_HEADERS): Renamed from this... (kernel_elf_HEADERS): ...to this. Updated all users. (grubof_symlist.c): Renamed from this... (kernel_elf_symlist.c): ...to this. Updated all users. (pkgdata_PROGRAMS): Changed `grubof' to `kernel.elf'. (grubof_SOURCES): Renamed from this... (kernel_elf_SOURCES): ...to this. (grubof_HEADERS): Renamed from this... (kernel_elf_HEADERS): ...to this. (grubof_CFLAGS): Renamed from this... (kernel_elf_CFLAGS): ...to this. (grubof_ASFLAGS): Renamed from this... (kernel_elf_ASFLAGS): ...to this. (grubof_LDFLAGS): Renamed from this... (kernel_elf_LDFLAGS): ...to this. * conf/sparc64-ieee1275.rmk (grubof_HEADERS): Renamed from this... (kernel_elf_HEADERS): ...to this. Updated all users. (grubof_symlist.c): Renamed from this... (kernel_elf_symlist.c): ...to this. Updated all users. (pkgdata_PROGRAMS): Changed `grubof' to `kernel.elf'. (grubof_SOURCES): Renamed from this... (kernel_elf_SOURCES): ...to this. (grubof_HEADERS): Renamed from this... (kernel_elf_HEADERS): ...to this. (grubof_CFLAGS): Renamed from this... (kernel_elf_CFLAGS): ...to this. (grubof_ASFLAGS): Renamed from this... (kernel_elf_ASFLAGS): ...to this. (grubof_LDFLAGS): Renamed from this... (kernel_elf_LDFLAGS): ...to this. * util/powerpc/ieee1275/grub-mkimage.c (add_segments): Use `kernel.elf' instead of `grubof'. --- diff --git a/ChangeLog b/ChangeLog index 28419bf7a..d13e1edfc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,42 @@ +2006-05-08 Marco Gerards + + * conf/powerpc-ieee1275.rmk (grubof_HEADERS): Renamed from + this... + (kernel_elf_HEADERS): ...to this. Updated all users. + (grubof_symlist.c): Renamed from this... + (kernel_elf_symlist.c): ...to this. Updated all users. + (pkgdata_PROGRAMS): Changed `grubof' to `kernel.elf'. + (grubof_SOURCES): Renamed from this... + (kernel_elf_SOURCES): ...to this. + (grubof_HEADERS): Renamed from this... + (kernel_elf_HEADERS): ...to this. + (grubof_CFLAGS): Renamed from this... + (kernel_elf_CFLAGS): ...to this. + (grubof_ASFLAGS): Renamed from this... + (kernel_elf_ASFLAGS): ...to this. + (grubof_LDFLAGS): Renamed from this... + (kernel_elf_LDFLAGS): ...to this. + + * conf/sparc64-ieee1275.rmk (grubof_HEADERS): Renamed from + this... + (kernel_elf_HEADERS): ...to this. Updated all users. + (grubof_symlist.c): Renamed from this... + (kernel_elf_symlist.c): ...to this. Updated all users. + (pkgdata_PROGRAMS): Changed `grubof' to `kernel.elf'. + (grubof_SOURCES): Renamed from this... + (kernel_elf_SOURCES): ...to this. + (grubof_HEADERS): Renamed from this... + (kernel_elf_HEADERS): ...to this. + (grubof_CFLAGS): Renamed from this... + (kernel_elf_CFLAGS): ...to this. + (grubof_ASFLAGS): Renamed from this... + (kernel_elf_ASFLAGS): ...to this. + (grubof_LDFLAGS): Renamed from this... + (kernel_elf_LDFLAGS): ...to this. + + * util/powerpc/ieee1275/grub-mkimage.c (add_segments): Use + `kernel.elf' instead of `grubof'. + 2006-05-08 Yoshinori K. Okuji Add --with-platform to configure. Use pkglibdir instead of diff --git a/conf/powerpc-ieee1275.mk b/conf/powerpc-ieee1275.mk index 9afc70ba9..30dd778dc 100644 --- a/conf/powerpc-ieee1275.mk +++ b/conf/powerpc-ieee1275.mk @@ -7,23 +7,23 @@ COMMON_LDFLAGS += -nostdlib # Images. -MOSTLYCLEANFILES += grubof_symlist.c kernel_syms.lst +MOSTLYCLEANFILES += kernel_elf_symlist.c kernel_syms.lst DEFSYMFILES += kernel_syms.lst -grubof_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \ +kernel_elf_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \ file.h fs.h kernel.h misc.h mm.h net.h parser.h rescue.h symbol.h \ term.h types.h powerpc/libgcc.h loader.h \ partition.h pc_partition.h ieee1275/ieee1275.h machine/time.h \ machine/kernel.h -grubof_symlist.c: $(addprefix include/grub/,$(grubof_HEADERS)) config.h gensymlist.sh +kernel_elf_symlist.c: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h gensymlist.sh /bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1) -kernel_syms.lst: $(addprefix include/grub/,$(grubof_HEADERS)) config.h genkernsyms.sh +kernel_syms.lst: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h genkernsyms.sh /bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1) # Programs -pkgdata_PROGRAMS = grubof +pkgdata_PROGRAMS = kernel.elf # Utilities. bin_UTILITIES = grub-emu @@ -607,224 +607,224 @@ grub_emu-grub_emu_init.d: grub_emu_init.c grub_emu_LDFLAGS = $(LIBCURSES) -grubof_SOURCES = kern/powerpc/ieee1275/crt0.S kern/powerpc/ieee1275/cmain.c \ +kernel_elf_SOURCES = kern/powerpc/ieee1275/crt0.S kern/powerpc/ieee1275/cmain.c \ kern/ieee1275/ieee1275.c kern/main.c kern/device.c \ kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \ kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c \ kern/powerpc/ieee1275/init.c term/ieee1275/ofconsole.c \ kern/powerpc/ieee1275/openfw.c disk/ieee1275/ofdisk.c \ kern/parser.c kern/partition.c kern/env.c kern/powerpc/dl.c \ - grubof_symlist.c kern/powerpc/cache.S -CLEANFILES += grubof grubof-kern_powerpc_ieee1275_crt0.o grubof-kern_powerpc_ieee1275_cmain.o grubof-kern_ieee1275_ieee1275.o grubof-kern_main.o grubof-kern_device.o grubof-kern_disk.o grubof-kern_dl.o grubof-kern_file.o grubof-kern_fs.o grubof-kern_err.o grubof-kern_misc.o grubof-kern_mm.o grubof-kern_loader.o grubof-kern_rescue.o grubof-kern_term.o grubof-kern_powerpc_ieee1275_init.o grubof-term_ieee1275_ofconsole.o grubof-kern_powerpc_ieee1275_openfw.o grubof-disk_ieee1275_ofdisk.o grubof-kern_parser.o grubof-kern_partition.o grubof-kern_env.o grubof-kern_powerpc_dl.o grubof-grubof_symlist.o grubof-kern_powerpc_cache.o -MOSTLYCLEANFILES += grubof-kern_powerpc_ieee1275_crt0.d grubof-kern_powerpc_ieee1275_cmain.d grubof-kern_ieee1275_ieee1275.d grubof-kern_main.d grubof-kern_device.d grubof-kern_disk.d grubof-kern_dl.d grubof-kern_file.d grubof-kern_fs.d grubof-kern_err.d grubof-kern_misc.d grubof-kern_mm.d grubof-kern_loader.d grubof-kern_rescue.d grubof-kern_term.d grubof-kern_powerpc_ieee1275_init.d grubof-term_ieee1275_ofconsole.d grubof-kern_powerpc_ieee1275_openfw.d grubof-disk_ieee1275_ofdisk.d grubof-kern_parser.d grubof-kern_partition.d grubof-kern_env.d grubof-kern_powerpc_dl.d grubof-grubof_symlist.d grubof-kern_powerpc_cache.d + kernel_elf_symlist.c kern/powerpc/cache.S +CLEANFILES += kernel.elf kernel_elf-kern_powerpc_ieee1275_crt0.o kernel_elf-kern_powerpc_ieee1275_cmain.o kernel_elf-kern_ieee1275_ieee1275.o kernel_elf-kern_main.o kernel_elf-kern_device.o kernel_elf-kern_disk.o kernel_elf-kern_dl.o kernel_elf-kern_file.o kernel_elf-kern_fs.o kernel_elf-kern_err.o kernel_elf-kern_misc.o kernel_elf-kern_mm.o kernel_elf-kern_loader.o kernel_elf-kern_rescue.o kernel_elf-kern_term.o kernel_elf-kern_powerpc_ieee1275_init.o kernel_elf-term_ieee1275_ofconsole.o kernel_elf-kern_powerpc_ieee1275_openfw.o kernel_elf-disk_ieee1275_ofdisk.o kernel_elf-kern_parser.o kernel_elf-kern_partition.o kernel_elf-kern_env.o kernel_elf-kern_powerpc_dl.o kernel_elf-kernel_elf_symlist.o kernel_elf-kern_powerpc_cache.o +MOSTLYCLEANFILES += kernel_elf-kern_powerpc_ieee1275_crt0.d kernel_elf-kern_powerpc_ieee1275_cmain.d kernel_elf-kern_ieee1275_ieee1275.d kernel_elf-kern_main.d kernel_elf-kern_device.d kernel_elf-kern_disk.d kernel_elf-kern_dl.d kernel_elf-kern_file.d kernel_elf-kern_fs.d kernel_elf-kern_err.d kernel_elf-kern_misc.d kernel_elf-kern_mm.d kernel_elf-kern_loader.d kernel_elf-kern_rescue.d kernel_elf-kern_term.d kernel_elf-kern_powerpc_ieee1275_init.d kernel_elf-term_ieee1275_ofconsole.d kernel_elf-kern_powerpc_ieee1275_openfw.d kernel_elf-disk_ieee1275_ofdisk.d kernel_elf-kern_parser.d kernel_elf-kern_partition.d kernel_elf-kern_env.d kernel_elf-kern_powerpc_dl.d kernel_elf-kernel_elf_symlist.d kernel_elf-kern_powerpc_cache.d -grubof: grubof-kern_powerpc_ieee1275_crt0.o grubof-kern_powerpc_ieee1275_cmain.o grubof-kern_ieee1275_ieee1275.o grubof-kern_main.o grubof-kern_device.o grubof-kern_disk.o grubof-kern_dl.o grubof-kern_file.o grubof-kern_fs.o grubof-kern_err.o grubof-kern_misc.o grubof-kern_mm.o grubof-kern_loader.o grubof-kern_rescue.o grubof-kern_term.o grubof-kern_powerpc_ieee1275_init.o grubof-term_ieee1275_ofconsole.o grubof-kern_powerpc_ieee1275_openfw.o grubof-disk_ieee1275_ofdisk.o grubof-kern_parser.o grubof-kern_partition.o grubof-kern_env.o grubof-kern_powerpc_dl.o grubof-grubof_symlist.o grubof-kern_powerpc_cache.o - $(CC) -o $@ $^ $(LDFLAGS) $(grubof_LDFLAGS) +kernel.elf: kernel_elf-kern_powerpc_ieee1275_crt0.o kernel_elf-kern_powerpc_ieee1275_cmain.o kernel_elf-kern_ieee1275_ieee1275.o kernel_elf-kern_main.o kernel_elf-kern_device.o kernel_elf-kern_disk.o kernel_elf-kern_dl.o kernel_elf-kern_file.o kernel_elf-kern_fs.o kernel_elf-kern_err.o kernel_elf-kern_misc.o kernel_elf-kern_mm.o kernel_elf-kern_loader.o kernel_elf-kern_rescue.o kernel_elf-kern_term.o kernel_elf-kern_powerpc_ieee1275_init.o kernel_elf-term_ieee1275_ofconsole.o kernel_elf-kern_powerpc_ieee1275_openfw.o kernel_elf-disk_ieee1275_ofdisk.o kernel_elf-kern_parser.o kernel_elf-kern_partition.o kernel_elf-kern_env.o kernel_elf-kern_powerpc_dl.o kernel_elf-kernel_elf_symlist.o kernel_elf-kern_powerpc_cache.o + $(CC) -o $@ $^ $(LDFLAGS) $(kernel_elf_LDFLAGS) -grubof-kern_powerpc_ieee1275_crt0.o: kern/powerpc/ieee1275/crt0.S - $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_powerpc_ieee1275_crt0.o: kern/powerpc/ieee1275/crt0.S + $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_powerpc_ieee1275_crt0.d: kern/powerpc/ieee1275/crt0.S - set -e; $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,crt0\.o[ :]*,grubof-kern_powerpc_ieee1275_crt0.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_powerpc_ieee1275_crt0.d: kern/powerpc/ieee1275/crt0.S + set -e; $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,crt0\.o[ :]*,kernel_elf-kern_powerpc_ieee1275_crt0.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_powerpc_ieee1275_crt0.d +-include kernel_elf-kern_powerpc_ieee1275_crt0.d -grubof-kern_powerpc_ieee1275_cmain.o: kern/powerpc/ieee1275/cmain.c - $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_powerpc_ieee1275_cmain.o: kern/powerpc/ieee1275/cmain.c + $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_powerpc_ieee1275_cmain.d: kern/powerpc/ieee1275/cmain.c - set -e; $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,cmain\.o[ :]*,grubof-kern_powerpc_ieee1275_cmain.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_powerpc_ieee1275_cmain.d: kern/powerpc/ieee1275/cmain.c + set -e; $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,cmain\.o[ :]*,kernel_elf-kern_powerpc_ieee1275_cmain.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_powerpc_ieee1275_cmain.d +-include kernel_elf-kern_powerpc_ieee1275_cmain.d -grubof-kern_ieee1275_ieee1275.o: kern/ieee1275/ieee1275.c - $(CC) -Ikern/ieee1275 -I$(srcdir)/kern/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_ieee1275_ieee1275.o: kern/ieee1275/ieee1275.c + $(CC) -Ikern/ieee1275 -I$(srcdir)/kern/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_ieee1275_ieee1275.d: kern/ieee1275/ieee1275.c - set -e; $(CC) -Ikern/ieee1275 -I$(srcdir)/kern/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,ieee1275\.o[ :]*,grubof-kern_ieee1275_ieee1275.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_ieee1275_ieee1275.d: kern/ieee1275/ieee1275.c + set -e; $(CC) -Ikern/ieee1275 -I$(srcdir)/kern/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,ieee1275\.o[ :]*,kernel_elf-kern_ieee1275_ieee1275.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_ieee1275_ieee1275.d +-include kernel_elf-kern_ieee1275_ieee1275.d -grubof-kern_main.o: kern/main.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_main.o: kern/main.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_main.d: kern/main.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,main\.o[ :]*,grubof-kern_main.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_main.d: kern/main.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,main\.o[ :]*,kernel_elf-kern_main.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_main.d +-include kernel_elf-kern_main.d -grubof-kern_device.o: kern/device.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_device.o: kern/device.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_device.d: kern/device.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,device\.o[ :]*,grubof-kern_device.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_device.d: kern/device.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,device\.o[ :]*,kernel_elf-kern_device.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_device.d +-include kernel_elf-kern_device.d -grubof-kern_disk.o: kern/disk.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_disk.o: kern/disk.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_disk.d: kern/disk.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,disk\.o[ :]*,grubof-kern_disk.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_disk.d: kern/disk.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,disk\.o[ :]*,kernel_elf-kern_disk.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_disk.d +-include kernel_elf-kern_disk.d -grubof-kern_dl.o: kern/dl.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_dl.o: kern/dl.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_dl.d: kern/dl.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,dl\.o[ :]*,grubof-kern_dl.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_dl.d: kern/dl.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,dl\.o[ :]*,kernel_elf-kern_dl.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_dl.d +-include kernel_elf-kern_dl.d -grubof-kern_file.o: kern/file.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_file.o: kern/file.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_file.d: kern/file.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,file\.o[ :]*,grubof-kern_file.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_file.d: kern/file.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,file\.o[ :]*,kernel_elf-kern_file.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_file.d +-include kernel_elf-kern_file.d -grubof-kern_fs.o: kern/fs.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_fs.o: kern/fs.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_fs.d: kern/fs.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,fs\.o[ :]*,grubof-kern_fs.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_fs.d: kern/fs.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,fs\.o[ :]*,kernel_elf-kern_fs.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_fs.d +-include kernel_elf-kern_fs.d -grubof-kern_err.o: kern/err.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_err.o: kern/err.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_err.d: kern/err.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,err\.o[ :]*,grubof-kern_err.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_err.d: kern/err.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,err\.o[ :]*,kernel_elf-kern_err.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_err.d +-include kernel_elf-kern_err.d -grubof-kern_misc.o: kern/misc.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_misc.o: kern/misc.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_misc.d: kern/misc.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,misc\.o[ :]*,grubof-kern_misc.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_misc.d: kern/misc.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,misc\.o[ :]*,kernel_elf-kern_misc.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_misc.d +-include kernel_elf-kern_misc.d -grubof-kern_mm.o: kern/mm.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_mm.o: kern/mm.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_mm.d: kern/mm.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,mm\.o[ :]*,grubof-kern_mm.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_mm.d: kern/mm.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,mm\.o[ :]*,kernel_elf-kern_mm.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_mm.d +-include kernel_elf-kern_mm.d -grubof-kern_loader.o: kern/loader.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_loader.o: kern/loader.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_loader.d: kern/loader.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,loader\.o[ :]*,grubof-kern_loader.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_loader.d: kern/loader.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,loader\.o[ :]*,kernel_elf-kern_loader.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_loader.d +-include kernel_elf-kern_loader.d -grubof-kern_rescue.o: kern/rescue.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_rescue.o: kern/rescue.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_rescue.d: kern/rescue.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,rescue\.o[ :]*,grubof-kern_rescue.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_rescue.d: kern/rescue.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,rescue\.o[ :]*,kernel_elf-kern_rescue.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_rescue.d +-include kernel_elf-kern_rescue.d -grubof-kern_term.o: kern/term.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_term.o: kern/term.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_term.d: kern/term.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,term\.o[ :]*,grubof-kern_term.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_term.d: kern/term.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,term\.o[ :]*,kernel_elf-kern_term.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_term.d +-include kernel_elf-kern_term.d -grubof-kern_powerpc_ieee1275_init.o: kern/powerpc/ieee1275/init.c - $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_powerpc_ieee1275_init.o: kern/powerpc/ieee1275/init.c + $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_powerpc_ieee1275_init.d: kern/powerpc/ieee1275/init.c - set -e; $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,init\.o[ :]*,grubof-kern_powerpc_ieee1275_init.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_powerpc_ieee1275_init.d: kern/powerpc/ieee1275/init.c + set -e; $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,init\.o[ :]*,kernel_elf-kern_powerpc_ieee1275_init.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_powerpc_ieee1275_init.d +-include kernel_elf-kern_powerpc_ieee1275_init.d -grubof-term_ieee1275_ofconsole.o: term/ieee1275/ofconsole.c - $(CC) -Iterm/ieee1275 -I$(srcdir)/term/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-term_ieee1275_ofconsole.o: term/ieee1275/ofconsole.c + $(CC) -Iterm/ieee1275 -I$(srcdir)/term/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-term_ieee1275_ofconsole.d: term/ieee1275/ofconsole.c - set -e; $(CC) -Iterm/ieee1275 -I$(srcdir)/term/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,ofconsole\.o[ :]*,grubof-term_ieee1275_ofconsole.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-term_ieee1275_ofconsole.d: term/ieee1275/ofconsole.c + set -e; $(CC) -Iterm/ieee1275 -I$(srcdir)/term/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,ofconsole\.o[ :]*,kernel_elf-term_ieee1275_ofconsole.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-term_ieee1275_ofconsole.d +-include kernel_elf-term_ieee1275_ofconsole.d -grubof-kern_powerpc_ieee1275_openfw.o: kern/powerpc/ieee1275/openfw.c - $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_powerpc_ieee1275_openfw.o: kern/powerpc/ieee1275/openfw.c + $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_powerpc_ieee1275_openfw.d: kern/powerpc/ieee1275/openfw.c - set -e; $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,openfw\.o[ :]*,grubof-kern_powerpc_ieee1275_openfw.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_powerpc_ieee1275_openfw.d: kern/powerpc/ieee1275/openfw.c + set -e; $(CC) -Ikern/powerpc/ieee1275 -I$(srcdir)/kern/powerpc/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,openfw\.o[ :]*,kernel_elf-kern_powerpc_ieee1275_openfw.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_powerpc_ieee1275_openfw.d +-include kernel_elf-kern_powerpc_ieee1275_openfw.d -grubof-disk_ieee1275_ofdisk.o: disk/ieee1275/ofdisk.c - $(CC) -Idisk/ieee1275 -I$(srcdir)/disk/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-disk_ieee1275_ofdisk.o: disk/ieee1275/ofdisk.c + $(CC) -Idisk/ieee1275 -I$(srcdir)/disk/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-disk_ieee1275_ofdisk.d: disk/ieee1275/ofdisk.c - set -e; $(CC) -Idisk/ieee1275 -I$(srcdir)/disk/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,ofdisk\.o[ :]*,grubof-disk_ieee1275_ofdisk.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-disk_ieee1275_ofdisk.d: disk/ieee1275/ofdisk.c + set -e; $(CC) -Idisk/ieee1275 -I$(srcdir)/disk/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,ofdisk\.o[ :]*,kernel_elf-disk_ieee1275_ofdisk.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-disk_ieee1275_ofdisk.d +-include kernel_elf-disk_ieee1275_ofdisk.d -grubof-kern_parser.o: kern/parser.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_parser.o: kern/parser.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_parser.d: kern/parser.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,parser\.o[ :]*,grubof-kern_parser.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_parser.d: kern/parser.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,parser\.o[ :]*,kernel_elf-kern_parser.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_parser.d +-include kernel_elf-kern_parser.d -grubof-kern_partition.o: kern/partition.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_partition.o: kern/partition.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_partition.d: kern/partition.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,partition\.o[ :]*,grubof-kern_partition.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_partition.d: kern/partition.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,partition\.o[ :]*,kernel_elf-kern_partition.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_partition.d +-include kernel_elf-kern_partition.d -grubof-kern_env.o: kern/env.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_env.o: kern/env.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_env.d: kern/env.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,env\.o[ :]*,grubof-kern_env.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_env.d: kern/env.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,env\.o[ :]*,kernel_elf-kern_env.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_env.d +-include kernel_elf-kern_env.d -grubof-kern_powerpc_dl.o: kern/powerpc/dl.c - $(CC) -Ikern/powerpc -I$(srcdir)/kern/powerpc $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_powerpc_dl.o: kern/powerpc/dl.c + $(CC) -Ikern/powerpc -I$(srcdir)/kern/powerpc $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_powerpc_dl.d: kern/powerpc/dl.c - set -e; $(CC) -Ikern/powerpc -I$(srcdir)/kern/powerpc $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,dl\.o[ :]*,grubof-kern_powerpc_dl.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_powerpc_dl.d: kern/powerpc/dl.c + set -e; $(CC) -Ikern/powerpc -I$(srcdir)/kern/powerpc $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,dl\.o[ :]*,kernel_elf-kern_powerpc_dl.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_powerpc_dl.d +-include kernel_elf-kern_powerpc_dl.d -grubof-grubof_symlist.o: grubof_symlist.c - $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kernel_elf_symlist.o: kernel_elf_symlist.c + $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-grubof_symlist.d: grubof_symlist.c - set -e; $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,grubof_symlist\.o[ :]*,grubof-grubof_symlist.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kernel_elf_symlist.d: kernel_elf_symlist.c + set -e; $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,kernel_elf_symlist\.o[ :]*,kernel_elf-kernel_elf_symlist.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-grubof_symlist.d +-include kernel_elf-kernel_elf_symlist.d -grubof-kern_powerpc_cache.o: kern/powerpc/cache.S - $(CC) -Ikern/powerpc -I$(srcdir)/kern/powerpc $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_powerpc_cache.o: kern/powerpc/cache.S + $(CC) -Ikern/powerpc -I$(srcdir)/kern/powerpc $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_powerpc_cache.d: kern/powerpc/cache.S - set -e; $(CC) -Ikern/powerpc -I$(srcdir)/kern/powerpc $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,cache\.o[ :]*,grubof-kern_powerpc_cache.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_powerpc_cache.d: kern/powerpc/cache.S + set -e; $(CC) -Ikern/powerpc -I$(srcdir)/kern/powerpc $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,cache\.o[ :]*,kernel_elf-kern_powerpc_cache.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_powerpc_cache.d +-include kernel_elf-kern_powerpc_cache.d -grubof_HEADERS = grub/powerpc/ieee1275/ieee1275.h -grubof_CFLAGS = $(COMMON_CFLAGS) -grubof_ASFLAGS = $(COMMON_ASFLAGS) -grubof_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \ +kernel_elf_HEADERS = grub/powerpc/ieee1275/ieee1275.h +kernel_elf_CFLAGS = $(COMMON_CFLAGS) +kernel_elf_ASFLAGS = $(COMMON_ASFLAGS) +kernel_elf_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \ -Wl,-N,-S,-Ttext,0x200000,-Bstatic # For genmoddep. diff --git a/conf/powerpc-ieee1275.rmk b/conf/powerpc-ieee1275.rmk index cc38da30f..70f599db1 100644 --- a/conf/powerpc-ieee1275.rmk +++ b/conf/powerpc-ieee1275.rmk @@ -7,23 +7,23 @@ COMMON_LDFLAGS += -nostdlib # Images. -MOSTLYCLEANFILES += grubof_symlist.c kernel_syms.lst +MOSTLYCLEANFILES += kernel_elf_symlist.c kernel_syms.lst DEFSYMFILES += kernel_syms.lst -grubof_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \ +kernel_elf_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \ file.h fs.h kernel.h misc.h mm.h net.h parser.h rescue.h symbol.h \ term.h types.h powerpc/libgcc.h loader.h \ partition.h pc_partition.h ieee1275/ieee1275.h machine/time.h \ machine/kernel.h -grubof_symlist.c: $(addprefix include/grub/,$(grubof_HEADERS)) config.h gensymlist.sh +kernel_elf_symlist.c: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h gensymlist.sh /bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1) -kernel_syms.lst: $(addprefix include/grub/,$(grubof_HEADERS)) config.h genkernsyms.sh +kernel_syms.lst: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h genkernsyms.sh /bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1) # Programs -pkgdata_PROGRAMS = grubof +pkgdata_PROGRAMS = kernel.elf # Utilities. bin_UTILITIES = grub-emu @@ -59,18 +59,18 @@ grub_emu_SOURCES = commands/boot.c commands/cat.c commands/cmp.c \ grub_emu_LDFLAGS = $(LIBCURSES) -grubof_SOURCES = kern/powerpc/ieee1275/crt0.S kern/powerpc/ieee1275/cmain.c \ +kernel_elf_SOURCES = kern/powerpc/ieee1275/crt0.S kern/powerpc/ieee1275/cmain.c \ kern/ieee1275/ieee1275.c kern/main.c kern/device.c \ kern/disk.c kern/dl.c kern/file.c kern/fs.c kern/err.c \ kern/misc.c kern/mm.c kern/loader.c kern/rescue.c kern/term.c \ kern/powerpc/ieee1275/init.c term/ieee1275/ofconsole.c \ kern/powerpc/ieee1275/openfw.c disk/ieee1275/ofdisk.c \ kern/parser.c kern/partition.c kern/env.c kern/powerpc/dl.c \ - grubof_symlist.c kern/powerpc/cache.S -grubof_HEADERS = grub/powerpc/ieee1275/ieee1275.h -grubof_CFLAGS = $(COMMON_CFLAGS) -grubof_ASFLAGS = $(COMMON_ASFLAGS) -grubof_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \ + kernel_elf_symlist.c kern/powerpc/cache.S +kernel_elf_HEADERS = grub/powerpc/ieee1275/ieee1275.h +kernel_elf_CFLAGS = $(COMMON_CFLAGS) +kernel_elf_ASFLAGS = $(COMMON_ASFLAGS) +kernel_elf_LDFLAGS = $(COMMON_LDFLAGS) -static-libgcc -lgcc \ -Wl,-N,-S,-Ttext,0x200000,-Bstatic # For genmoddep. diff --git a/conf/sparc64-ieee1275.mk b/conf/sparc64-ieee1275.mk index 90dcd534b..50c588308 100644 --- a/conf/sparc64-ieee1275.mk +++ b/conf/sparc64-ieee1275.mk @@ -7,27 +7,27 @@ COMMON_LDFLAGS = -melf64_sparc -nostdlib # Images. -MOSTLYCLEANFILES += grubof_symlist.c kernel_syms.lst +MOSTLYCLEANFILES += kernel_elf_symlist.c kernel_syms.lst DEFSYMFILES += kernel_syms.lst -grubof_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \ +kernel_elf_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \ file.h fs.h kernel.h misc.h mm.h net.h parser.h rescue.h symbol.h \ term.h types.h sparc64/libgcc.h loader.h \ partition.h pc_partition.h ieee1275/ieee1275.h machine/time.h \ machine/kernel.h -grubof_symlist.c: $(addprefix include/grub/,$(grubof_HEADERS)) config.h gensymlist.sh +kernel_elf_symlist.c: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h gensymlist.sh /bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1) # For the parser. grub_script.tab.c grub_script.tab.h: normal/parser.y $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y -kernel_syms.lst: $(addprefix include/grub/,$(grubof_HEADERS)) config.h genkernsyms.sh +kernel_syms.lst: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h genkernsyms.sh /bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1) # Programs -pkgdata_PROGRAMS = grubof +pkgdata_PROGRAMS = kernel.elf # Utilities. #bin_UTILITIES = grub-emu grub-mkimage @@ -63,207 +63,207 @@ grub_mkimage_SOURCES = util/sparc64/ieee1275/grub-mkimage.c util/misc.c \ grub_emu_LDFLAGS = $(LIBCURSES) -grubof_SOURCES = kern/sparc64/ieee1275/init.c kern/ieee1275/ieee1275.c \ +kernel_elf_SOURCES = kern/sparc64/ieee1275/init.c kern/ieee1275/ieee1275.c \ kern/main.c kern/device.c kern/disk.c kern/dl.c kern/file.c \ kern/fs.c kern/err.c kern/misc.c kern/mm.c kern/loader.c \ kern/rescue.c kern/term.c term/ieee1275/ofconsole.c \ kern/sparc64/ieee1275/openfw.c disk/ieee1275/ofdisk.c \ - kern/partition.c kern/env.c kern/sparc64/dl.c grubof_symlist.c \ + kern/partition.c kern/env.c kern/sparc64/dl.c kernel_elf_symlist.c \ kern/sparc64/cache.S kern/parser.c -CLEANFILES += grubof grubof-kern_sparc64_ieee1275_init.o grubof-kern_ieee1275_ieee1275.o grubof-kern_main.o grubof-kern_device.o grubof-kern_disk.o grubof-kern_dl.o grubof-kern_file.o grubof-kern_fs.o grubof-kern_err.o grubof-kern_misc.o grubof-kern_mm.o grubof-kern_loader.o grubof-kern_rescue.o grubof-kern_term.o grubof-term_ieee1275_ofconsole.o grubof-kern_sparc64_ieee1275_openfw.o grubof-disk_ieee1275_ofdisk.o grubof-kern_partition.o grubof-kern_env.o grubof-kern_sparc64_dl.o grubof-grubof_symlist.o grubof-kern_sparc64_cache.o grubof-kern_parser.o -MOSTLYCLEANFILES += grubof-kern_sparc64_ieee1275_init.d grubof-kern_ieee1275_ieee1275.d grubof-kern_main.d grubof-kern_device.d grubof-kern_disk.d grubof-kern_dl.d grubof-kern_file.d grubof-kern_fs.d grubof-kern_err.d grubof-kern_misc.d grubof-kern_mm.d grubof-kern_loader.d grubof-kern_rescue.d grubof-kern_term.d grubof-term_ieee1275_ofconsole.d grubof-kern_sparc64_ieee1275_openfw.d grubof-disk_ieee1275_ofdisk.d grubof-kern_partition.d grubof-kern_env.d grubof-kern_sparc64_dl.d grubof-grubof_symlist.d grubof-kern_sparc64_cache.d grubof-kern_parser.d +CLEANFILES += kernel.elf kernel_elf-kern_sparc64_ieee1275_init.o kernel_elf-kern_ieee1275_ieee1275.o kernel_elf-kern_main.o kernel_elf-kern_device.o kernel_elf-kern_disk.o kernel_elf-kern_dl.o kernel_elf-kern_file.o kernel_elf-kern_fs.o kernel_elf-kern_err.o kernel_elf-kern_misc.o kernel_elf-kern_mm.o kernel_elf-kern_loader.o kernel_elf-kern_rescue.o kernel_elf-kern_term.o kernel_elf-term_ieee1275_ofconsole.o kernel_elf-kern_sparc64_ieee1275_openfw.o kernel_elf-disk_ieee1275_ofdisk.o kernel_elf-kern_partition.o kernel_elf-kern_env.o kernel_elf-kern_sparc64_dl.o kernel_elf-kernel_elf_symlist.o kernel_elf-kern_sparc64_cache.o kernel_elf-kern_parser.o +MOSTLYCLEANFILES += kernel_elf-kern_sparc64_ieee1275_init.d kernel_elf-kern_ieee1275_ieee1275.d kernel_elf-kern_main.d kernel_elf-kern_device.d kernel_elf-kern_disk.d kernel_elf-kern_dl.d kernel_elf-kern_file.d kernel_elf-kern_fs.d kernel_elf-kern_err.d kernel_elf-kern_misc.d kernel_elf-kern_mm.d kernel_elf-kern_loader.d kernel_elf-kern_rescue.d kernel_elf-kern_term.d kernel_elf-term_ieee1275_ofconsole.d kernel_elf-kern_sparc64_ieee1275_openfw.d kernel_elf-disk_ieee1275_ofdisk.d kernel_elf-kern_partition.d kernel_elf-kern_env.d kernel_elf-kern_sparc64_dl.d kernel_elf-kernel_elf_symlist.d kernel_elf-kern_sparc64_cache.d kernel_elf-kern_parser.d -grubof: grubof-kern_sparc64_ieee1275_init.o grubof-kern_ieee1275_ieee1275.o grubof-kern_main.o grubof-kern_device.o grubof-kern_disk.o grubof-kern_dl.o grubof-kern_file.o grubof-kern_fs.o grubof-kern_err.o grubof-kern_misc.o grubof-kern_mm.o grubof-kern_loader.o grubof-kern_rescue.o grubof-kern_term.o grubof-term_ieee1275_ofconsole.o grubof-kern_sparc64_ieee1275_openfw.o grubof-disk_ieee1275_ofdisk.o grubof-kern_partition.o grubof-kern_env.o grubof-kern_sparc64_dl.o grubof-grubof_symlist.o grubof-kern_sparc64_cache.o grubof-kern_parser.o - $(CC) -o $@ $^ $(LDFLAGS) $(grubof_LDFLAGS) +kernel.elf: kernel_elf-kern_sparc64_ieee1275_init.o kernel_elf-kern_ieee1275_ieee1275.o kernel_elf-kern_main.o kernel_elf-kern_device.o kernel_elf-kern_disk.o kernel_elf-kern_dl.o kernel_elf-kern_file.o kernel_elf-kern_fs.o kernel_elf-kern_err.o kernel_elf-kern_misc.o kernel_elf-kern_mm.o kernel_elf-kern_loader.o kernel_elf-kern_rescue.o kernel_elf-kern_term.o kernel_elf-term_ieee1275_ofconsole.o kernel_elf-kern_sparc64_ieee1275_openfw.o kernel_elf-disk_ieee1275_ofdisk.o kernel_elf-kern_partition.o kernel_elf-kern_env.o kernel_elf-kern_sparc64_dl.o kernel_elf-kernel_elf_symlist.o kernel_elf-kern_sparc64_cache.o kernel_elf-kern_parser.o + $(CC) -o $@ $^ $(LDFLAGS) $(kernel_elf_LDFLAGS) -grubof-kern_sparc64_ieee1275_init.o: kern/sparc64/ieee1275/init.c - $(CC) -Ikern/sparc64/ieee1275 -I$(srcdir)/kern/sparc64/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_sparc64_ieee1275_init.o: kern/sparc64/ieee1275/init.c + $(CC) -Ikern/sparc64/ieee1275 -I$(srcdir)/kern/sparc64/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_sparc64_ieee1275_init.d: kern/sparc64/ieee1275/init.c - set -e; $(CC) -Ikern/sparc64/ieee1275 -I$(srcdir)/kern/sparc64/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,init\.o[ :]*,grubof-kern_sparc64_ieee1275_init.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_sparc64_ieee1275_init.d: kern/sparc64/ieee1275/init.c + set -e; $(CC) -Ikern/sparc64/ieee1275 -I$(srcdir)/kern/sparc64/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,init\.o[ :]*,kernel_elf-kern_sparc64_ieee1275_init.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_sparc64_ieee1275_init.d +-include kernel_elf-kern_sparc64_ieee1275_init.d -grubof-kern_ieee1275_ieee1275.o: kern/ieee1275/ieee1275.c - $(CC) -Ikern/ieee1275 -I$(srcdir)/kern/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_ieee1275_ieee1275.o: kern/ieee1275/ieee1275.c + $(CC) -Ikern/ieee1275 -I$(srcdir)/kern/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_ieee1275_ieee1275.d: kern/ieee1275/ieee1275.c - set -e; $(CC) -Ikern/ieee1275 -I$(srcdir)/kern/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,ieee1275\.o[ :]*,grubof-kern_ieee1275_ieee1275.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_ieee1275_ieee1275.d: kern/ieee1275/ieee1275.c + set -e; $(CC) -Ikern/ieee1275 -I$(srcdir)/kern/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,ieee1275\.o[ :]*,kernel_elf-kern_ieee1275_ieee1275.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_ieee1275_ieee1275.d +-include kernel_elf-kern_ieee1275_ieee1275.d -grubof-kern_main.o: kern/main.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_main.o: kern/main.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_main.d: kern/main.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,main\.o[ :]*,grubof-kern_main.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_main.d: kern/main.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,main\.o[ :]*,kernel_elf-kern_main.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_main.d +-include kernel_elf-kern_main.d -grubof-kern_device.o: kern/device.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_device.o: kern/device.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_device.d: kern/device.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,device\.o[ :]*,grubof-kern_device.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_device.d: kern/device.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,device\.o[ :]*,kernel_elf-kern_device.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_device.d +-include kernel_elf-kern_device.d -grubof-kern_disk.o: kern/disk.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_disk.o: kern/disk.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_disk.d: kern/disk.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,disk\.o[ :]*,grubof-kern_disk.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_disk.d: kern/disk.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,disk\.o[ :]*,kernel_elf-kern_disk.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_disk.d +-include kernel_elf-kern_disk.d -grubof-kern_dl.o: kern/dl.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_dl.o: kern/dl.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_dl.d: kern/dl.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,dl\.o[ :]*,grubof-kern_dl.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_dl.d: kern/dl.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,dl\.o[ :]*,kernel_elf-kern_dl.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_dl.d +-include kernel_elf-kern_dl.d -grubof-kern_file.o: kern/file.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_file.o: kern/file.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_file.d: kern/file.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,file\.o[ :]*,grubof-kern_file.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_file.d: kern/file.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,file\.o[ :]*,kernel_elf-kern_file.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_file.d +-include kernel_elf-kern_file.d -grubof-kern_fs.o: kern/fs.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_fs.o: kern/fs.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_fs.d: kern/fs.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,fs\.o[ :]*,grubof-kern_fs.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_fs.d: kern/fs.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,fs\.o[ :]*,kernel_elf-kern_fs.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_fs.d +-include kernel_elf-kern_fs.d -grubof-kern_err.o: kern/err.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_err.o: kern/err.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_err.d: kern/err.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,err\.o[ :]*,grubof-kern_err.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_err.d: kern/err.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,err\.o[ :]*,kernel_elf-kern_err.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_err.d +-include kernel_elf-kern_err.d -grubof-kern_misc.o: kern/misc.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_misc.o: kern/misc.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_misc.d: kern/misc.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,misc\.o[ :]*,grubof-kern_misc.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_misc.d: kern/misc.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,misc\.o[ :]*,kernel_elf-kern_misc.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_misc.d +-include kernel_elf-kern_misc.d -grubof-kern_mm.o: kern/mm.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_mm.o: kern/mm.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_mm.d: kern/mm.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,mm\.o[ :]*,grubof-kern_mm.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_mm.d: kern/mm.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,mm\.o[ :]*,kernel_elf-kern_mm.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_mm.d +-include kernel_elf-kern_mm.d -grubof-kern_loader.o: kern/loader.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_loader.o: kern/loader.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_loader.d: kern/loader.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,loader\.o[ :]*,grubof-kern_loader.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_loader.d: kern/loader.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,loader\.o[ :]*,kernel_elf-kern_loader.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_loader.d +-include kernel_elf-kern_loader.d -grubof-kern_rescue.o: kern/rescue.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_rescue.o: kern/rescue.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_rescue.d: kern/rescue.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,rescue\.o[ :]*,grubof-kern_rescue.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_rescue.d: kern/rescue.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,rescue\.o[ :]*,kernel_elf-kern_rescue.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_rescue.d +-include kernel_elf-kern_rescue.d -grubof-kern_term.o: kern/term.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_term.o: kern/term.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_term.d: kern/term.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,term\.o[ :]*,grubof-kern_term.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_term.d: kern/term.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,term\.o[ :]*,kernel_elf-kern_term.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_term.d +-include kernel_elf-kern_term.d -grubof-term_ieee1275_ofconsole.o: term/ieee1275/ofconsole.c - $(CC) -Iterm/ieee1275 -I$(srcdir)/term/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-term_ieee1275_ofconsole.o: term/ieee1275/ofconsole.c + $(CC) -Iterm/ieee1275 -I$(srcdir)/term/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-term_ieee1275_ofconsole.d: term/ieee1275/ofconsole.c - set -e; $(CC) -Iterm/ieee1275 -I$(srcdir)/term/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,ofconsole\.o[ :]*,grubof-term_ieee1275_ofconsole.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-term_ieee1275_ofconsole.d: term/ieee1275/ofconsole.c + set -e; $(CC) -Iterm/ieee1275 -I$(srcdir)/term/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,ofconsole\.o[ :]*,kernel_elf-term_ieee1275_ofconsole.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-term_ieee1275_ofconsole.d +-include kernel_elf-term_ieee1275_ofconsole.d -grubof-kern_sparc64_ieee1275_openfw.o: kern/sparc64/ieee1275/openfw.c - $(CC) -Ikern/sparc64/ieee1275 -I$(srcdir)/kern/sparc64/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_sparc64_ieee1275_openfw.o: kern/sparc64/ieee1275/openfw.c + $(CC) -Ikern/sparc64/ieee1275 -I$(srcdir)/kern/sparc64/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_sparc64_ieee1275_openfw.d: kern/sparc64/ieee1275/openfw.c - set -e; $(CC) -Ikern/sparc64/ieee1275 -I$(srcdir)/kern/sparc64/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,openfw\.o[ :]*,grubof-kern_sparc64_ieee1275_openfw.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_sparc64_ieee1275_openfw.d: kern/sparc64/ieee1275/openfw.c + set -e; $(CC) -Ikern/sparc64/ieee1275 -I$(srcdir)/kern/sparc64/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,openfw\.o[ :]*,kernel_elf-kern_sparc64_ieee1275_openfw.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_sparc64_ieee1275_openfw.d +-include kernel_elf-kern_sparc64_ieee1275_openfw.d -grubof-disk_ieee1275_ofdisk.o: disk/ieee1275/ofdisk.c - $(CC) -Idisk/ieee1275 -I$(srcdir)/disk/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-disk_ieee1275_ofdisk.o: disk/ieee1275/ofdisk.c + $(CC) -Idisk/ieee1275 -I$(srcdir)/disk/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-disk_ieee1275_ofdisk.d: disk/ieee1275/ofdisk.c - set -e; $(CC) -Idisk/ieee1275 -I$(srcdir)/disk/ieee1275 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,ofdisk\.o[ :]*,grubof-disk_ieee1275_ofdisk.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-disk_ieee1275_ofdisk.d: disk/ieee1275/ofdisk.c + set -e; $(CC) -Idisk/ieee1275 -I$(srcdir)/disk/ieee1275 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,ofdisk\.o[ :]*,kernel_elf-disk_ieee1275_ofdisk.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-disk_ieee1275_ofdisk.d +-include kernel_elf-disk_ieee1275_ofdisk.d -grubof-kern_partition.o: kern/partition.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_partition.o: kern/partition.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_partition.d: kern/partition.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,partition\.o[ :]*,grubof-kern_partition.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_partition.d: kern/partition.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,partition\.o[ :]*,kernel_elf-kern_partition.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_partition.d +-include kernel_elf-kern_partition.d -grubof-kern_env.o: kern/env.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_env.o: kern/env.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_env.d: kern/env.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,env\.o[ :]*,grubof-kern_env.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_env.d: kern/env.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,env\.o[ :]*,kernel_elf-kern_env.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_env.d +-include kernel_elf-kern_env.d -grubof-kern_sparc64_dl.o: kern/sparc64/dl.c - $(CC) -Ikern/sparc64 -I$(srcdir)/kern/sparc64 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_sparc64_dl.o: kern/sparc64/dl.c + $(CC) -Ikern/sparc64 -I$(srcdir)/kern/sparc64 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_sparc64_dl.d: kern/sparc64/dl.c - set -e; $(CC) -Ikern/sparc64 -I$(srcdir)/kern/sparc64 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,dl\.o[ :]*,grubof-kern_sparc64_dl.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_sparc64_dl.d: kern/sparc64/dl.c + set -e; $(CC) -Ikern/sparc64 -I$(srcdir)/kern/sparc64 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,dl\.o[ :]*,kernel_elf-kern_sparc64_dl.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_sparc64_dl.d +-include kernel_elf-kern_sparc64_dl.d -grubof-grubof_symlist.o: grubof_symlist.c - $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kernel_elf_symlist.o: kernel_elf_symlist.c + $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-grubof_symlist.d: grubof_symlist.c - set -e; $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,grubof_symlist\.o[ :]*,grubof-grubof_symlist.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kernel_elf_symlist.d: kernel_elf_symlist.c + set -e; $(CC) -I. -I$(srcdir)/. $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,kernel_elf_symlist\.o[ :]*,kernel_elf-kernel_elf_symlist.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-grubof_symlist.d +-include kernel_elf-kernel_elf_symlist.d -grubof-kern_sparc64_cache.o: kern/sparc64/cache.S - $(CC) -Ikern/sparc64 -I$(srcdir)/kern/sparc64 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_sparc64_cache.o: kern/sparc64/cache.S + $(CC) -Ikern/sparc64 -I$(srcdir)/kern/sparc64 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_sparc64_cache.d: kern/sparc64/cache.S - set -e; $(CC) -Ikern/sparc64 -I$(srcdir)/kern/sparc64 $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,cache\.o[ :]*,grubof-kern_sparc64_cache.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_sparc64_cache.d: kern/sparc64/cache.S + set -e; $(CC) -Ikern/sparc64 -I$(srcdir)/kern/sparc64 $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,cache\.o[ :]*,kernel_elf-kern_sparc64_cache.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_sparc64_cache.d +-include kernel_elf-kern_sparc64_cache.d -grubof-kern_parser.o: kern/parser.c - $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -c -o $@ $< +kernel_elf-kern_parser.o: kern/parser.c + $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -c -o $@ $< -grubof-kern_parser.d: kern/parser.c - set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(grubof_CFLAGS) -M $< | sed 's,parser\.o[ :]*,grubof-kern_parser.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ +kernel_elf-kern_parser.d: kern/parser.c + set -e; $(CC) -Ikern -I$(srcdir)/kern $(CPPFLAGS) $(CFLAGS) $(kernel_elf_CFLAGS) -M $< | sed 's,parser\.o[ :]*,kernel_elf-kern_parser.o $@ : ,g' > $@; [ -s $@ ] || rm -f $@ --include grubof-kern_parser.d +-include kernel_elf-kern_parser.d -grubof_HEADERS = grub/sparc64/ieee1275/ieee1275.h -grubof_CFLAGS = $(COMMON_CFLAGS) -grubof_ASFLAGS = $(COMMON_ASFLAGS) -grubof_LDFLAGS = -mno-app-regs -nostdlib -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc +kernel_elf_HEADERS = grub/sparc64/ieee1275/ieee1275.h +kernel_elf_CFLAGS = $(COMMON_CFLAGS) +kernel_elf_ASFLAGS = $(COMMON_ASFLAGS) +kernel_elf_LDFLAGS = -mno-app-regs -nostdlib -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc # For genmoddep. genmoddep_SOURCES = util/genmoddep.c diff --git a/conf/sparc64-ieee1275.rmk b/conf/sparc64-ieee1275.rmk index 5b1101977..1d7575a1e 100644 --- a/conf/sparc64-ieee1275.rmk +++ b/conf/sparc64-ieee1275.rmk @@ -7,27 +7,27 @@ COMMON_LDFLAGS = -melf64_sparc -nostdlib # Images. -MOSTLYCLEANFILES += grubof_symlist.c kernel_syms.lst +MOSTLYCLEANFILES += kernel_elf_symlist.c kernel_syms.lst DEFSYMFILES += kernel_syms.lst -grubof_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \ +kernel_elf_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \ file.h fs.h kernel.h misc.h mm.h net.h parser.h rescue.h symbol.h \ term.h types.h sparc64/libgcc.h loader.h \ partition.h pc_partition.h ieee1275/ieee1275.h machine/time.h \ machine/kernel.h -grubof_symlist.c: $(addprefix include/grub/,$(grubof_HEADERS)) config.h gensymlist.sh +kernel_elf_symlist.c: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h gensymlist.sh /bin/sh gensymlist.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1) # For the parser. grub_script.tab.c grub_script.tab.h: normal/parser.y $(YACC) -d -p grub_script_yy -b grub_script $(srcdir)/normal/parser.y -kernel_syms.lst: $(addprefix include/grub/,$(grubof_HEADERS)) config.h genkernsyms.sh +kernel_syms.lst: $(addprefix include/grub/,$(kernel_elf_HEADERS)) config.h genkernsyms.sh /bin/sh genkernsyms.sh $(filter %.h,$^) > $@ || (rm -f $@; exit 1) # Programs -pkgdata_PROGRAMS = grubof +pkgdata_PROGRAMS = kernel.elf # Utilities. #bin_UTILITIES = grub-emu grub-mkimage @@ -63,17 +63,17 @@ grub_mkimage_SOURCES = util/sparc64/ieee1275/grub-mkimage.c util/misc.c \ grub_emu_LDFLAGS = $(LIBCURSES) -grubof_SOURCES = kern/sparc64/ieee1275/init.c kern/ieee1275/ieee1275.c \ +kernel_elf_SOURCES = kern/sparc64/ieee1275/init.c kern/ieee1275/ieee1275.c \ kern/main.c kern/device.c kern/disk.c kern/dl.c kern/file.c \ kern/fs.c kern/err.c kern/misc.c kern/mm.c kern/loader.c \ kern/rescue.c kern/term.c term/ieee1275/ofconsole.c \ kern/sparc64/ieee1275/openfw.c disk/ieee1275/ofdisk.c \ - kern/partition.c kern/env.c kern/sparc64/dl.c grubof_symlist.c \ + kern/partition.c kern/env.c kern/sparc64/dl.c kernel_elf_symlist.c \ kern/sparc64/cache.S kern/parser.c -grubof_HEADERS = grub/sparc64/ieee1275/ieee1275.h -grubof_CFLAGS = $(COMMON_CFLAGS) -grubof_ASFLAGS = $(COMMON_ASFLAGS) -grubof_LDFLAGS = -mno-app-regs -nostdlib -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc +kernel_elf_HEADERS = grub/sparc64/ieee1275/ieee1275.h +kernel_elf_CFLAGS = $(COMMON_CFLAGS) +kernel_elf_ASFLAGS = $(COMMON_ASFLAGS) +kernel_elf_LDFLAGS = -mno-app-regs -nostdlib -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc # For genmoddep. genmoddep_SOURCES = util/genmoddep.c diff --git a/util/powerpc/ieee1275/grub-mkimage.c b/util/powerpc/ieee1275/grub-mkimage.c index cb4d0c64c..cdce560c8 100644 --- a/util/powerpc/ieee1275/grub-mkimage.c +++ b/util/powerpc/ieee1275/grub-mkimage.c @@ -168,7 +168,7 @@ add_segments (char *dir, FILE *out, int chrp, char *mods[]) int i; /* Read ELF header. */ - kernel_path = grub_util_get_path (dir, "grubof"); + kernel_path = grub_util_get_path (dir, "kernel.elf"); in = fopen (kernel_path, "rb"); if (! in) grub_util_error ("cannot open %s", kernel_path);