diff options
| author | Marshall Dawson <marshalldawson3rd@gmail.com> | 2017-03-09 13:31:52 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2017-04-06 22:13:32 +0200 |
| commit | 5995ee62f725cb06f7ed9b1f3f6df89078cff065 (patch) | |
| tree | 53805da895e8d2d1ef841c3561a0b3cf7e7be016 /src/cpu | |
| parent | 47f4cf87bd0622f1de5df592fbe9b5f759f0ea34 (diff) | |
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)
Change-Id: I7bb15bc4c85c5b4d3d5a6c926c4bc346a282ef27
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-on: https://review.coreboot.org/18989
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/amd/pi/00670F00/Kconfig | 8 | ||||
| -rw-r--r-- | src/cpu/amd/pi/Kconfig | 3 | ||||
| -rw-r--r-- | src/cpu/amd/pi/Makefile.inc | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/cpu/amd/pi/00670F00/Kconfig b/src/cpu/amd/pi/00670F00/Kconfig index b4ba450aaf..16884f1133 100644 --- a/src/cpu/amd/pi/00670F00/Kconfig +++ b/src/cpu/amd/pi/00670F00/Kconfig @@ -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 diff --git a/src/cpu/amd/pi/Kconfig b/src/cpu/amd/pi/Kconfig index ed379ea351..91363c5f59 100644 --- a/src/cpu/amd/pi/Kconfig +++ b/src/cpu/amd/pi/Kconfig @@ -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 diff --git a/src/cpu/amd/pi/Makefile.inc b/src/cpu/amd/pi/Makefile.inc index 3dcbbc35c2..a5ed12054a 100644 --- a/src/cpu/amd/pi/Makefile.inc +++ b/src/cpu/amd/pi/Makefile.inc @@ -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 |