diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-03-30 20:32:01 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-03-30 20:32:01 +0000 |
| commit | acdd52fa82e2157f0777d2d2aab5d74bdc5dcec4 (patch) | |
| tree | e789048bca1b09475693bca230c123ed5b97b025 | |
| parent | 0ed0b7cfe819ffcf0a1c305deb63b6ea8ace78bb (diff) | |
| download | coreboot-acdd52fa82e2157f0777d2d2aab5d74bdc5dcec4.tar.xz | |
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
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | src/arch/i386/Makefile.inc | 4 |
2 files changed, 4 insertions, 5 deletions
@@ -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 2712f7dd81..e9d651c1e9 100644 --- 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 |