From c6c9b9cf486eaa1bc7892b142e9201463fc99025 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 7 Sep 2020 13:45:53 +0200 Subject: [PATCH] apollolake: Define MAX_CPUS at SoC scope The three Intel Apollo Lake boards (apl_rvp, leafhill and minnow3) do not define MAX_CPUS, which would then default to 1. Since this is most likely an oversight, use the same value as other Apollo Lake boards. To ensure this does not happen again, factor out MAX_CPUS to SoC scope. Change-Id: I5ed98a6b592c8010b59eca7ff773ae1ccc4cd7b1 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/45144 Reviewed-by: Nico Huber Reviewed-by: Mario Scheithauer Tested-by: build bot (Jenkins) --- src/mainboard/google/reef/Kconfig | 4 ---- src/mainboard/siemens/mc_apl1/Kconfig | 4 ---- src/mainboard/up/squared/Kconfig | 4 ---- src/soc/intel/apollolake/Kconfig | 2 +- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/mainboard/google/reef/Kconfig b/src/mainboard/google/reef/Kconfig index de4df6213b..76a864062f 100644 --- a/src/mainboard/google/reef/Kconfig +++ b/src/mainboard/google/reef/Kconfig @@ -81,10 +81,6 @@ config MAINBOARD_FAMILY default "Google_Coral" if BOARD_GOOGLE_CORAL default "Google_Reef" -config MAX_CPUS - int - default 4 - config UART_FOR_CONSOLE int default 2 diff --git a/src/mainboard/siemens/mc_apl1/Kconfig b/src/mainboard/siemens/mc_apl1/Kconfig index 705351f742..ac85670644 100644 --- a/src/mainboard/siemens/mc_apl1/Kconfig +++ b/src/mainboard/siemens/mc_apl1/Kconfig @@ -40,8 +40,4 @@ config MAINBOARD_PART_NUMBER config UART_FOR_CONSOLE default 2 -config MAX_CPUS - int - default 4 - endif # BOARD_SIEMENS_BASEBOARD_MC_APL1 diff --git a/src/mainboard/up/squared/Kconfig b/src/mainboard/up/squared/Kconfig index 836c5bb0f9..25e751c04a 100644 --- a/src/mainboard/up/squared/Kconfig +++ b/src/mainboard/up/squared/Kconfig @@ -60,10 +60,6 @@ config PXE_ROM_ID string default "10ec,8168" -config MAX_CPUS - int - default 4 - config LINUX_COMMAND_LINE string default "console=ttyS4,115200 earlyprintk=ttyS4,115200,keep" if PAYLOAD_LINUXBOOT && UART_FOR_CONSOLE=0 diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index f5d932396b..a30333bb68 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -110,7 +110,7 @@ config CPU_SPECIFIC_OPTIONS config MAX_CPUS int - default 4 if SOC_INTEL_GEMINILAKE + default 4 config CHROMEOS select CHROMEOS_RAMOOPS_DYNAMIC