Patchwork Rev 5304 broke romstraps

login
register
about
Submitter Myles Watson
Date 2010-03-30 14:42:34
Message ID <2831fecf1003300742h16ad6baeh36e4c9e5f3fb3ee4@mail.gmail.com>
Download mbox | patch
Permalink /patch/1178/
State Superseded
Headers show

Comments

Myles Watson - 2010-03-30 14:42:34
As of 5304, the romstrap files don't get included for ck804.

This patch makes that happen, but there may be a better fix.

Signed-off-by: Myles Watson <mylesgw@gmail.com>

Thanks,
Myles
Stefan Reinauer - 2010-03-30 20:41:58
On 3/30/10 4:42 PM, Myles Watson wrote:
> As of 5304, the romstrap files don't get included for ck804.
>
> This patch makes that happen, but there may be a better fix.
>
> Signed-off-by: Myles Watson <mylesgw@gmail.com <mailto:mylesgw@gmail.com>>
>
> Thanks,
> Myles
Before checking this in, can you try if 5330 fixed your issue?

Seems there was a problem with := vs = assignments.

Patch

Index: svn/src/arch/i386/Makefile.bigbootblock.inc
===================================================================
--- svn.orig/src/arch/i386/Makefile.bigbootblock.inc
+++ svn/src/arch/i386/Makefile.bigbootblock.inc
@@ -14,11 +14,12 @@  $(obj)/coreboot.bootblock: $(obj)/corebo
 
 $(obj)/ldscript.ld: $$(ldscripts) $(obj)/ldoptions
 	printf 'INCLUDE "ldoptions"\n' > $@
-	printf '$(foreach ldscript,$(ldscripts),INCLUDE "$(ldscript:$(obj)/%=%)"\n)' >> $@
+	printf '$(foreach ldscript,$(ldscripts) $(chipset_bootblock_lds),INCLUDE "$(ldscript:$(obj)/%=%)"\n)' >> $@
 
 $(obj)/crt0_includes.h: $$(crt0s)
 	@printf "    GEN        $(subst $(obj)/,,$(@))\n"
 	printf '$(foreach crt0,config.h $(crt0s),#include "$(crt0:$(obj)/%=%)"\n)' > $@
+	printf '$(foreach crt0,config.h $(crt0s) $(chipset_bootblock_inc),#include "$(crt0:$(obj)/%=%)"\n)' > $@
 
 $(obj)/mainboard/$(MAINBOARDDIR)/crt0.initobj.o: $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s
 	@printf "    CC         $(subst $(obj)/,,$(@))\n"