Author: stepan Date: Mon Mar 29 15:04:13 2010 New Revision: 5310 URL: https://tracker.coreboot.org/trac/coreboot/changeset/5310
Log: 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
Modified: trunk/Makefile trunk/src/arch/i386/Makefile.bootblock.inc trunk/src/arch/i386/Makefile.inc trunk/src/arch/i386/lib/Makefile.inc trunk/src/lib/Makefile.inc trunk/src/lib/version.c
Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Mar 28 23:31:30 2010 (r5309) +++ trunk/Makefile Mon Mar 29 15:04:13 2010 (r5310) @@ -136,7 +136,7 @@ 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 @@ # $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 @@
$(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 @@ 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 @@ 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
Modified: trunk/src/arch/i386/Makefile.bootblock.inc ============================================================================== --- trunk/src/arch/i386/Makefile.bootblock.inc Sun Mar 28 23:31:30 2010 (r5309) +++ trunk/src/arch/i386/Makefile.bootblock.inc Mon Mar 29 15:04:13 2010 (r5310) @@ -42,9 +42,9 @@ bootblock_inc += $(obj)/mainboard/$(MAINBOARDDIR)/bootblock.inc bootblock_inc += $(src)/arch/i386/lib/walkcbfs.S
-bootblock_romccflags := -mcpu=i386 -O2 +bootblock_romccflags := -mcpu=i386 -O2 -D__PRE_RAM__ ifeq ($(CONFIG_SSE),y) -bootblock_romccflags := -mcpu=k7 -msse -O2 +bootblock_romccflags := -mcpu=k7 -msse -O2 -D__PRE_RAM__ endif
$(obj)/bootblock/ldscript.ld: $$(bootblock_lds) $(obj)/ldoptions
Modified: trunk/src/arch/i386/Makefile.inc ============================================================================== --- trunk/src/arch/i386/Makefile.inc Sun Mar 28 23:31:30 2010 (r5309) +++ trunk/src/arch/i386/Makefile.inc Mon Mar 29 15:04:13 2010 (r5310) @@ -193,8 +193,7 @@
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(obj)/romcc $(OPTION_TABLE_H) $(obj)/build.h printf " ROMCC romstage.inc\n" - $(ROMCC) -c -S $(ROMCCFLAGS) -I. $(INCLUDES) $< -o $@ - + $(ROMCC) -c -S $(ROMCCFLAGS) -D__PRE_RAM__ -I. $(INCLUDES) $< -o $@ else
$(obj)/mainboard/$(MAINBOARDDIR)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(obj)/option_table.h @@ -203,7 +202,7 @@
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc: $(src)/mainboard/$(MAINBOARDDIR)/romstage.c $(OPTION_TABLE_H) $(obj)/build.h printf " CC romstage.inc\n" - $(CC) -MMD $(CFLAGS) -I$(src) -I. -c -S $< -o $@ + $(CC) -MMD $(CFLAGS) -D__PRE_RAM__ -I$(src) -I. -c -S $< -o $@
$(obj)/mainboard/$(MAINBOARDDIR)/romstage.inc: $(obj)/mainboard/$(MAINBOARDDIR)/romstage.pre.inc printf " POST romstage.inc\n"
Modified: trunk/src/arch/i386/lib/Makefile.inc ============================================================================== --- trunk/src/arch/i386/lib/Makefile.inc Sun Mar 28 23:31:30 2010 (r5309) +++ trunk/src/arch/i386/lib/Makefile.inc Mon Mar 29 15:04:13 2010 (r5310) @@ -8,3 +8,5 @@
initobj-y += printk_init.o initobj-y += cbfs_and_run.o + +$(obj)/arch/i386/lib/console.o :: $(obj)/build.h
Modified: trunk/src/lib/Makefile.inc ============================================================================== --- trunk/src/lib/Makefile.inc Sun Mar 28 23:31:30 2010 (r5309) +++ trunk/src/lib/Makefile.inc Mon Mar 29 15:04:13 2010 (r5310) @@ -29,3 +29,5 @@ obj-$(CONFIG_BOOTSPLASH) += jpeg.o
smmobj-y += memcpy.o + +$(obj)/lib/version.o :: $(obj)/build.h
Modified: trunk/src/lib/version.c ============================================================================== --- trunk/src/lib/version.c Sun Mar 28 23:31:30 2010 (r5309) +++ trunk/src/lib/version.c Mon Mar 29 15:04:13 2010 (r5310) @@ -35,7 +35,6 @@ #error COREBOOT_ASSEMBLER not defined #endif
- #ifndef COREBOOT_EXTRA_VERSION #define COREBOOT_EXTRA_VERSION "" #endif @@ -55,6 +54,3 @@ const char coreboot_linker[] = COREBOOT_LINKER; const char coreboot_assembler[] = COREBOOT_ASSEMBLER;
- - -