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

soc/amd/stoneyridge|mbs: Deprecate SOC_AMD_NAME_PKG and others 

Add package and APU selections to mainboards and remove symbols no
longer used in soc//stoneyridge.

Change-Id: I60214b6557bef50358f9ec8f9fcdb7265e04663b
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37225
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
This commit is contained in:
Marshall Dawson 2019-11-25 11:47:32 -07:00 committed by Patrick Georgi
parent 6851922f08
commit d786843ca6
7 changed files with 14 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mainboard/amd/gardenia/Kconfig
View File

@ -18,7 +18,8 @@ if BOARD_AMD_GARDENIA
config BOARD_SPECIFIC_OPTIONS config BOARD_SPECIFIC_OPTIONS
def_bool y def_bool y
select SOC_AMD_STONEYRIDGE select SOC_AMD_STONEYRIDGE
select SOC_AMD_STONEYRIDGE_FP4 select AMD_APU_STONEYRIDGE
select AMD_APU_PKG_FP4
select HAVE_PIRQ_TABLE select HAVE_PIRQ_TABLE
select HAVE_MP_TABLE select HAVE_MP_TABLE
select HAVE_ACPI_TABLES select HAVE_ACPI_TABLES

3
src/mainboard/amd/padmelon/Kconfig
View File

@ -18,7 +18,8 @@ if BOARD_AMD_PADMELON
config BOARD_SPECIFIC_OPTIONS # dummy config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y def_bool y
select SOC_AMD_STONEYRIDGE select SOC_AMD_STONEYRIDGE
select SOC_AMD_MERLINFALCON select AMD_APU_MERLINFALCON
select AMD_APU_PKG_FP4
select BOARD_ROMSIZE_KB_8192 select BOARD_ROMSIZE_KB_8192
select DRIVERS_I2C_GENERIC select DRIVERS_I2C_GENERIC
select DRIVERS_PS2_KEYBOARD select DRIVERS_PS2_KEYBOARD

3
src/mainboard/google/kahlee/Kconfig
View File

@ -16,7 +16,8 @@
config BOARD_GOOGLE_BASEBOARD_KAHLEE config BOARD_GOOGLE_BASEBOARD_KAHLEE
bool bool
select SOC_AMD_STONEYRIDGE select SOC_AMD_STONEYRIDGE
select SOC_AMD_STONEYRIDGE_FT4 select AMD_APU_STONEYRIDGE
select AMD_APU_PKG_FT4
select ALWAYS_LOAD_OPROM select ALWAYS_LOAD_OPROM
select ALWAYS_RUN_OPROM select ALWAYS_RUN_OPROM
select BOARD_ROMSIZE_KB_16384 select BOARD_ROMSIZE_KB_16384

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

@ -20,34 +20,6 @@ config SOC_AMD_STONEYRIDGE
if SOC_AMD_STONEYRIDGE if SOC_AMD_STONEYRIDGE
config SOC_AMD_STONEYRIDGE_FP4
bool
select AMD_APU_STONEYRIDGE
select AMD_APU_PKG_FP4
help
AMD Stoney Ridge FP4 support
config SOC_AMD_STONEYRIDGE_FT4
bool
select AMD_APU_STONEYRIDGE
select AMD_APU_PKG_FT4
help
AMD Stoney Ridge FT4 support
config SOC_AMD_MERLINFALCON
bool
select AMD_APU_MERLINFALCON
select AMD_APU_PKG_FP4
help
AMD Merlin Falcon FP4 support
config SOC_AMD_PRAIRIEFALCON
bool
select AMD_APU_PRAIRIEFALCON
select AMD_APU_PKG_FP4
help
AMD Prairie Falcon FP4 support
config CPU_SPECIFIC_OPTIONS config CPU_SPECIFIC_OPTIONS
def_bool y def_bool y
select ARCH_BOOTBLOCK_X86_32 select ARCH_BOOTBLOCK_X86_32

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

@ -27,7 +27,7 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# #
#***************************************************************************** #*****************************************************************************
ifeq ($(CONFIG_SOC_AMD_MERLINFALCON)$(CONFIG_SOC_AMD_STONEYRIDGE_FP4)$(CONFIG_SOC_AMD_STONEYRIDGE_FT4),y) ifeq ($(CONFIG_SOC_AMD_STONEYRIDGE),y)
subdirs-y += ../../../cpu/amd/mtrr/ subdirs-y += ../../../cpu/amd/mtrr/
subdirs-y += ../../../cpu/x86/tsc subdirs-y += ../../../cpu/x86/tsc
@ -338,4 +338,4 @@ files_added:: warn_no_amdfw
endif # ifneq ($(FIRMWARE_LOCATE),) endif # ifneq ($(FIRMWARE_LOCATE),)
endif # ($(CONFIG_SOC_AMD_MERLINFALCON)$(CONFIG_SOC_AMD_STONEYRIDGE_FP4)$(CONFIG_SOC_AMD_STONEYRIDGE_FT4),y) endif # ($(CONFIG_SOC_AMD_STONEYRIDGE),y)

2
src/vendorcode/amd/pi/00670F00/Makefile.inc
View File

@ -28,7 +28,7 @@
# #
#***************************************************************************** #*****************************************************************************
ifeq ($(CONFIG_SOC_AMD_MERLINFALCON)$(CONFIG_SOC_AMD_STONEYRIDGE_FP4)$(CONFIG_SOC_AMD_STONEYRIDGE_FT4),y) ifeq ($(CONFIG_SOC_AMD_STONEYRIDGE),y)
# AGESA V5 Files # AGESA V5 Files
AGESA_ROOT = $(call strip_quotes,$(CONFIG_AGESA_BINARY_PI_VENDORCODE_PATH)) AGESA_ROOT = $(call strip_quotes,$(CONFIG_AGESA_BINARY_PI_VENDORCODE_PATH))

10
src/vendorcode/amd/pi/Kconfig
View File

@ -26,14 +26,14 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# #
if CPU_AMD_PI_00630F01 || CPU_AMD_PI_00730F01 || CPU_AMD_PI_00660F01 || SOC_AMD_STONEYRIDGE || SOC_AMD_MERLINFALCON if CPU_AMD_PI_00630F01 || CPU_AMD_PI_00730F01 || CPU_AMD_PI_00660F01 || SOC_AMD_STONEYRIDGE
config AGESA_BINARY_PI_VENDORCODE_PATH config AGESA_BINARY_PI_VENDORCODE_PATH
string "AGESA PI directory path" string "AGESA PI directory path"
default "src/vendorcode/amd/pi/00630F01" if CPU_AMD_PI_00630F01 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/00730F01" if CPU_AMD_PI_00730F01
default "src/vendorcode/amd/pi/00670F00" if SOC_AMD_MERLINFALCON default "src/vendorcode/amd/pi/00670F00" if AMD_APU_MERLINFALCON
default "src/vendorcode/amd/pi/00670F00" if SOC_AMD_STONEYRIDGE default "src/vendorcode/amd/pi/00670F00" if AMD_APU_STONEYRIDGE || AMD_APU_PRAIRIEFALCON
default "src/vendorcode/amd/pi/00660F01" if CPU_AMD_PI_00660F01 default "src/vendorcode/amd/pi/00660F01" if CPU_AMD_PI_00660F01
help help
Specify where to find the AGESA header files Specify where to find the AGESA header files
@ -43,8 +43,8 @@ config AGESA_BINARY_PI_FILE
string "AGESA PI binary file name" 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/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/00730F01/FT3b/AGESA.bin" if CPU_AMD_PI_00730F01
default "3rdparty/amd_blobs/stoneyridge/pi/CZ/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_MERLINFALCON && USE_AMD_BLOBS default "3rdparty/amd_blobs/stoneyridge/pi/CZ/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if AMD_APU_MERLINFALCON && USE_AMD_BLOBS
default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if SOC_AMD_PRAIRIEFALCON && USE_AMD_BLOBS default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if AMD_APU_PRAIRIEFALCON && USE_AMD_BLOBS
default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if AMD_APU_STONEYRIDGE && USE_AMD_BLOBS default "3rdparty/amd_blobs/stoneyridge/pi/ST/$(CONFIG_AMD_SOC_PACKAGE)/AGESA.bin" if AMD_APU_STONEYRIDGE && USE_AMD_BLOBS
default "3rdparty/blobs/pi/amd/00660F01/FP4/AGESA.bin" if CPU_AMD_PI_00660F01 default "3rdparty/blobs/pi/amd/00660F01/FP4/AGESA.bin" if CPU_AMD_PI_00660F01
help help