From 49ec3f0a5f52ff21ecc4ac9e976bf25de9a4e4b2 Mon Sep 17 00:00:00 2001 From: Aaron Durbin Date: Tue, 12 Dec 2017 10:01:06 -0700 Subject: vc/amd/pi/00670F00: fix #include paths to only use Ensure that soc/amd/common/blocks/include is the only #include path for the AMD common code. This removes the duplicate soc/amd/common include as well using the correct #include header in AGESA.c. BUG=b:69262110 Change-Id: I50d85b28514fd905df415f0cc052b9924ee4e741 Signed-off-by: Aaron Durbin Reviewed-on: https://review.coreboot.org/22828 Tested-by: build bot (Jenkins) Reviewed-by: Richard Spiegel Reviewed-by: Justin TerAvest Reviewed-by: Marshall Dawson --- src/soc/amd/common/Makefile.inc | 2 -- src/vendorcode/amd/pi/00670F00/Makefile.inc | 2 +- src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/soc/amd/common/Makefile.inc b/src/soc/amd/common/Makefile.inc index 103c3bfad8..2a5b42a5ea 100644 --- a/src/soc/amd/common/Makefile.inc +++ b/src/soc/amd/common/Makefile.inc @@ -1,7 +1,5 @@ ifeq ($(CONFIG_SOC_AMD_COMMON),y) -CPPFLAGS_common += -I$(src)/soc/amd/common - subdirs-$(CONFIG_SOC_AMD_COMMON_BLOCK) += block endif diff --git a/src/vendorcode/amd/pi/00670F00/Makefile.inc b/src/vendorcode/amd/pi/00670F00/Makefile.inc index d59b553341..a5e644e78c 100644 --- a/src/vendorcode/amd/pi/00670F00/Makefile.inc +++ b/src/vendorcode/amd/pi/00670F00/Makefile.inc @@ -50,7 +50,7 @@ AGESA_INC = -I$(obj) AGESA_INC += $(BINARY_PI_INC) AGESA_INC += -I$(src)/soc/amd/stoneyridge/include -AGESA_INC += -I$(src)/soc/amd/common +AGESA_INC += -I$(src)/soc/amd/common/block/include AGESA_INC += -I$(src)/arch/x86/include AGESA_INC += -I$(src)/include diff --git a/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c b/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c index f37bae77f8..32036bf68b 100644 --- a/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c +++ b/src/vendorcode/amd/pi/00670F00/binaryPI/AGESA.c @@ -41,7 +41,7 @@ ***************************************************************************/ // TODO This list needs to be pruned of anything that is not API #include "AGESA.h" -#include +#include #include "AcpiLib.h" #include "FchCommonCfg.h" #include "Fch.h" -- cgit v1.2.3