From dd1505dae70642fa3400224bf1d48730c9985592 Mon Sep 17 00:00:00 2001 From: Greg Watson Date: Wed, 20 Jul 2005 18:33:21 +0000 Subject: backed out git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1985 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/config/Config.lb | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/config/Config.lb b/src/config/Config.lb index 4b446c3fe7..6a4b284f9d 100644 --- a/src/config/Config.lb +++ b/src/config/Config.lb @@ -64,20 +64,20 @@ makerule linuxbios_ram.rom action "cp $(LINUXBIOS_RAM-1) linuxbios_ram.rom" end -#if CONFIG_USE_INIT -#makerule init.o - #depends "$(INIT-OBJECTS)" - #action "$(LD) -melf_i386 -r -o init.pre.o $(INIT-OBJECTS)" - #action "$(OBJCOPY) --rename-section .text=.init.text --rename-section .data=.init.data --rename-section .rodata=.init.rodata --rename-section .rodata.str1.1=.init.rodata.str1.1 init.pre.o init.o" -#end -# -#makerule linuxbios -# depends "crt0.o init.o linuxbios_ram.rom ldscript.ld" -# action "$(CC) -nostdlib -nostartfiles -static -o $@ -T ldscript.ld crt0.o init.o" -# action "$(CROSS_COMPILE)nm -n linuxbios | sort > linuxbios.map" -#end -# -#else +if CONFIG_USE_INIT +makerule init.o + depends "$(INIT-OBJECTS)" + action "$(LD) -melf_i386 -r -o init.pre.o $(INIT-OBJECTS)" + action "$(OBJCOPY) --rename-section .text=.init.text --rename-section .data=.init.data --rename-section .rodata=.init.rodata --rename-section .rodata.str1.1=.init.rodata.str1.1 init.pre.o init.o" +end + +makerule linuxbios + depends "crt0.o init.o linuxbios_ram.rom ldscript.ld" + action "$(CC) -nostdlib -nostartfiles -static -o $@ -T ldscript.ld crt0.o init.o" + action "$(CROSS_COMPILE)nm -n linuxbios | sort > linuxbios.map" +end + +else makerule linuxbios depends "crt0.o $(INIT-OBJECTS) linuxbios_ram.rom ldscript.ld" @@ -85,7 +85,7 @@ makerule linuxbios action "$(CROSS_COMPILE)nm -n linuxbios | sort > linuxbios.map" end -#end +end makerule linuxbios.a depends "$(OBJECTS)" -- cgit v1.2.3