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>
This commit is contained in:
Angel Pons 2020-05-29 00:42:15 +02:00 committed by Felix Held
parent a202aec5fd
commit d71754d1b9
40 changed files with 4 additions and 154 deletions

View File

@ -34,4 +34,8 @@ config IED_REGION_SIZE
hex hex
default 0x400000 default 0x400000
config MAX_CPUS
int
default 8
endif endif

View File

@ -36,8 +36,4 @@ config VGA_BIOS_ID
config DRAM_RESET_GATE_GPIO config DRAM_RESET_GATE_GPIO
int int
default 28 default 28
config MAX_CPUS
int
default 8
endif endif

View File

@ -24,8 +24,4 @@ config MAINBOARD_PART_NUMBER
string string
default "B75 Pro3-M" default "B75 Pro3-M"
config MAX_CPUS
int
default 8
endif endif

View File

@ -24,8 +24,4 @@ config MAINBOARD_DIR
config MAINBOARD_PART_NUMBER config MAINBOARD_PART_NUMBER
string string
default "H61M-CS" default "H61M-CS"
config MAX_CPUS
int
default 8
endif endif

View File

@ -32,10 +32,6 @@ config VGA_BIOS_ID
string string
default "8086,0112" default "8086,0112"
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 1 default 1

View File

@ -29,10 +29,6 @@ config MAINBOARD_PART_NUMBER
string string
default "P8H61-M LX" default "P8H61-M LX"
config MAX_CPUS
int
default 8
# #
# These ME partitions need to be whitelisted for correct system # These ME partitions need to be whitelisted for correct system
# operation. Example issues from removing them include: no serial output # operation. Example issues from removing them include: no serial output

View File

@ -26,8 +26,4 @@ config MAINBOARD_PART_NUMBER
string string
default "P8H61-M LX3 R2.0" default "P8H61-M LX3 R2.0"
config MAX_CPUS
int
default 8
endif endif

View File

@ -37,8 +37,4 @@ config VGA_BIOS_ID
string string
default "8086,0152" default "8086,0152"
config MAX_CPUS
int
default 8
endif # BOARD_ASUS_P8H61_M_PRO endif # BOARD_ASUS_P8H61_M_PRO

View File

@ -28,8 +28,4 @@ config MAINBOARD_PART_NUMBER
string string
default "P8Z77-M PRO" default "P8Z77-M PRO"
config MAX_CPUS
int
default 8
endif # BOARD_ASUS_P8Z77_M_PRO endif # BOARD_ASUS_P8Z77_M_PRO

View File

@ -24,8 +24,4 @@ config MAINBOARD_PART_NUMBER
string string
default "P8Z77-V LX2" default "P8Z77-V LX2"
config MAX_CPUS
int
default 8
endif endif

View File

@ -32,10 +32,6 @@ config DRAM_RESET_GATE_GPIO # FIXME: check this
int int
default 60 default 60
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX # FIXME: check this config USBDEBUG_HCD_INDEX # FIXME: check this
int int
default 2 default 2

View File

@ -40,10 +40,6 @@ config DRAM_RESET_GATE_GPIO
int int
default 60 default 60
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 2 default 2

View File

@ -45,10 +45,6 @@ config OVERRIDE_DEVICETREE
string string
default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" if BOARD_GIGABYTE_GA_B75_D3V 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 # Override the default variant behavior, since the data.vbt is the same
config INTEL_GMA_VBT_FILE config INTEL_GMA_VBT_FILE
string string

View File

@ -38,10 +38,6 @@ config OVERRIDE_DEVICETREE
string string
default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" 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 # Override the default variant behavior, since the data.vbt is the same
config INTEL_GMA_VBT_FILE config INTEL_GMA_VBT_FILE
default "src/mainboard/$(MAINBOARDDIR)/data.vbt" default "src/mainboard/$(MAINBOARDDIR)/data.vbt"

View File

@ -33,10 +33,6 @@ config MAINBOARD_PART_NUMBER
string string
default "Butterfly" default "Butterfly"
config MAX_CPUS
int
default 8
config VGA_BIOS_FILE config VGA_BIOS_FILE
string string
default "pci8086,0106.rom" default "pci8086,0106.rom"

View File

@ -33,10 +33,6 @@ config MAINBOARD_PART_NUMBER
string string
default "Link" default "Link"
config MAX_CPUS
int
default 8
config VGA_BIOS_FILE config VGA_BIOS_FILE
string string
default "pci8086,0166.rom" default "pci8086,0166.rom"

View File

@ -34,10 +34,6 @@ config MAINBOARD_PART_NUMBER
string string
default "Parrot" default "Parrot"
config MAX_CPUS
int
default 8
config VGA_BIOS_FILE config VGA_BIOS_FILE
string string
default "pci8086,0106.rom" default "pci8086,0106.rom"

View File

@ -32,10 +32,6 @@ config MAINBOARD_PART_NUMBER
string string
default "Stout" default "Stout"
config MAX_CPUS
int
default 8
config VGA_BIOS_FILE config VGA_BIOS_FILE
string string
default "pci8086,0156.rom" default "pci8086,0156.rom"

View File

@ -42,10 +42,6 @@ config DRAM_RESET_GATE_GPIO
int int
default 60 default 60
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 2 default 2

View File

@ -52,10 +52,6 @@ config VGA_BIOS_ID
default "8086,0116" if SOUTHBRIDGE_INTEL_BD82X6X default "8086,0116" if SOUTHBRIDGE_INTEL_BD82X6X
default "8086,0166" if SOUTHBRIDGE_INTEL_C216 default "8086,0166" if SOUTHBRIDGE_INTEL_C216
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 2 if BOARD_HP_2570P default 2 if BOARD_HP_2570P

View File

@ -54,10 +54,6 @@ config DRAM_RESET_GATE_GPIO
int int
default 60 default 60
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 2 default 2

View File

@ -23,10 +23,6 @@ config MAINBOARD_PART_NUMBER
string string
default "KTQM77/mITX" default "KTQM77/mITX"
config MAX_CPUS
int
default 8
config VGA_BIOS_FILE config VGA_BIOS_FILE
string string
default "pci8086,0166.rom" default "pci8086,0166.rom"

View File

@ -38,10 +38,6 @@ config DRAM_RESET_GATE_GPIO
int int
default 10 default 10
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 2 default 2

View File

@ -32,10 +32,6 @@ config EC_BASE_ADDRESS
hex hex
default 0xff000000 default 0xff000000
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 1 default 1

View File

@ -55,10 +55,6 @@ config MAINBOARD_PART_NUMBER
string string
default "ThinkPad T420" default "ThinkPad T420"
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 2 default 2

View File

@ -54,10 +54,6 @@ config MAINBOARD_PART_NUMBER
string string
default "ThinkPad T420s" default "ThinkPad T420s"
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 2 default 2

View File

@ -61,10 +61,6 @@ config DRAM_RESET_GATE_GPIO
int int
default 10 default 10
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 2 default 2

View File

@ -65,10 +65,6 @@ config OVERRIDE_DEVICETREE
string string
default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 2 default 2

View File

@ -64,10 +64,6 @@ config MAINBOARD_PART_NUMBER
default "ThinkPad T520" if BOARD_LENOVO_T520 default "ThinkPad T520" if BOARD_LENOVO_T520
default "ThinkPad W520" if BOARD_LENOVO_W520 default "ThinkPad W520" if BOARD_LENOVO_W520
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 2 default 2

View File

@ -65,10 +65,6 @@ config MAINBOARD_PART_NUMBER
default "ThinkPad T530" if BOARD_LENOVO_T530 default "ThinkPad T530" if BOARD_LENOVO_T530
default "ThinkPad W530" if BOARD_LENOVO_W530 default "ThinkPad W530" if BOARD_LENOVO_W530
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 2 default 2

View File

@ -53,10 +53,6 @@ config MAINBOARD_PART_NUMBER
string string
default "ThinkPad X1 carbon gen 1" default "ThinkPad X1 carbon gen 1"
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 2 default 2

View File

@ -64,10 +64,6 @@ config OVERRIDE_DEVICETREE
string string
default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 2 default 2

View File

@ -63,10 +63,6 @@ config OVERRIDE_DEVICETREE
string string
default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb" default "variants/$(CONFIG_VARIANT_DIR)/overridetree.cb"
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 2 default 2

View File

@ -25,10 +25,6 @@ config DRAM_RESET_GATE_GPIO
int int
default 60 default 60
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX # FIXME: check this config USBDEBUG_HCD_INDEX # FIXME: check this
int int
default 2 default 2

View File

@ -33,8 +33,4 @@ config MAINBOARD_PART_NUMBER
default "Lizard RW11" if BOARD_RODA_RW11 default "Lizard RW11" if BOARD_RODA_RW11
default "Lizard RV11" default "Lizard RV11"
config MAX_CPUS
int
default 8
endif # BOARD_RODA_RV11 || BOARD_RODA_RW11 endif # BOARD_RODA_RV11 || BOARD_RODA_RW11

View File

@ -36,10 +36,6 @@ config MAINBOARD_PART_NUMBER
string string
default "Lumpy" default "Lumpy"
config MAX_CPUS
int
default 8
config VGA_BIOS_FILE config VGA_BIOS_FILE
string string
default "pci8086,0106.rom" default "pci8086,0106.rom"

View File

@ -32,10 +32,6 @@ config MAINBOARD_PART_NUMBER
string string
default "Stumpy" default "Stumpy"
config MAX_CPUS
int
default 8
config VGA_BIOS_FILE config VGA_BIOS_FILE
string string
default "pci8086,0106.rom" default "pci8086,0106.rom"

View File

@ -35,8 +35,4 @@ config DRAM_RESET_GATE_GPIO
int int
default 60 default 60
config MAX_CPUS
int
default 8
endif endif

View File

@ -22,10 +22,6 @@ config MAINBOARD_PART_NUMBER
string string
default "X9SCL/X9SCM" default "X9SCL/X9SCM"
config MAX_CPUS
int
default 8
config USBDEBUG_HCD_INDEX config USBDEBUG_HCD_INDEX
int int
default 1 default 1

View File

@ -89,8 +89,6 @@ func (i sandybridgemc) Scan(ctx Context, addr PCIDevData) {
KconfigBool["HAVE_ACPI_TABLES"] = true KconfigBool["HAVE_ACPI_TABLES"] = true
KconfigBool["HAVE_ACPI_RESUME"] = true KconfigBool["HAVE_ACPI_RESUME"] = true
KconfigInt["MAX_CPUS"] = 8
DSDTIncludes = append(DSDTIncludes, DSDTInclude{ DSDTIncludes = append(DSDTIncludes, DSDTInclude{
File: "cpu/intel/common/acpi/cpu.asl", File: "cpu/intel/common/acpi/cpu.asl",
}) })