summaryrefslogtreecommitdiff
path: root/src/vendorcode/amd/agesa/f14
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2017-09-10 08:48:11 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2017-09-13 22:52:13 +0000
commit1210026bda8ad1fa24d2f0a7625f5b2cd35662ed (patch)
tree02453f36c02df0408032225e3cc911b651bd1959 /src/vendorcode/amd/agesa/f14
parentd136b8ef21f9fb4f469a8f0682b086637b0ea542 (diff)
AGESA buildsystem: Reduce include path exposure
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 <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/21479 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/vendorcode/amd/agesa/f14')
-rw-r--r--src/vendorcode/amd/agesa/f14/Makefile.inc17
1 files changed, 11 insertions, 6 deletions
diff --git a/src/vendorcode/amd/agesa/f14/Makefile.inc b/src/vendorcode/amd/agesa/f14/Makefile.inc
index f71b957b3f..d2e0dfcbce 100644
--- a/src/vendorcode/amd/agesa/f14/Makefile.inc
+++ b/src/vendorcode/amd/agesa/f14/Makefile.inc
@@ -32,20 +32,25 @@ AGESA_ROOT = src/vendorcode/amd/agesa/f14
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)
CFLAGS_x86_32 += -march=k8-sse3 -mtune=k8-sse3 -fno-zero-initialized-in-bss -fno-strict-aliasing
CFLAGS_x86_64 += -march=k8-sse3 -mtune=k8-sse3 -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_32 += $(AGESA_INC) $(CPPFLAGS_x86_ANY)
+CPPFLAGS_x86_64 += $(AGESA_INC) $(CPPFLAGS_x86_ANY)
+
#######################################################################
subdirs-y += Legacy/Proc