[M] Change in coreboot[master]: vc/amd/pi: Fix "No such file or directory"

[Martin L Roth (Code Review)]

Martin L Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/71855 )

Change subject: vc/amd/pi: Fix "No such file or directory"
......................................................................

vc/amd/pi: Fix "No such file or directory"

Fix:
cc1: error: src/vendorcode/amd/pi/00670F00: No such file or directory [-Werror=missing-include-dirs]
cc1: error: src/vendorcode/amd/pi/00670F00/binaryPI: No such file or directory [-Werror=missing-include-dirs]
cc1: error: src/vendorcode/amd/pi/00670F00/Include: No such file or directory [-Werror=missing-include-dirs]
cc1: error: src/vendorcode/amd/pi/00670F00/Proc: No such file or directory [-Werror=missing-include-dirs]
cc1: error: src/vendorcode/amd/pi/00670F00/Proc/Common: No such file or directory [-Werror=missing-include-dirs]
cc1: error: src/vendorcode/amd/pi/00670F00/Proc/CPU: No such file or directory [-Werror=missing-include-dirs]
cc1: error: src/vendorcode/amd/pi/00670F00/Proc/CPU/Family: No such file or directory [-Werror=missing-include-dirs]
cc1: error: src/vendorcode/amd/pi/00670F00/Proc/Fch: No such file or directory [-Werror=missing-include-dirs]
cc1: error: src/vendorcode/amd/pi/00670F00/Proc/Fch/Common: No such file or directory [-Werror=missing-include-dirs]

Change-Id: I745f4fc421c91c413fe0d3155d3494ed9704eeb6
Signed-off-by: Elyes Haouas 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71855
Tested-by: build bot (Jenkins) 
Reviewed-by: Eric Lai 
Reviewed-by: Martin L Roth 
---
M src/vendorcode/amd/pi/00670F00/Makefile.inc
M src/vendorcode/amd/pi/Makefile.inc
2 files changed, 52 insertions(+), 24 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Martin L Roth: Looks good to me, approved
  Eric Lai: Looks good to me, but someone else must approve

diff --git a/src/vendorcode/amd/pi/00670F00/Makefile.inc b/src/vendorcode/amd/pi/00670F00/Makefile.inc
index 2ac4987..a7eba30 100644
--- a/src/vendorcode/amd/pi/00670F00/Makefile.inc
+++ b/src/vendorcode/amd/pi/00670F00/Makefile.inc
@@ -25,30 +25,6 @@
 #*****************************************************************************

ifeq ($(CONFIG_SOC_AMD_STONEYRIDGE),y)
-# AGESA V5 Files
-
-AGESA_ROOT = $(call strip_quotes,$(CONFIG_AGESA_BINARY_PI_VENDORCODE_PATH))
-
-BINARY_PI_INC  = -I$(AGESA_ROOT)
-BINARY_PI_INC += -I$(AGESA_ROOT)/binaryPI
-BINARY_PI_INC += -I$(AGESA_ROOT)/Include
-BINARY_PI_INC += -I$(AGESA_ROOT)/Proc
-BINARY_PI_INC += -I$(AGESA_ROOT)/Proc/Common
-BINARY_PI_INC += -I$(AGESA_ROOT)/Proc/CPU
-BINARY_PI_INC += -I$(AGESA_ROOT)/Proc/CPU/Family
-BINARY_PI_INC += -I$(AGESA_ROOT)/Proc/Fch
-BINARY_PI_INC += -I$(AGESA_ROOT)/Proc/Fch/Common
-
-AGESA_INC = -I$(obj)
-AGESA_INC += $(BINARY_PI_INC)
-
-AGESA_INC += -I$(src)/soc/amd/stoneyridge/include
-AGESA_INC += -I$(src)/soc/amd/common/block/include
-
-AGESA_INC += -I$(src)/arch/x86/include
-AGESA_INC += -I$(src)/include
-AGESA_INC += -I$(src)/commonlib/include
-AGESA_INC += -I$(VBOOT_SOURCE)/firmware/include

AGESA_CFLAGS += -march=amdfam10 -fno-strict-aliasing -D__LIBAGESA__

diff --git a/src/vendorcode/amd/pi/Makefile.inc b/src/vendorcode/amd/pi/Makefile.inc
index d36671a..e62abab 100644
--- a/src/vendorcode/amd/pi/Makefile.inc
+++ b/src/vendorcode/amd/pi/Makefile.inc
@@ -30,6 +30,33 @@

subdirs-y += 00670F00

+ifeq ($(CONFIG_SOC_AMD_STONEYRIDGE),y)
+# AGESA V5 Files
+
+AGESA_ROOT = $(top)/$(call strip_quotes,$(CONFIG_AGESA_BINARY_PI_VENDORCODE_PATH))
+
+BINARY_PI_INC  = -I$(AGESA_ROOT)
+BINARY_PI_INC += -I$(AGESA_ROOT)/binaryPI
+BINARY_PI_INC += -I$(AGESA_ROOT)/Include
+BINARY_PI_INC += -I$(AGESA_ROOT)/Proc
+BINARY_PI_INC += -I$(AGESA_ROOT)/Proc/Common
+BINARY_PI_INC += -I$(AGESA_ROOT)/Proc/CPU
+BINARY_PI_INC += -I$(AGESA_ROOT)/Proc/CPU/Family
+BINARY_PI_INC += -I$(AGESA_ROOT)/Proc/Fch
+BINARY_PI_INC += -I$(AGESA_ROOT)/Proc/Fch/Common
+
+AGESA_INC = -I$(obj)
+AGESA_INC += $(BINARY_PI_INC)
+
+AGESA_INC += -I$(src)/soc/amd/stoneyridge/include
+AGESA_INC += -I$(src)/soc/amd/common/block/include
+
+AGESA_INC += -I$(src)/arch/x86/include
+AGESA_INC += -I$(src)/include
+AGESA_INC += -I$(src)/commonlib/include
+AGESA_INC += -I$(VBOOT_SOURCE)/firmware/include
+endif
+
 ifeq ($(CONFIG_CPU_AMD_PI_00730F01),y)
 # AGESA V5 Files