This is the change so that we can readable ldscript.ld

amd/rumba now builds.

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2169 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/src/config/Config.lb b/src/config/Config.lb
index 56ac5e8c4edf92eac3761a2f90f7d56cec50e231..ba9e482858cdf422b54e4ea07a07f4498ec6b9ee 100644 (file)
--- a/src/config/Config.lb
+++ b/src/config/Config.lb
@@ -13,7 +13,7 @@ makedefine HOSTCFLAGS:= -Os -Wall
 
 makerule ldscript.ld   
        depends "ldoptions $(LDSUBSCRIPTS-1)" 
-       action  "echo \"INCLUDE ldoptions\" > $@ ; for file in $(LDSUBSCRIPTS-1) ; do echo \"INCLUDE $$file\" >> $@ ; done"
+       action  "echo '/*ldoptions*/' > $@; cat ldoptions >> $@ ; for file in $(LDSUBSCRIPTS-1) ; do echo /\* $$file \*/ >> $@; cat $$file >> $@ ; done"
 end
 
 #makerule cpuflags   

diff --git a/targets/amd/rumba/Config.lb b/targets/amd/rumba/Config.lb
index bfb04ac17849cb31cc7b9e2f61ecdd56f2d9efb0..7a5644ae1d7e9d245fc62fdc0447737d30433b4a 100644 (file)
--- a/targets/amd/rumba/Config.lb
+++ b/targets/amd/rumba/Config.lb
@@ -14,7 +14,8 @@ romimage "normal"
 #      payload ../../../../tg3--ide_disk.zelf  
 #      payload ../../../../../lnxieepro100.ebi
 #      payload /etc/hosts
-       payload /home/hamish/work/etherboot/eb-5.2.6-lne100.elf
+#      payload /home/hamish/work/etherboot/eb-5.2.6-lne100.elf
+       payload /tmp/filo.elf
 end
 
 romimage "fallback" 
@@ -25,7 +26,8 @@ romimage "fallback"
 #      payload ../../../../tg3--ide_disk.zelf  
 #      payload ../../../../../lnxieepro100.ebia
 #      payload /etc/hosts
-       payload /home/hamish/work/etherboot/eb-5.2.6-lne100.elf
+#      payload /home/hamish/work/etherboot/eb-5.2.6-lne100.elf
+       payload /tmp/filo.elf
 end
 
 buildrom ./linuxbios.rom ROM_SIZE "normal" "fallback"