make crt0s and ldscripts evaluate late, so the chipset_* variables are there at

the time they are finally used. This should solve the Problem Myles was seeing
earlier today.

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5330 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/Makefile b/Makefile
index 183b3ac619baece132a10b3f8815e71a3448455c..2a7eac954bab72a38304abc3db23835795905886 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -165,8 +165,6 @@ objs:=$(obj)/mainboard/$(MAINBOARDDIR)/static.o
 initobjs:=
 drivers:=
 smmobjs:=
-crt0s:=
-ldscripts:=
 types:=obj initobj driver smmobj
 
 # Clean -y variables, include Makefile.inc
@@ -263,7 +261,8 @@ printall:
        @echo LIBGCC_FILE_NAME=$(LIBGCC_FILE_NAME)
 
 printcrt0s:
-       @echo $(patsubst $(top)/%,%,$(crt0s))
+       @echo crt0s=$(crt0s)
+       @echo ldscripts=$(ldscripts)
 
 OBJS     := $(patsubst %,$(obj)/%,$(TARGETS-y))
 INCLUDES := -Isrc -Isrc/include -I$(obj) -Isrc/arch/$(ARCHDIR-y)/include 

diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc
index 2712f7dd81617f98693db6ce8f7324b5cbe0950d..e9d651c1e9f8b280197c9d50afec5d5878f44162 100644 (file)
--- a/src/arch/i386/Makefile.inc
+++ b/src/arch/i386/Makefile.inc
@@ -83,8 +83,8 @@ $(obj)/coreboot.a: $$(objs)
 #######################################################################
 # done
 
-crt0s :=
-ldscripts :=
+crt0s =
+ldscripts =
 ldscripts += $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
 ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
 crt0s += $(src)/cpu/x86/16bit/entry16.inc