Author: stepan Date: Tue Mar 30 22:32:01 2010 New Revision: 5330 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5330
Log: 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 <[email protected]> Acked-by: Stefan Reinauer <[email protected]> Modified: trunk/Makefile trunk/src/arch/i386/Makefile.inc Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Tue Mar 30 17:49:14 2010 (r5329) +++ trunk/Makefile Tue Mar 30 22:32:01 2010 (r5330) @@ -165,8 +165,6 @@ initobjs:= drivers:= smmobjs:= -crt0s:= -ldscripts:= types:=obj initobj driver smmobj # Clean -y variables, include Makefile.inc @@ -263,7 +261,8 @@ @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 Modified: trunk/src/arch/i386/Makefile.inc ============================================================================== --- trunk/src/arch/i386/Makefile.inc Tue Mar 30 17:49:14 2010 (r5329) +++ trunk/src/arch/i386/Makefile.inc Tue Mar 30 22:32:01 2010 (r5330) @@ -83,8 +83,8 @@ ####################################################################### # 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 -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
