Patch set updated for coreboot: vendorcode/amd: Update Kconfig and makefiles for 00670F00

[Marc Jones]

Marc Jones ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17196

-gerrit

commit f48983e09bbffa8d30ebdc8bc2967cf73e518cc0
Author: Marc Jones 
Date:   Tue Sep 20 20:32:47 2016 -0600

vendorcode/amd: Update Kconfig and makefiles for 00670F00

Add Stoney specific code subtree and fix Makefles and Kconfig files.
    Original-Author: Charles Marslett

Original-Signed-off-by: Marc Jones 
    Original-Reviewed-by: Marshall Dawson 
    Original-Tested-by: Marshall Dawson 
    (cherry picked from commit 51a187a3d08a425ef0cc141a7ddc49a70ac931b1)

Change-Id: I13c6b08c780e7bd2abd0fabbde1a89686132f65c
    Signed-off-by: Marc Jones 
---
 src/vendorcode/amd/pi/Kconfig      |  5 ++++-
 src/vendorcode/amd/pi/Makefile.inc | 13 +++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/vendorcode/amd/pi/Kconfig b/src/vendorcode/amd/pi/Kconfig
index 0122366..3b1abe6 100644
--- a/src/vendorcode/amd/pi/Kconfig
+++ b/src/vendorcode/amd/pi/Kconfig
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2013 - 2014, Sage Electronic Engineering, LLC
+# Copyright (C) 2016 Advanced Micro Devices, Inc.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -25,12 +26,13 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #

-if CPU_AMD_PI_00630F01 || CPU_AMD_PI_00730F01 || CPU_AMD_PI_00660F01
+if CPU_AMD_PI_00630F01 || CPU_AMD_PI_00730F01 || CPU_AMD_PI_00670F00 || CPU_AMD_PI_00660F01

config AGESA_BINARY_PI_VENDORCODE_PATH
    string "AGESA PI directory path"
    default "src/vendorcode/amd/pi/00630F01" if CPU_AMD_PI_00630F01
    default "src/vendorcode/amd/pi/00730F01" if CPU_AMD_PI_00730F01
+	default "src/vendorcode/amd/pi/00670F00" if CPU_AMD_PI_00670F00
    default "src/vendorcode/amd/pi/00660F01" if CPU_AMD_PI_00660F01
    help
      Specify where to find the AGESA header files
@@ -40,6 +42,7 @@ config AGESA_BINARY_PI_FILE
    string "AGESA PI binary file name"
    default "3rdparty/blobs/pi/amd/00630F01/FP3/AGESA.bin" if CPU_AMD_PI_00630F01
    default "3rdparty/blobs/pi/amd/00730F01/FT3b/AGESA.bin" if CPU_AMD_PI_00730F01
+	default "3rdparty/blobs/pi/amd/00670F00/FP4/AGESA.bin" if CPU_AMD_PI_00670F00
    default "3rdparty/blobs/pi/amd/00660F01/FP4/AGESA.bin" if CPU_AMD_PI_00660F01
    help
      Specify the binary file to use for AMD platform initialization.
diff --git a/src/vendorcode/amd/pi/Makefile.inc b/src/vendorcode/amd/pi/Makefile.inc
index b1cd900..ac364e1 100644
--- a/src/vendorcode/amd/pi/Makefile.inc
+++ b/src/vendorcode/amd/pi/Makefile.inc
@@ -1,6 +1,6 @@
 #*****************************************************************************
 #
-# Copyright (c) 2012,        Advanced Micro Devices, Inc.
+# Copyright (c) 2012, 2016   Advanced Micro Devices, Inc.
 #               2013 - 2014, Sage Electronic Engineering, LLC
 # All rights reserved.
 #
@@ -28,7 +28,7 @@
 #
 #*****************************************************************************

-ifeq ($(CONFIG_CPU_AMD_PI_00630F01)$(CONFIG_CPU_AMD_PI_00730F01)$(CONFIG_CPU_AMD_PI_00660F01),y)
+ifeq ($(CONFIG_CPU_AMD_PI_00630F01)$(CONFIG_CPU_AMD_PI_00730F01)$(CONFIG_CPU_AMD_PI_00670F00)$(CONFIG_CPU_AMD_PI_00660F01),y)
 # AGESA V5 Files
 AGESA_ROOT = $(call strip_quotes,$(CONFIG_AGESA_BINARY_PI_VENDORCODE_PATH))

@@ -48,6 +48,10 @@ AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Family
 AGESA_INC += -I$(AGESA_ROOT)/Proc/CPU/Feature
 AGESA_INC += -I$(AGESA_ROOT)/Proc/Fch
 AGESA_INC += -I$(AGESA_ROOT)/Proc/Fch/Common
+ifeq ($(CONFIG_CPU_AMD_PI_00670F00),y)
+AGESA_INC += -I$(AGESA_ROOT)/Proc/Fch/Kern
+AGESA_INC += -I$(AGESA_ROOT)/Proc/Psp/PspBaseLib
+endif
 ifeq ($(CONFIG_CPU_AMD_PI_00660F01),y)
 AGESA_INC += -I$(AGESA_ROOT)/Proc/Fch/Kern
 AGESA_INC += -I$(AGESA_ROOT)/Proc/Psp/PspBaseLib
@@ -101,6 +105,11 @@ endef

agesa_raw_files += $(wildcard $(src)/vendorcode/amd/pi/Lib/*.[cS])
 agesa_raw_files += $(wildcard $(AGESA_ROOT)/binaryPI/*.[cS])
+ifeq ($(CONFIG_CPU_AMD_PI_00670F00),y)
+agesa_raw_files += $(wildcard $(AGESA_ROOT)/Proc/Fch/Kern/KernImc/*.[cS])
+agesa_raw_files += $(wildcard $(AGESA_ROOT)/Proc/Fch/Common/*.[cS])
+agesa_raw_files += $(wildcard $(AGESA_ROOT)/Proc/Psp/PspBaseLib/*.[cS])
+endif
 ifeq ($(CONFIG_CPU_AMD_PI_00660F01),y)
 agesa_raw_files += $(wildcard $(AGESA_ROOT)/Proc/Fch/Kern/KernImc/*.[cS])
 agesa_raw_files += $(wildcard $(AGESA_ROOT)/Proc/Fch/Common/*.[cS])