src/soc/intel/cannonlake: Bump MAX_CPU from 8->12

This impacts boards:
 hatch (&variants) and drallion.

Some variants like Puff can have up to 12 cores. coreboot should take
the min() where MAX_CPU is the upper bound.

Further to that, boards themseleves shouldn't be setting the MAX_CPUS,
the chipset should be and so do that.

BRANCH=none
BUG=b:146255011
TEST=./util/abuild/abuild -p none -t google/hatch -x -a

Change-Id: I284d027886f662ebb8414ea92540916ed19bc797
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/37725
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com>
Reviewed-by: Shelley Chen <shchen@google.com>
Reviewed-by: Mathew King <mathewk@chromium.org>
This commit is contained in:
Edward O'Callaghan 2019-12-15 13:30:38 +11:00 committed by Patrick Georgi
parent fc749b23ef
commit b4a68a5a28
3 changed files with 4 additions and 8 deletions

View File

@ -71,10 +71,6 @@ config MAINBOARD_PART_NUMBER
string string
default "Drallion" if BOARD_GOOGLE_DRALLION default "Drallion" if BOARD_GOOGLE_DRALLION
config MAX_CPUS
int
default 8
config UART_FOR_CONSOLE config UART_FOR_CONSOLE
int int
default 0 if BOARD_GOOGLE_DRALLION default 0 if BOARD_GOOGLE_DRALLION

View File

@ -98,10 +98,6 @@ config MAINBOARD_PART_NUMBER
default "Puff" if BOARD_GOOGLE_PUFF default "Puff" if BOARD_GOOGLE_PUFF
default "Stryke" if BOARD_GOOGLE_STRYKE default "Stryke" if BOARD_GOOGLE_STRYKE
config MAX_CPUS
int
default 8
config OVERRIDE_DEVICETREE config OVERRIDE_DEVICETREE
string string
default "variants/helios_diskswap/overridetree.cb" if BOARD_GOOGLE_HELIOS_DISKSWAP default "variants/helios_diskswap/overridetree.cb" if BOARD_GOOGLE_HELIOS_DISKSWAP

View File

@ -108,6 +108,10 @@ config CPU_SPECIFIC_OPTIONS
select FSP_T_XIP if FSP_CAR select FSP_T_XIP if FSP_CAR
select HECI_DISABLE_USING_SMM if !SOC_INTEL_COFFEELAKE && !SOC_INTEL_WHISKEYLAKE && !SOC_INTEL_COMETLAKE select HECI_DISABLE_USING_SMM if !SOC_INTEL_COFFEELAKE && !SOC_INTEL_WHISKEYLAKE && !SOC_INTEL_COMETLAKE
config MAX_CPUS
int
default 12
config DCACHE_RAM_BASE config DCACHE_RAM_BASE
default 0xfef00000 default 0xfef00000