diff options
| author | Marshall Dawson <marshalldawson3rd@gmail.com> | 2019-11-25 11:47:32 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2019-12-11 11:41:26 +0000 |
| commit | d786843ca6c0078fd268cc9516acc10109e98919 (patch) | |
| tree | c0cae40e077a4da1690909a1e6446f5eefc554d4 /src/soc | |
| parent | 6851922f08935af70180a68ac8d81a802c1e9207 (diff) | |
| download | coreboot-d786843ca6c0078fd268cc9516acc10109e98919.tar.xz | |
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>
Diffstat (limited to 'src/soc')
| -rw-r--r-- | src/soc/amd/stoneyridge/Kconfig | 28 | ||||
| -rw-r--r-- | src/soc/amd/stoneyridge/Makefile.inc | 4 |
2 files changed, 2 insertions, 30 deletions
diff --git a/src/soc/amd/stoneyridge/Kconfig b/src/soc/amd/stoneyridge/Kconfig index 4b39ec756b..a03b8f3e84 100644 --- a/src/soc/amd/stoneyridge/Kconfig +++ b/src/soc/amd/stoneyridge/Kconfig @@ -20,34 +20,6 @@ config 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 def_bool y select ARCH_BOOTBLOCK_X86_32 diff --git a/src/soc/amd/stoneyridge/Makefile.inc b/src/soc/amd/stoneyridge/Makefile.inc index ee4560d085..15216b7934 100644 --- a/src/soc/amd/stoneyridge/Makefile.inc +++ b/src/soc/amd/stoneyridge/Makefile.inc @@ -27,7 +27,7 @@ # 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/x86/tsc @@ -338,4 +338,4 @@ files_added:: warn_no_amdfw 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) |