UPSTREAM: northbridge/amd/stoney: Add FT4 package

Add package options to the CPU Kconfig that may be selected by the
mainboard's Kconfig file.  Stoney Ridge is available in FP4 and FT4
packages and each requires a unique binaryPI image.  Default to the
correct blob used by the northbridge by looking at the CPU's package.

Also modify Gardenia to select the right package.

See the Infrastructure Roadmap for FP4 (#53555) and FT4 (#55349) for
additional details for the packages.

Original-Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Original-Reviewed-by: Marc Jones <marcj303@gmail.com>
(cherry picked from commit 7b8ed7b732b7cf5503862c5edc6537d672109aec)

BUG=none
BRANCH=none
TEST=none

Change-Id: I2fcb523d6cfef530fb7b2a9b9c7ca2e92a73297f
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 5995ee62f7
Original-Change-Id: I7bb15bc4c85c5b4d3d5a6c926c4bc346a282ef27
Original-Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Original-Reviewed-on: https://review.coreboot.org/18989
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://chromium-review.googlesource.com/471465
This commit is contained in:
Marshall Dawson 2017-03-09 13:31:52 -07:00 committed by chrome-bot
commit ab48ce26df
8 changed files with 29 additions and 20 deletions

View file

@ -13,11 +13,15 @@
# GNU General Public License for more details.
#
config CPU_AMD_PI_00670F00
config CPU_AMD_PI_00670F00_FP4
bool
select X86_AMD_FIXED_MTRRS
if CPU_AMD_PI_00670F00
config CPU_AMD_PI_00670F00_FT4
bool
select X86_AMD_FIXED_MTRRS
if CPU_AMD_PI_00670F00_FP4 || CPU_AMD_PI_00670F00_FT4
config CPU_ADDR_BITS
int

View file

@ -17,7 +17,8 @@ config CPU_AMD_PI
bool
default y if CPU_AMD_PI_00630F01
default y if CPU_AMD_PI_00730F01
default y if CPU_AMD_PI_00670F00
default y if CPU_AMD_PI_00670F00_FP4
default y if CPU_AMD_PI_00670F00_FT4
default y if CPU_AMD_PI_00660F01
default n
select ARCH_BOOTBLOCK_X86_32

View file

@ -15,7 +15,8 @@
subdirs-$(CONFIG_CPU_AMD_PI_00630F01) += 00630F01
subdirs-$(CONFIG_CPU_AMD_PI_00730F01) += 00730F01
subdirs-$(CONFIG_CPU_AMD_PI_00670F00) += 00670F00
subdirs-$(CONFIG_CPU_AMD_PI_00670F00_FP4) += 00670F00
subdirs-$(CONFIG_CPU_AMD_PI_00670F00_FT4) += 00670F00
subdirs-$(CONFIG_CPU_AMD_PI_00660F01) += 00660F01
ramstage-$(CONFIG_SPI_FLASH) += spi.c