sandybridge boards: Factor out MAX_CPUS

Also update autoport accordingly.

Change-Id: I12481363cf0e7afc54e2e339504f70632e8d72e2
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41839
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

40 files changed, 4 insertions, 154 deletions

diff --git a/src/cpu/intel/model_206ax/Kconfig b/src/cpu/intel/model_206ax/Kconfig
index 2f0ebf9f50..c6a50207c5 100644
--- a/src/cpu/intel/model_206ax/Kconfig
+++ b/src/cpu/intel/model_206ax/Kconfig
@@ -34,4 +34,8 @@ config IED_REGION_SIZE
 	hex
 	default 0x400000
 
+config MAX_CPUS
+	int
+	default 8
+
 endif
diff --git a/src/mainboard/apple/macbookair4_2/Kconfig b/src/mainboard/apple/macbookair4_2/Kconfig
index 2f48e50458..3c39eec859 100644
--- a/src/mainboard/apple/macbookair4_2/Kconfig
+++ b/src/mainboard/apple/macbookair4_2/Kconfig
@@ -36,8 +36,4 @@ config VGA_BIOS_ID
 config DRAM_RESET_GATE_GPIO
 	int
 	default 28
-
-config MAX_CPUS
-	int
-	default 8
 endif
diff --git a/src/mainboard/asrock/b75pro3-m/Kconfig b/src/mainboard/asrock/b75pro3-m/Kconfig
index 577423c508..6abfa6cf82 100644
--- a/src/mainboard/asrock/b75pro3-m/Kconfig
+++ b/src/mainboard/asrock/b75pro3-m/Kconfig
@@ -24,8 +24,4 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "B75 Pro3-M"
 
-config MAX_CPUS
-	int
-	default 8
-
 endif
diff --git a/src/mainboard/asus/h61m-cs/Kconfig b/src/mainboard/asus/h61m-cs/Kconfig
index 6040208f27..56c0528039 100644
--- a/src/mainboard/asus/h61m-cs/Kconfig
+++ b/src/mainboard/asus/h61m-cs/Kconfig
@@ -24,8 +24,4 @@ config MAINBOARD_DIR
 config MAINBOARD_PART_NUMBER
 	string
 	default "H61M-CS"
-
-config MAX_CPUS
-	int
-	default 8
 endif
diff --git a/src/mainboard/asus/maximus_iv_gene-z/Kconfig b/src/mainboard/asus/maximus_iv_gene-z/Kconfig
index 34877ff594..81d5b973a9 100644
--- a/src/mainboard/asus/maximus_iv_gene-z/Kconfig
+++ b/src/mainboard/asus/maximus_iv_gene-z/Kconfig
@@ -32,10 +32,6 @@ config VGA_BIOS_ID
 	string
 	default "8086,0112"
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 1
diff --git a/src/mainboard/asus/p8h61-m_lx/Kconfig b/src/mainboard/asus/p8h61-m_lx/Kconfig
index a1d79066db..069800ade8 100644
--- a/src/mainboard/asus/p8h61-m_lx/Kconfig
+++ b/src/mainboard/asus/p8h61-m_lx/Kconfig
@@ -29,10 +29,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "P8H61-M LX"
 
-config MAX_CPUS
-	int
-	default 8
-
 #
 # These ME partitions need to be whitelisted for correct system
 # operation. Example issues from removing them include: no serial output
diff --git a/src/mainboard/asus/p8h61-m_lx3_r2_0/Kconfig b/src/mainboard/asus/p8h61-m_lx3_r2_0/Kconfig
index b3a6af986e..265d0cb197 100644
--- a/src/mainboard/asus/p8h61-m_lx3_r2_0/Kconfig
+++ b/src/mainboard/asus/p8h61-m_lx3_r2_0/Kconfig
@@ -26,8 +26,4 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "P8H61-M LX3 R2.0"
 
-config MAX_CPUS
-	int
-	default 8
-
 endif
diff --git a/src/mainboard/asus/p8h61-m_pro/Kconfig b/src/mainboard/asus/p8h61-m_pro/Kconfig
index 05bb00d5ff..a619c178dc 100644
--- a/src/mainboard/asus/p8h61-m_pro/Kconfig
+++ b/src/mainboard/asus/p8h61-m_pro/Kconfig
@@ -37,8 +37,4 @@ config VGA_BIOS_ID
 	string
 	default "8086,0152"
 
-config MAX_CPUS
-	int
-	default 8
-
 endif # BOARD_ASUS_P8H61_M_PRO
diff --git a/src/mainboard/asus/p8z77-m_pro/Kconfig b/src/mainboard/asus/p8z77-m_pro/Kconfig
index 5973e3a21b..19a1fe1e5e 100644
--- a/src/mainboard/asus/p8z77-m_pro/Kconfig
+++ b/src/mainboard/asus/p8z77-m_pro/Kconfig
@@ -28,8 +28,4 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "P8Z77-M PRO"
 
-config MAX_CPUS
-	int
-	default 8
-
 endif # BOARD_ASUS_P8Z77_M_PRO
diff --git a/src/mainboard/asus/p8z77-v_lx2/Kconfig b/src/mainboard/asus/p8z77-v_lx2/Kconfig
index e49f118641..4e96c59a12 100644
--- a/src/mainboard/asus/p8z77-v_lx2/Kconfig
+++ b/src/mainboard/asus/p8z77-v_lx2/Kconfig
@@ -24,8 +24,4 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "P8Z77-V LX2"
 
-config MAX_CPUS
-	int
-	default 8
-
 endif
diff --git a/src/mainboard/compulab/intense_pc/Kconfig b/src/mainboard/compulab/intense_pc/Kconfig
index 68a01f18bc..5ea49370aa 100644
--- a/src/mainboard/compulab/intense_pc/Kconfig
+++ b/src/mainboard/compulab/intense_pc/Kconfig
@@ -32,10 +32,6 @@ config DRAM_RESET_GATE_GPIO # FIXME: check this
 	int
 	default 60
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX # FIXME: check this
 	int
 	default 2
diff --git a/src/mainboard/dell/optiplex_9010/Kconfig b/src/mainboard/dell/optiplex_9010/Kconfig
index 6a3feb3751..4179f64b1f 100644
--- a/src/mainboard/dell/optiplex_9010/Kconfig
+++ b/src/mainboard/dell/optiplex_9010/Kconfig
@@ -40,10 +40,6 @@ config DRAM_RESET_GATE_GPIO
 	int
 	default 60
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 2
diff --git a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
index 719a649678..4eda2676d0 100644
--- a/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
+++ b/src/mainboard/gigabyte/ga-b75m-d3h/Kconfig
@@ -45,10 +45,6 @@ config OVERRIDE_DEVICETREE
 	string
 	default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" if BOARD_GIGABYTE_GA_B75_D3V
 
-config MAX_CPUS
-	int
-	default 8
-
 # Override the default variant behavior, since the data.vbt is the same
 config INTEL_GMA_VBT_FILE
 	string
diff --git a/src/mainboard/gigabyte/ga-h61m-series/Kconfig b/src/mainboard/gigabyte/ga-h61m-series/Kconfig
index 05c59d5258..60d516b261 100644
--- a/src/mainboard/gigabyte/ga-h61m-series/Kconfig
+++ b/src/mainboard/gigabyte/ga-h61m-series/Kconfig
@@ -38,10 +38,6 @@ config OVERRIDE_DEVICETREE
 	string
 	default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
 
-config MAX_CPUS
-	int
-	default 8
-
 # Override the default variant behavior, since the data.vbt is the same
 config INTEL_GMA_VBT_FILE
 	default "src/mainboard/$(MAINBOARDDIR)/data.vbt"
diff --git a/src/mainboard/google/butterfly/Kconfig b/src/mainboard/google/butterfly/Kconfig
index 4e014558ca..2bcff1ca2f 100644
--- a/src/mainboard/google/butterfly/Kconfig
+++ b/src/mainboard/google/butterfly/Kconfig
@@ -33,10 +33,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "Butterfly"
 
-config MAX_CPUS
-	int
-	default 8
-
 config VGA_BIOS_FILE
 	string
 	default "pci8086,0106.rom"
diff --git a/src/mainboard/google/link/Kconfig b/src/mainboard/google/link/Kconfig
index 2c2a05d37d..2c3076dadc 100644
--- a/src/mainboard/google/link/Kconfig
+++ b/src/mainboard/google/link/Kconfig
@@ -33,10 +33,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "Link"
 
-config MAX_CPUS
-	int
-	default 8
-
 config VGA_BIOS_FILE
 	string
 	default "pci8086,0166.rom"
diff --git a/src/mainboard/google/parrot/Kconfig b/src/mainboard/google/parrot/Kconfig
index 4afd76110e..164717cce2 100644
--- a/src/mainboard/google/parrot/Kconfig
+++ b/src/mainboard/google/parrot/Kconfig
@@ -34,10 +34,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "Parrot"
 
-config MAX_CPUS
-	int
-	default 8
-
 config VGA_BIOS_FILE
 	string
 	default "pci8086,0106.rom"
diff --git a/src/mainboard/google/stout/Kconfig b/src/mainboard/google/stout/Kconfig
index b0ab7f948b..d4d99f5e78 100644
--- a/src/mainboard/google/stout/Kconfig
+++ b/src/mainboard/google/stout/Kconfig
@@ -32,10 +32,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "Stout"
 
-config MAX_CPUS
-	int
-	default 8
-
 config VGA_BIOS_FILE
 	string
 	default "pci8086,0156.rom"
diff --git a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
index 6734d5bf2a..1564bb661d 100644
--- a/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
+++ b/src/mainboard/hp/compaq_8200_elite_sff/Kconfig
@@ -42,10 +42,6 @@ config DRAM_RESET_GATE_GPIO
 	int
 	default 60
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 2
diff --git a/src/mainboard/hp/snb_ivb_laptops/Kconfig b/src/mainboard/hp/snb_ivb_laptops/Kconfig
index c4cd3a4b59..ee612357c2 100644
--- a/src/mainboard/hp/snb_ivb_laptops/Kconfig
+++ b/src/mainboard/hp/snb_ivb_laptops/Kconfig
@@ -52,10 +52,6 @@ config VGA_BIOS_ID
 	default "8086,0116" if SOUTHBRIDGE_INTEL_BD82X6X
 	default "8086,0166" if SOUTHBRIDGE_INTEL_C216
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 2 if BOARD_HP_2570P
diff --git a/src/mainboard/hp/z220_sff_workstation/Kconfig b/src/mainboard/hp/z220_sff_workstation/Kconfig
index 82a956263c..b1cf89cea7 100644
--- a/src/mainboard/hp/z220_sff_workstation/Kconfig
+++ b/src/mainboard/hp/z220_sff_workstation/Kconfig
@@ -54,10 +54,6 @@ config DRAM_RESET_GATE_GPIO
 	int
 	default 60
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 2
diff --git a/src/mainboard/kontron/ktqm77/Kconfig b/src/mainboard/kontron/ktqm77/Kconfig
index a67fa9e13e..52798bff49 100644
--- a/src/mainboard/kontron/ktqm77/Kconfig
+++ b/src/mainboard/kontron/ktqm77/Kconfig
@@ -23,10 +23,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "KTQM77/mITX"
 
-config MAX_CPUS
-	int
-	default 8
-
 config VGA_BIOS_FILE
 	string
 	default "pci8086,0166.rom"
diff --git a/src/mainboard/lenovo/l520/Kconfig b/src/mainboard/lenovo/l520/Kconfig
index 5b9344a437..33879cd56b 100644
--- a/src/mainboard/lenovo/l520/Kconfig
+++ b/src/mainboard/lenovo/l520/Kconfig
@@ -38,10 +38,6 @@ config DRAM_RESET_GATE_GPIO
 	int
 	default 10
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 2
diff --git a/src/mainboard/lenovo/s230u/Kconfig b/src/mainboard/lenovo/s230u/Kconfig
index 64f4b29200..f1e575f0a6 100644
--- a/src/mainboard/lenovo/s230u/Kconfig
+++ b/src/mainboard/lenovo/s230u/Kconfig
@@ -32,10 +32,6 @@ config EC_BASE_ADDRESS
 	hex
 	default 0xff000000
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 1
diff --git a/src/mainboard/lenovo/t420/Kconfig b/src/mainboard/lenovo/t420/Kconfig
index 182ca46d58..2dedfede4e 100644
--- a/src/mainboard/lenovo/t420/Kconfig
+++ b/src/mainboard/lenovo/t420/Kconfig
@@ -55,10 +55,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "ThinkPad T420"
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 2
diff --git a/src/mainboard/lenovo/t420s/Kconfig b/src/mainboard/lenovo/t420s/Kconfig
index e2fd824f33..a68d96f277 100644
--- a/src/mainboard/lenovo/t420s/Kconfig
+++ b/src/mainboard/lenovo/t420s/Kconfig
@@ -54,10 +54,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "ThinkPad T420s"
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 2
diff --git a/src/mainboard/lenovo/t430/Kconfig b/src/mainboard/lenovo/t430/Kconfig
index 6139452e86..8d98e3ddfb 100644
--- a/src/mainboard/lenovo/t430/Kconfig
+++ b/src/mainboard/lenovo/t430/Kconfig
@@ -61,10 +61,6 @@ config DRAM_RESET_GATE_GPIO
 	int
 	default 10
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 2
diff --git a/src/mainboard/lenovo/t430s/Kconfig b/src/mainboard/lenovo/t430s/Kconfig
index 81b87c8ba0..fbadff760e 100644
--- a/src/mainboard/lenovo/t430s/Kconfig
+++ b/src/mainboard/lenovo/t430s/Kconfig
@@ -65,10 +65,6 @@ config OVERRIDE_DEVICETREE
 	string
 	default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 2
diff --git a/src/mainboard/lenovo/t520/Kconfig b/src/mainboard/lenovo/t520/Kconfig
index 3529367d3f..0b71ccd3cf 100644
--- a/src/mainboard/lenovo/t520/Kconfig
+++ b/src/mainboard/lenovo/t520/Kconfig
@@ -64,10 +64,6 @@ config MAINBOARD_PART_NUMBER
 	default "ThinkPad T520" if BOARD_LENOVO_T520
 	default "ThinkPad W520" if BOARD_LENOVO_W520
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 2
diff --git a/src/mainboard/lenovo/t530/Kconfig b/src/mainboard/lenovo/t530/Kconfig
index 4dc77e9266..8759ada59d 100644
--- a/src/mainboard/lenovo/t530/Kconfig
+++ b/src/mainboard/lenovo/t530/Kconfig
@@ -65,10 +65,6 @@ config MAINBOARD_PART_NUMBER
 	default "ThinkPad T530" if BOARD_LENOVO_T530
 	default "ThinkPad W530" if BOARD_LENOVO_W530
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 2
diff --git a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
index 246e1db5aa..d5349dff0b 100644
--- a/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
+++ b/src/mainboard/lenovo/x1_carbon_gen1/Kconfig
@@ -53,10 +53,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "ThinkPad X1 carbon gen 1"
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 2
diff --git a/src/mainboard/lenovo/x220/Kconfig b/src/mainboard/lenovo/x220/Kconfig
index 33e15a81cc..8aa936c33d 100644
--- a/src/mainboard/lenovo/x220/Kconfig
+++ b/src/mainboard/lenovo/x220/Kconfig
@@ -64,10 +64,6 @@ config OVERRIDE_DEVICETREE
 	string
 	default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 2
diff --git a/src/mainboard/lenovo/x230/Kconfig b/src/mainboard/lenovo/x230/Kconfig
index f134bc863c..1aa92d1cbb 100644
--- a/src/mainboard/lenovo/x230/Kconfig
+++ b/src/mainboard/lenovo/x230/Kconfig
@@ -63,10 +63,6 @@ config OVERRIDE_DEVICETREE
 	string
 	default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 2
diff --git a/src/mainboard/msi/ms7707/Kconfig b/src/mainboard/msi/ms7707/Kconfig
index 96ca719ea3..af4c811eae 100644
--- a/src/mainboard/msi/ms7707/Kconfig
+++ b/src/mainboard/msi/ms7707/Kconfig
@@ -25,10 +25,6 @@ config DRAM_RESET_GATE_GPIO
 	int
 	default 60
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX # FIXME: check this
 	int
 	default 2
diff --git a/src/mainboard/roda/rv11/Kconfig b/src/mainboard/roda/rv11/Kconfig
index 70c383fc55..f9e64a1c1e 100644
--- a/src/mainboard/roda/rv11/Kconfig
+++ b/src/mainboard/roda/rv11/Kconfig
@@ -33,8 +33,4 @@ config MAINBOARD_PART_NUMBER
 	default "Lizard RW11" if BOARD_RODA_RW11
 	default "Lizard RV11"
 
-config MAX_CPUS
-	int
-	default 8
-
 endif # BOARD_RODA_RV11 || BOARD_RODA_RW11
diff --git a/src/mainboard/samsung/lumpy/Kconfig b/src/mainboard/samsung/lumpy/Kconfig
index 6e72921504..b938945fa2 100644
--- a/src/mainboard/samsung/lumpy/Kconfig
+++ b/src/mainboard/samsung/lumpy/Kconfig
@@ -36,10 +36,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "Lumpy"
 
-config MAX_CPUS
-	int
-	default 8
-
 config VGA_BIOS_FILE
 	string
 	default "pci8086,0106.rom"
diff --git a/src/mainboard/samsung/stumpy/Kconfig b/src/mainboard/samsung/stumpy/Kconfig
index 67cc67ebd8..6e69ac8a01 100644
--- a/src/mainboard/samsung/stumpy/Kconfig
+++ b/src/mainboard/samsung/stumpy/Kconfig
@@ -32,10 +32,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "Stumpy"
 
-config MAX_CPUS
-	int
-	default 8
-
 config VGA_BIOS_FILE
 	string
 	default "pci8086,0106.rom"
diff --git a/src/mainboard/sapphire/pureplatinumh61/Kconfig b/src/mainboard/sapphire/pureplatinumh61/Kconfig
index 707d2c9d8d..9060181e4b 100644
--- a/src/mainboard/sapphire/pureplatinumh61/Kconfig
+++ b/src/mainboard/sapphire/pureplatinumh61/Kconfig
@@ -35,8 +35,4 @@ config DRAM_RESET_GATE_GPIO
 	int
 	default 60
 
-config MAX_CPUS
-	int
-	default 8
-
 endif
diff --git a/src/mainboard/supermicro/x9scl/Kconfig b/src/mainboard/supermicro/x9scl/Kconfig
index df6308e6ba..26ca48a128 100644
--- a/src/mainboard/supermicro/x9scl/Kconfig
+++ b/src/mainboard/supermicro/x9scl/Kconfig
@@ -22,10 +22,6 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "X9SCL/X9SCM"
 
-config MAX_CPUS
-	int
-	default 8
-
 config USBDEBUG_HCD_INDEX
 	int
 	default 1
diff --git a/util/autoport/sandybridge.go b/util/autoport/sandybridge.go
index 6f57847a1d..68cbe68134 100644
--- a/util/autoport/sandybridge.go
+++ b/util/autoport/sandybridge.go
@@ -89,8 +89,6 @@ func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) {
 	KconfigBool["HAVE_ACPI_TABLES"] = true
 	KconfigBool["HAVE_ACPI_RESUME"] = true
 
-	KconfigInt["MAX_CPUS"] = 8
-
 	DSDTIncludes = append(DSDTIncludes, DSDTInclude{
 		File: "cpu/intel/common/acpi/cpu.asl",
 	})