summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarshall Dawson <marshalldawson3rd@gmail.com>2017-10-30 16:11:45 -0600
committerAaron Durbin <adurbin@chromium.org>2017-11-08 21:59:08 +0000
commit5f0520a90951eba302973025b8e531cb915152dd (patch)
tree3792c9ed68af5f26bdd177cb5b6538498f3776c5
parent596ecec009d722aebbfc16074b89bc78dc9ede26 (diff)
amd/stoneyridge: Add SMU firmware blobs to cbfs
Stoney Ridge supports two different sets of SMU firmware, one for either fanless OPNs and one for fanned. Add a Kconfig mechanism to select the proper set and add the blobs into cbfs. BUG=b:66339938 Change-Id: I8510823e2232b74ec6fe001cc28953f53b2aa520 Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com> Reviewed-on: https://review.coreboot.org/22057 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/soc/amd/stoneyridge/Kconfig16
-rw-r--r--src/soc/amd/stoneyridge/Makefile.inc19
2 files changed, 35 insertions, 0 deletions
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig
index 30da8a081a..5749c8009b 100644
--- a/src/soc/amd/stoneyridge/Kconfig
+++ b/src/soc/amd/stoneyridge/Kconfig
@@ -294,6 +294,22 @@ config USE_PSPSCUREOS
If unsure, answer 'y'
+config SOC_AMD_SMU_FANLESS
+ bool
+ depends on SOC_AMD_PSP_SELECTABLE_SMU_FW
+ default n if SOC_AMD_SMU_NOTFANLESS
+ default y
+
+config SOC_AMD_SMU_FANNED
+ bool
+ depends on SOC_AMD_PSP_SELECTABLE_SMU_FW
+ default n
+ select SOC_AMD_SMU_NOTFANLESS
+
+config SOC_AMD_SMU_NOTFANLESS # helper symbol - do not use
+ bool
+ depends on SOC_AMD_PSP_SELECTABLE_SMU_FW
+
config AMDFW_OUTSIDE_CBFS
bool "The AMD firmware is outside CBFS"
default n
diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc
index 85452c4350..921691f432 100644
--- a/src/soc/amd/stoneyridge/Makefile.inc
+++ b/src/soc/amd/stoneyridge/Makefile.inc
@@ -270,4 +270,23 @@ apu/amdfw-type := raw
endif # ifeq ($(CONFIG_AMDFW_OUTSIDE_CBFS),y)
+ifeq ($(CONFIG_SOC_AMD_PSP_SELECTABLE_SMU_FW),y)
+
+cbfs-files-y += smu_fw
+cbfs-files-y += smu_fw2
+smu_fw-type := raw
+smu_fw2-type := raw
+
+ifeq ($(CONFIG_SOC_AMD_SMU_FANLESS),y)
+smu_fw-file := $(SMUFWM_FN_FILE)
+smu_fw2-file := $(SMUFIRMWARE2_FN_FILE)
+else ifeq ($(CONFIG_SOC_AMD_SMU_FANNED),y)
+smu_fw-file := $(SMUFWM_FILE)
+smu_fw2-file := $(SMUFIRMWARE2_FILE)
+else
+$(error "Proper SMU Firmware not selected")
+endif
+
+endif # ifeq ($(CONFIG_SOC_AMD_PSP_SELECTABLE_SMU_FW),y)
+
endif # ($(CONFIG_SOC_AMD_STONEYRIDGE_FP4)$(CONFIG_SOC_AMD_STONEYRIDGE_FT4),y)