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
This commit is contained in:
committed by
Stefan Reinauer
parent
e0d607a4c5
commit
e9f3258e0b
@@ -42,9 +42,9 @@ endif
|
||||
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
|
||||
|
@@ -193,8 +193,7 @@ ROMCCFLAGS ?= -mcpu=p2 -O2
|
||||
|
||||
$(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)/ap_romstage.o: $(src)/mainboard/$(MAINBOARDDIR)
|
||||
|
||||
$(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"
|
||||
|
@@ -8,3 +8,5 @@ obj-y += exception.o
|
||||
|
||||
initobj-y += printk_init.o
|
||||
initobj-y += cbfs_and_run.o
|
||||
|
||||
$(obj)/arch/i386/lib/console.o :: $(obj)/build.h
|
||||
|
@@ -29,3 +29,5 @@ obj-$(CONFIG_COMPRESSED_PAYLOAD_LZMA) += lzma.o
|
||||
obj-$(CONFIG_BOOTSPLASH) += jpeg.o
|
||||
|
||||
smmobj-y += memcpy.o
|
||||
|
||||
$(obj)/lib/version.o :: $(obj)/build.h
|
||||
|
@@ -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_compiler[] = COREBOOT_COMPILER;
|
||||
const char coreboot_linker[] = COREBOOT_LINKER;
|
||||
const char coreboot_assembler[] = COREBOOT_ASSEMBLER;
|
||||
|
||||
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user