GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Marshall Dawson 2017-10-30 16:11:45 -06:00 committed by Aaron Durbin
parent 596ecec009
commit 5f0520a909
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/soc/amd/stoneyridge/Kconfig
View File

@ -294,6 +294,22 @@ config USE_PSPSCUREOS
If unsure, answer 'y' 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 config AMDFW_OUTSIDE_CBFS
bool "The AMD firmware is outside CBFS" bool "The AMD firmware is outside CBFS"
default n default n

19
src/soc/amd/stoneyridge/Makefile.inc
View File

@ -270,4 +270,23 @@ apu/amdfw-type := raw
endif # ifeq ($(CONFIG_AMDFW_OUTSIDE_CBFS),y) 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) endif # ($(CONFIG_SOC_AMD_STONEYRIDGE_FP4)$(CONFIG_SOC_AMD_STONEYRIDGE_FT4),y)