diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-03-29 13:04:13 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-03-29 13:04:13 +0000 |
| commit | e9f3258e0b1ed57308d277d3b5a6c67f4819e171 (patch) | |
| tree | 6b97671f2b6eeb0369ee3f5a5d5cbd82cbee1ced /Makefile | |
| parent | e0d607a4c5838628822904e75bdb3cd69ffa3220 (diff) | |
| download | coreboot-e9f3258e0b1ed57308d277d3b5a6c67f4819e171.tar.xz | |
This patch fixes build.h dependencies in coreboot again.
-include was dropped, the files in question do an #include <build.h> already.
Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Patrick Georgi <patrick.georgi@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5310 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -136,7 +136,7 @@ all: chmod +x .ccwrap scan-build $(CONFIG_SCANBUILD_REPORT_LOCATION) -analyze-headers --use-cc=$(top)/.ccwrap --use-c++=$(top)/.ccwrap $(MAKE) INNER_SCANBUILD=y else -all: $(obj)/config.h $(obj)/build.h coreboot +all: $(obj)/config.h coreboot endif # must come rather early @@ -222,7 +222,7 @@ define create_cc_template # $3 .o infix ("" ".initobj", ...) # $4 additional compiler flags de$(EMPTY)fine $(1)_$(2)_template -$(obj)/$$(1)%$(3).o: src/$$(1)%.$(2) | $(obj)/build.h $(obj)/config.h +$(obj)/$$(1)%$(3).o: src/$$(1)%.$(2) $(obj)/config.h printf " CC $$$$(subst $$$$(obj)/,,$$$$(@))\n" $(CC) $(4) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$< en$(EMPTY)def @@ -230,8 +230,8 @@ endef $(eval $(call create_cc_template,objs,c)) $(eval $(call create_cc_template,objs,S,,-DASSEMBLY)) -$(eval $(call create_cc_template,initobjs,c,.initobj)) -$(eval $(call create_cc_template,initobjs,S,.initobj,-DASSEMBLY)) +$(eval $(call create_cc_template,initobjs,c,.initobj,-D__PRE_RAM__)) +$(eval $(call create_cc_template,initobjs,S,.initobj,-DASSEMBLY -D__PRE_RAM__)) $(eval $(call create_cc_template,drivers,c,.driver)) $(eval $(call create_cc_template,drivers,S,.driver,-DASSEMBLY)) $(eval $(call create_cc_template,smmobjs,c,.smmobj)) @@ -269,7 +269,7 @@ OBJS := $(patsubst %,$(obj)/%,$(TARGETS-y)) INCLUDES := -Isrc -Isrc/include -I$(obj) -Isrc/arch/$(ARCHDIR-y)/include INCLUDES += -Isrc/devices/oprom/include # abspath is a workaround for romcc -INCLUDES += -include $(abspath $(obj)/config.h) -include $(abspath $(obj)/build.h) +INCLUDES += -include $(abspath $(obj)/config.h) CFLAGS = $(INCLUDES) -Os -nostdinc -pipe CFLAGS += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes @@ -295,7 +295,7 @@ prepare: mkdir -p $(obj)/util/kconfig/lxdialog $(obj)/util/cbfstool test -n "$(alldirs)" && mkdir -p $(alldirs) || true -$(obj)/build.h $(abspath $(obj)/build.h): .xcompile +$(obj)/build.h: .xcompile @printf " GEN build.h\n" rm -f $(obj)/build.h printf "/* build system definitions (autogenerated) */\n" > $(obj)/build.ht |