From 1210026bda8ad1fa24d2f0a7625f5b2cd35662ed Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Sun, 10 Sep 2017 08:48:11 +0300 Subject: AGESA buildsystem: Reduce include path exposure MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove AGESA_AUTOINCLUDES -list from coreboot proper CPPFLAGS. Couple individual directories are now manually added to complete builds. Change-Id: I2595b87641c70e34e49fedf11b42f4961b0842dd Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/21479 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/vendorcode/amd/agesa/f15/Makefile.inc | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/vendorcode/amd/agesa/f15/Makefile.inc') diff --git a/src/vendorcode/amd/agesa/f15/Makefile.inc b/src/vendorcode/amd/agesa/f15/Makefile.inc index 4f6acba469..a3f6bb46f7 100644 --- a/src/vendorcode/amd/agesa/f15/Makefile.inc +++ b/src/vendorcode/amd/agesa/f15/Makefile.inc @@ -21,21 +21,26 @@ AGESA_ROOT = src/vendorcode/amd/agesa/f15 AGESA_AUTOINCLUDES := $(shell find $(AGESA_ROOT)/Proc -type d -exec echo -n "-I"{}" " \;) -AGESA_INC = -I$(src)/vendorcode/amd/include -I$(src)/mainboard/$(MAINBOARDDIR) +AGESA_INC = -I$(src)/vendorcode/amd/include AGESA_INC += -I$(AGESA_ROOT) AGESA_INC += -I$(AGESA_ROOT)/../common AGESA_INC += -I$(AGESA_ROOT)/Include -AGESA_INC += $(AGESA_AUTOINCLUDES) -BUILDOPTS_INCLUDES = -I$(AGESA_ROOT)/Config $(AGESA_INC) +BUILDOPTS_INCLUDES = -I$(AGESA_ROOT)/Config $(AGESA_INC) $(AGESA_AUTOINCLUDES) ## AGESA need sse feature ## CFLAGS_x86_32 += -msse3 -fno-zero-initialized-in-bss -fno-strict-aliasing CFLAGS_x86_64 += -msse3 -fno-zero-initialized-in-bss -fno-strict-aliasing -export AGESA_INC := $(AGESA_INC) -CPPFLAGS_x86_32 += $(AGESA_INC) -CPPFLAGS_x86_64 += $(AGESA_INC) +# These are invalid, coreboot proper should not require +# use of AGESA internal header files. +CPPFLAGS_x86_ANY = +CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/CPU # heapManager.h +CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/CPU/Family +CPPFLAGS_x86_ANY += -I$(AGESA_ROOT)/Proc/Common # CreateStruct.h + +CPPFLAGS_x86_32 += $(AGESA_INC) $(CPPFLAGS_x86_ANY) +CPPFLAGS_x86_64 += $(AGESA_INC) $(CPPFLAGS_x86_ANY) ####################################################################### -- cgit v1.2.3