Patrick Georgi (patrick@georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5785
-gerrit
commit 2157a88092fce7baed75b02712a834aab9873d58 Author: Patrick Georgi patrick@georgi-clan.de Date: Sun May 18 23:04:27 2014 +0200
build: move include paths where they belong
They're _not_ part of the compiler binary, so they have no place in $(CC_*)
Change-Id: I1e1c3c0be6f75629450a824ea834e1614d48ed9b Signed-off-by: Patrick Georgi patrick@georgi-clan.de --- src/arch/x86/Makefile.inc | 2 +- src/vendorcode/amd/agesa/f10/Makefile.inc | 6 ++---- src/vendorcode/amd/agesa/f12/Makefile.inc | 6 ++---- src/vendorcode/amd/agesa/f14/Makefile.inc | 6 ++---- src/vendorcode/amd/agesa/f15/Makefile.inc | 6 ++---- src/vendorcode/amd/agesa/f15tn/Makefile.inc | 6 ++---- src/vendorcode/amd/agesa/f16kb/Makefile.inc | 6 ++---- src/vendorcode/amd/cimx/rd890/Makefile.inc | 6 ++---- src/vendorcode/amd/cimx/sb700/Makefile.inc | 6 +----- src/vendorcode/amd/cimx/sb800/Makefile.inc | 5 +---- src/vendorcode/amd/cimx/sb900/Makefile.inc | 5 +---- src/vendorcode/intel/Makefile.inc | 5 +---- 12 files changed, 19 insertions(+), 46 deletions(-)
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 02fceba..35330f8 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -256,7 +256,7 @@ $(objgenerated)/crt0.romstage.o: $(objgenerated)/crt0.s
$(objgenerated)/crt0.s: $(objgenerated)/crt0.romstage.S $(obj)/config.h $(obj)/build.h @printf " CC $(subst $(obj)/,,$(@))\n" - $(CC_romstage) $(CPPFLAGS) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/x86/include -I$(obj) -include $(obj)/config.h -include $(obj)/build.h -I. -I$(src) $< -o $@ + $(CC_romstage) $(CPPFLAGS) $(CPPFLAGS_x86_32) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/x86/include -I$(obj) -include $(obj)/config.h -include $(obj)/build.h -I. -I$(src) $< -o $@
endif # CONFIG_ARCH_ROMSTAGE_X86_32
diff --git a/src/vendorcode/amd/agesa/f10/Makefile.inc b/src/vendorcode/amd/agesa/f10/Makefile.inc index 56578ba..7e54871 100644 --- a/src/vendorcode/amd/agesa/f10/Makefile.inc +++ b/src/vendorcode/amd/agesa/f10/Makefile.inc @@ -48,8 +48,6 @@ AGESA_CFLAGS = -msse3 -fno-zero-initialized-in-bss -fno-strict-aliasing export AGESA_ROOT export AGESA_INC export AGESA_CFLAGS -CC_bootblock := $(CC_bootblock) $(AGESA_INC) $(AGESA_CFLAGS) -CC_romstage := $(CC_romstage) $(AGESA_INC) $(AGESA_CFLAGS) -CC_ramstage := $(CC_ramstage) $(AGESA_INC) $(AGESA_CFLAGS) -CC_x86_32 := $(CC_x86_32) $(AGESA_INC) $(AGESA_CFLAGS) +CPPFLAGS_x86_32 += $(AGESA_INC) +CFLAGS_x86_32 += $(AGESA_CFLAGS)
diff --git a/src/vendorcode/amd/agesa/f12/Makefile.inc b/src/vendorcode/amd/agesa/f12/Makefile.inc index 5141471..677c297 100644 --- a/src/vendorcode/amd/agesa/f12/Makefile.inc +++ b/src/vendorcode/amd/agesa/f12/Makefile.inc @@ -83,8 +83,6 @@ AGESA_CFLAGS =-march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-st export AGESA_ROOT := $(AGESA_ROOT) export AGESA_INC := $(AGESA_INC) export AGESA_CFLAGS := $(AGESA_CFLAGS) -CC_bootblock := $(CC_bootblock) $(AGESA_INC) $(AGESA_CFLAGS) -CC_romstage := $(CC_romstage) $(AGESA_INC) $(AGESA_CFLAGS) -CC_ramstage := $(CC_ramstage) $(AGESA_INC) $(AGESA_CFLAGS) -CC_x86_32 := $(CC_x86_32) $(AGESA_INC) $(AGESA_CFLAGS) +CPPFLAGS_x86_32 += $(AGESA_INC) +CFLAGS_x86_32 += $(AGESA_CFLAGS) ####################################################################### diff --git a/src/vendorcode/amd/agesa/f14/Makefile.inc b/src/vendorcode/amd/agesa/f14/Makefile.inc index b9cb696..98fd187 100644 --- a/src/vendorcode/amd/agesa/f14/Makefile.inc +++ b/src/vendorcode/amd/agesa/f14/Makefile.inc @@ -67,10 +67,8 @@ AGESA_CFLAGS =-march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-st export AGESA_ROOT := $(AGESA_ROOT) export AGESA_INC := $(AGESA_INC) export AGESA_CFLAGS := $(AGESA_CFLAGS) -CC_bootblock := $(CC_bootblock) $(AGESA_INC) $(AGESA_CFLAGS) -CC_romstage := $(CC_romstage) $(AGESA_INC) $(AGESA_CFLAGS) -CC_ramstage := $(CC_ramstage) $(AGESA_INC) $(AGESA_CFLAGS) -CC_x86_32 := $(CC_x86_32) $(AGESA_INC) $(AGESA_CFLAGS) +CPPFLAGS_x86_32 += $(AGESA_INC) +CFLAGS_x86_32 += $(AGESA_CFLAGS) #######################################################################
classes-y += libagesa diff --git a/src/vendorcode/amd/agesa/f15/Makefile.inc b/src/vendorcode/amd/agesa/f15/Makefile.inc index b3d000b..3582bf7 100644 --- a/src/vendorcode/amd/agesa/f15/Makefile.inc +++ b/src/vendorcode/amd/agesa/f15/Makefile.inc @@ -516,7 +516,5 @@ AGESA_CFLAGS = -msse3 -fno-zero-initialized-in-bss -fno-strict-aliasing export AGESA_ROOT export AGESA_INC export AGESA_CFLAGS -CC_bootblock := $(CC_bootblock) $(AGESA_INC) $(AGESA_CFLAGS) -CC_romstage := $(CC_romstage) $(AGESA_INC) $(AGESA_CFLAGS) -CC_ramstage := $(CC_ramstage) $(AGESA_INC) $(AGESA_CFLAGS) -CC_x86_32 := $(CC_x86_32) $(AGESA_INC) $(AGESA_CFLAGS) +CPPFLAGS_x86_32 += $(AGESA_INC) +CFLAGS_x86_32 += $(AGESA_CFLAGS) diff --git a/src/vendorcode/amd/agesa/f15tn/Makefile.inc b/src/vendorcode/amd/agesa/f15tn/Makefile.inc index 0f383e0..8c24b40 100644 --- a/src/vendorcode/amd/agesa/f15tn/Makefile.inc +++ b/src/vendorcode/amd/agesa/f15tn/Makefile.inc @@ -80,10 +80,8 @@ AGESA_CFLAGS =-march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-st export AGESA_ROOT := $(AGESA_ROOT) export AGESA_INC := $(AGESA_INC) export AGESA_CFLAGS := $(AGESA_CFLAGS) -CC_bootblock := $(CC_bootblock) $(AGESA_INC) $(AGESA_CFLAGS) -CC_romstage := $(CC_romstage) $(AGESA_INC) $(AGESA_CFLAGS) -CC_ramstage := $(CC_ramstage) $(AGESA_INC) $(AGESA_CFLAGS) -CC_x86_32 := $(CC_x86_32) $(AGESA_INC) $(AGESA_CFLAGS) +CPPFLAGS_x86_32 += $(AGESA_INC) +CFLAGS_x86_32 += $(AGESA_CFLAGS) #######################################################################
classes-y += libagesa diff --git a/src/vendorcode/amd/agesa/f16kb/Makefile.inc b/src/vendorcode/amd/agesa/f16kb/Makefile.inc index 7a97010..d5204c9 100644 --- a/src/vendorcode/amd/agesa/f16kb/Makefile.inc +++ b/src/vendorcode/amd/agesa/f16kb/Makefile.inc @@ -82,8 +82,6 @@ AGESA_CFLAGS =-march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-st export AGESA_ROOT := $(AGESA_ROOT) export AGESA_INC := $(AGESA_INC) export AGESA_CFLAGS := $(AGESA_CFLAGS) -CC_bootblock := $(CC_bootblock) $(AGESA_INC) $(AGESA_CFLAGS) -CC_romstage := $(CC_romstage) $(AGESA_INC) $(AGESA_CFLAGS) -CC_ramstage := $(CC_ramstage) $(AGESA_INC) $(AGESA_CFLAGS) -CC_x86_32 := $(CC_x86_32) $(AGESA_INC) $(AGESA_CFLAGS) +CPPFLAGS_x86_32 += $(AGESA_INC) +CFLAGS_x86_32 += $(AGESA_CFLAGS) ####################################################################### diff --git a/src/vendorcode/amd/cimx/rd890/Makefile.inc b/src/vendorcode/amd/cimx/rd890/Makefile.inc index 68f0c94..b64d7ca 100644 --- a/src/vendorcode/amd/cimx/rd890/Makefile.inc +++ b/src/vendorcode/amd/cimx/rd890/Makefile.inc @@ -114,10 +114,8 @@ export CIMX_ROOT export NB_CIMX_INC export NB_CIMX_CFLAGS
-CC_bootblock := $(CC_bootblock) $(NB_CIMX_CFLAGS) $(NB_CIMX_INC) -CC_romstage := $(CC_romstage) $(NB_CIMX_CFLAGS) $(NB_CIMX_INC) -CC_ramstage := $(CC_ramstage) $(NB_CIMX_CFLAGS) $(NB_CIMX_INC) -CC_x86_32 := $(CC_x86_32) $(NB_CIMX_CFLAGS) $(NB_CIMX_INC) +CPPFLAGS_x86_32 += $(NB_CIMX_INC) +CFLAGS_x86_32 += $(NB_CIMX_CFLAGS)
#######################################################################
diff --git a/src/vendorcode/amd/cimx/sb700/Makefile.inc b/src/vendorcode/amd/cimx/sb700/Makefile.inc index f877176..168ec40 100644 --- a/src/vendorcode/amd/cimx/sb700/Makefile.inc +++ b/src/vendorcode/amd/cimx/sb700/Makefile.inc @@ -68,14 +68,10 @@ ramstage-y += SMM.c ramstage-y += USB.c ramstage-y += LEGACY.c
-SB_CIMX_CFLAGS = export CIMX_ROOT export SB_CIMX_INC export SB_CIMX_CFLAGS -CC_bootblock := $(CC_bootblock) $(SB_CIMX_INC) -CC_romstage := $(CC_romstage) $(SB_CIMX_INC) -CC_ramstage := $(CC_ramstage) $(SB_CIMX_INC) -CC_x86_32 := $(CC_x86_32) $(SB_CIMX_INC) +CPPFLAGS_x86_32 += $(SB_CIMX_INC)
#######################################################################
diff --git a/src/vendorcode/amd/cimx/sb800/Makefile.inc b/src/vendorcode/amd/cimx/sb800/Makefile.inc index 4782b13..51bb5e7 100644 --- a/src/vendorcode/amd/cimx/sb800/Makefile.inc +++ b/src/vendorcode/amd/cimx/sb800/Makefile.inc @@ -79,10 +79,7 @@ CIMX_CFLAGS = export CIMX_ROOT export CIMX_INC export CIMX_CFLAGS -CC_bootblock := $(CC_bootblock) $(CIMX_INC) -CC_romstage := $(CC_romstage) $(CIMX_INC) -CC_ramstage := $(CC_ramstage) $(CIMX_INC) -CC_x86_32 := $(CC_x86_32) $(CIMX_INC) +CPPFLAGS_x86_32 += $(CIMX_INC)
#######################################################################
diff --git a/src/vendorcode/amd/cimx/sb900/Makefile.inc b/src/vendorcode/amd/cimx/sb900/Makefile.inc index 6265597..6b0d6dd 100644 --- a/src/vendorcode/amd/cimx/sb900/Makefile.inc +++ b/src/vendorcode/amd/cimx/sb900/Makefile.inc @@ -82,10 +82,7 @@ CIMX_CFLAGS = export CIMX_ROOT export CIMX_INC export CIMX_CFLAGS -CC_bootblock := $(CC_bootblock) $(CIMX_INC) -CC_romstage := $(CC_romstage) $(CIMX_INC) -CC_ramstage := $(CC_ramstage) $(CIMX_INC) -CC_x86_32 := $(CC_x86_32) $(CIMX_INC) +CPPFLAGS_x86_32 += $(CIMX_INC)
#######################################################################
diff --git a/src/vendorcode/intel/Makefile.inc b/src/vendorcode/intel/Makefile.inc index 458f2fb..866ebb3 100644 --- a/src/vendorcode/intel/Makefile.inc +++ b/src/vendorcode/intel/Makefile.inc @@ -23,8 +23,5 @@ FSP_SRC_FILES := $(wildcard src/vendorcode/intel/$(FSP_PATH)srx/*.c) FSP_C_INPUTS := $(foreach file, $(FSP_SRC_FILES), $(FSP_PATH)srx/$(notdir $(file))) ramstage-y += $(FSP_C_INPUTS)
-CC_bootblock := $(CC_bootblock) -Isrc/vendorcode/intel/$(FSP_PATH)include -CC_romstage := $(CC_romstage) -Isrc/vendorcode/intel/$(FSP_PATH)include -CC_ramstage := $(CC_ramstage) -Isrc/vendorcode/intel/$(FSP_PATH)include -CC_x86_32 := $(CC_x86_32) -Isrc/vendorcode/intel/$(FSP_PATH)include +CFLAGS_x86_32 += -Isrc/vendorcode/intel/$(FSP_PATH)include endif