GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Stefan Reinauer 2010-03-30 20:32:01 +00:00 committed by Stefan Reinauer
parent 0ed0b7cfe8
commit acdd52fa82
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

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

4
src/arch/i386/Makefile.inc
View File

@ -83,8 +83,8 @@ $(obj)/coreboot.a: $$(objs)
####################################################################### #######################################################################
# done # done
crt0s := crt0s =
ldscripts := ldscripts =
ldscripts += $(src)/arch/i386/init/ldscript_fallback_cbfs.lb ldscripts += $(src)/arch/i386/init/ldscript_fallback_cbfs.lb
ifeq ($(CONFIG_BIG_BOOTBLOCK),y) ifeq ($(CONFIG_BIG_BOOTBLOCK),y)
crt0s += $(src)/cpu/x86/16bit/entry16.inc crt0s += $(src)/cpu/x86/16bit/entry16.inc