diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2010-01-25 07:56:01 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2010-01-25 07:56:01 +0000 |
| commit | 29647d97c5e66484ab5c8b56ede57329ab5410c4 (patch) | |
| tree | 465c55984cd67c4e74c3b740db47531f256d018d /src | |
| parent | 480b37f8e9b16efd3b9a91def3d3007241126833 (diff) | |
Align several kconfig options to match newconfig:
HT_CHAIN_UNITID_BASE
HT_CHAIN_END_UNITID_BASE
SB_HT_CHAIN_ON_BUS0
SB_HT_CHAIN_UNITID_OFFSET_ONLY
MAX_CPUS
MAX_PHYSICAL_CPUS
ROM_SIZE
TSC_X86RDTSC_CALIBRATE_WITH_TIMER2
Also hook up asus/p2b-ds
Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5051 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src')
87 files changed, 118 insertions, 220 deletions
diff --git a/src/mainboard/a-trend/atc-6220/Kconfig b/src/mainboard/a-trend/atc-6220/Kconfig index 9d589e77b5..9350205957 100644 --- a/src/mainboard/a-trend/atc-6220/Kconfig +++ b/src/mainboard/a-trend/atc-6220/Kconfig @@ -27,7 +27,6 @@ config BOARD_A_TREND_ATC_6220 select SUPERIO_WINBOND_W83977TF select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/a-trend/atc-6240/Kconfig b/src/mainboard/a-trend/atc-6240/Kconfig index f90b1e62a9..e56dfbf9ed 100644 --- a/src/mainboard/a-trend/atc-6240/Kconfig +++ b/src/mainboard/a-trend/atc-6240/Kconfig @@ -27,7 +27,6 @@ config BOARD_A_TREND_ATC_6240 select SUPERIO_WINBOND_W83627HF select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/abit/be6-ii_v2_0/Kconfig b/src/mainboard/abit/be6-ii_v2_0/Kconfig index 567dc6429b..e9fc8354dc 100644 --- a/src/mainboard/abit/be6-ii_v2_0/Kconfig +++ b/src/mainboard/abit/be6-ii_v2_0/Kconfig @@ -27,7 +27,6 @@ config BOARD_ABIT_BE6_II_V2_0 select SUPERIO_WINBOND_W83977TF select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/advantech/pcm-5820/Kconfig b/src/mainboard/advantech/pcm-5820/Kconfig index 16546efc29..4d77e48663 100644 --- a/src/mainboard/advantech/pcm-5820/Kconfig +++ b/src/mainboard/advantech/pcm-5820/Kconfig @@ -28,7 +28,6 @@ config BOARD_ADVANTECH_PCM_5820 select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/amd/db800/Kconfig b/src/mainboard/amd/db800/Kconfig index 80b146898a..c8e13a6dbc 100644 --- a/src/mainboard/amd/db800/Kconfig +++ b/src/mainboard/amd/db800/Kconfig @@ -8,7 +8,6 @@ config BOARD_AMD_DB800 select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select USE_DCACHE_RAM select USE_PRINTK_IN_CAR select BOARD_ROMSIZE_KB_256 diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig index 7c020a0590..f511ab20a1 100644 --- a/src/mainboard/amd/dbm690t/Kconfig +++ b/src/mainboard/amd/dbm690t/Kconfig @@ -15,7 +15,7 @@ config BOARD_AMD_DBM690T select USE_DCACHE_RAM select HAVE_HARD_RESET select SB_HT_CHAIN_UNITID_OFFSET_ONLY - select BOARD_ROMSIZE_KB_512 + select BOARD_ROMSIZE_KB_1024 config MAINBOARD_DIR string diff --git a/src/mainboard/amd/norwich/Kconfig b/src/mainboard/amd/norwich/Kconfig index 95a602b565..1c67a9ae51 100644 --- a/src/mainboard/amd/norwich/Kconfig +++ b/src/mainboard/amd/norwich/Kconfig @@ -7,7 +7,6 @@ config BOARD_AMD_NORWICH select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select USE_DCACHE_RAM select USE_PRINTK_IN_CAR select BOARD_ROMSIZE_KB_256 diff --git a/src/mainboard/amd/pistachio/Kconfig b/src/mainboard/amd/pistachio/Kconfig index 790f731f11..d55cdcad4e 100644 --- a/src/mainboard/amd/pistachio/Kconfig +++ b/src/mainboard/amd/pistachio/Kconfig @@ -14,7 +14,7 @@ config BOARD_AMD_PISTACHIO select SB_HT_CHAIN_UNITID_OFFSET_ONLY select WAIT_BEFORE_CPUS_INIT select HAVE_ACPI_TABLES - select BOARD_ROMSIZE_KB_512 + select BOARD_ROMSIZE_KB_1024 config MAINBOARD_DIR string @@ -78,17 +78,17 @@ config HW_MEM_HOLE_SIZE_AUTO_INC config SB_HT_CHAIN_ON_BUS0 int - default 2 + default 1 depends on BOARD_AMD_PISTACHIO config HT_CHAIN_END_UNITID_BASE hex - default 0x6 + default 0x1 depends on BOARD_AMD_PISTACHIO config HT_CHAIN_UNITID_BASE hex - default 0xa + default 0x0 depends on BOARD_AMD_PISTACHIO config USE_INIT diff --git a/src/mainboard/amd/rumba/Kconfig b/src/mainboard/amd/rumba/Kconfig index afca4e73ca..045e019372 100644 --- a/src/mainboard/amd/rumba/Kconfig +++ b/src/mainboard/amd/rumba/Kconfig @@ -25,7 +25,6 @@ config BOARD_AMD_RUMBA select NORTHBRIDGE_AMD_GX2 select SOUTHBRIDGE_AMD_CS5536 select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select HAVE_PIRQ_TABLE select BOARD_ROMSIZE_KB_256 diff --git a/src/mainboard/arima/hdama/Kconfig b/src/mainboard/arima/hdama/Kconfig index dd647a8264..9f155ccd7b 100644 --- a/src/mainboard/arima/hdama/Kconfig +++ b/src/mainboard/arima/hdama/Kconfig @@ -72,7 +72,7 @@ config HW_MEM_HOLE_SIZE_AUTO_INC config SB_HT_CHAIN_ON_BUS0 int - default 1 + default 0 depends on BOARD_ARIMA_HDAMA config HT_CHAIN_END_UNITID_BASE diff --git a/src/mainboard/artecgroup/dbe61/Kconfig b/src/mainboard/artecgroup/dbe61/Kconfig index e7bb994bf0..1d63305221 100644 --- a/src/mainboard/artecgroup/dbe61/Kconfig +++ b/src/mainboard/artecgroup/dbe61/Kconfig @@ -7,7 +7,6 @@ config BOARD_ARTECGROUP_DBE61 select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select USE_DCACHE_RAM select USE_PRINTK_IN_CAR select BOARD_ROMSIZE_KB_256 diff --git a/src/mainboard/asi/mb_5blgp/Kconfig b/src/mainboard/asi/mb_5blgp/Kconfig index 934297fb68..a806df34b6 100644 --- a/src/mainboard/asi/mb_5blgp/Kconfig +++ b/src/mainboard/asi/mb_5blgp/Kconfig @@ -28,7 +28,6 @@ config BOARD_ASI_MB_5BLGP select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/asi/mb_5blmp/Kconfig b/src/mainboard/asi/mb_5blmp/Kconfig index 4f47e2696a..7927afa7c6 100644 --- a/src/mainboard/asi/mb_5blmp/Kconfig +++ b/src/mainboard/asi/mb_5blmp/Kconfig @@ -28,7 +28,6 @@ config BOARD_ASI_MB_5BLMP select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/asus/Kconfig b/src/mainboard/asus/Kconfig index 90f5c54399..d0034af97f 100644 --- a/src/mainboard/asus/Kconfig +++ b/src/mainboard/asus/Kconfig @@ -26,6 +26,7 @@ source "src/mainboard/asus/a8n_e/Kconfig" source "src/mainboard/asus/a8v-e_se/Kconfig" source "src/mainboard/asus/p2b/Kconfig" source "src/mainboard/asus/p2b-d/Kconfig" +source "src/mainboard/asus/p2b-ds/Kconfig" source "src/mainboard/asus/p2b-f/Kconfig" source "src/mainboard/asus/p3b-f/Kconfig" source "src/mainboard/asus/m2v-mx_se/Kconfig" diff --git a/src/mainboard/asus/a8n_e/Kconfig b/src/mainboard/asus/a8n_e/Kconfig index e7ca63a1d7..ccad46d52b 100644 --- a/src/mainboard/asus/a8n_e/Kconfig +++ b/src/mainboard/asus/a8n_e/Kconfig @@ -80,7 +80,7 @@ config MAX_PHYSICAL_CPUS config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x20 depends on BOARD_ASUS_A8N_E config HT_CHAIN_UNITID_BASE diff --git a/src/mainboard/asus/mew-am/Kconfig b/src/mainboard/asus/mew-am/Kconfig index dcc56fa184..bacbce9670 100644 --- a/src/mainboard/asus/mew-am/Kconfig +++ b/src/mainboard/asus/mew-am/Kconfig @@ -27,7 +27,6 @@ config BOARD_ASUS_MEW_AM select SUPERIO_SMSC_SMSCSUPERIO select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_512 config MAINBOARD_DIR diff --git a/src/mainboard/asus/mew-vm/Kconfig b/src/mainboard/asus/mew-vm/Kconfig index 693fa7baaf..6cafcba67a 100644 --- a/src/mainboard/asus/mew-vm/Kconfig +++ b/src/mainboard/asus/mew-vm/Kconfig @@ -27,7 +27,6 @@ config BOARD_ASUS_MEW_VM select SUPERIO_SMSC_LPC47B272 select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_512 config MAINBOARD_DIR diff --git a/src/mainboard/asus/p2b-d/Kconfig b/src/mainboard/asus/p2b-d/Kconfig index 6554172642..763a66030f 100644 --- a/src/mainboard/asus/p2b-d/Kconfig +++ b/src/mainboard/asus/p2b-d/Kconfig @@ -29,7 +29,6 @@ config BOARD_ASUS_P2B_D select HAVE_MP_TABLE select SMP select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/asus/p2b-ds/Kconfig b/src/mainboard/asus/p2b-ds/Kconfig index 594206a717..6a4f0e2ec4 100644 --- a/src/mainboard/asus/p2b-ds/Kconfig +++ b/src/mainboard/asus/p2b-ds/Kconfig @@ -29,7 +29,6 @@ config BOARD_ASUS_P2B_DS select HAVE_MP_TABLE select SMP select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/asus/p2b-f/Kconfig b/src/mainboard/asus/p2b-f/Kconfig index 4c4904f491..15d9298eec 100644 --- a/src/mainboard/asus/p2b-f/Kconfig +++ b/src/mainboard/asus/p2b-f/Kconfig @@ -27,7 +27,6 @@ config BOARD_ASUS_P2B_F select SUPERIO_WINBOND_W83977TF select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/asus/p2b/Kconfig b/src/mainboard/asus/p2b/Kconfig index a380dd1371..1d5163b567 100644 --- a/src/mainboard/asus/p2b/Kconfig +++ b/src/mainboard/asus/p2b/Kconfig @@ -27,7 +27,6 @@ config BOARD_ASUS_P2B select SUPERIO_WINBOND_W83977TF select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/asus/p3b-f/Kconfig b/src/mainboard/asus/p3b-f/Kconfig index b44e51581b..778089ba1f 100644 --- a/src/mainboard/asus/p3b-f/Kconfig +++ b/src/mainboard/asus/p3b-f/Kconfig @@ -27,7 +27,6 @@ config BOARD_ASUS_P3B_F select SUPERIO_WINBOND_W83977TF select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/axus/tc320/Kconfig b/src/mainboard/axus/tc320/Kconfig index b4f85ea594..5abfb60e8c 100644 --- a/src/mainboard/axus/tc320/Kconfig +++ b/src/mainboard/axus/tc320/Kconfig @@ -28,7 +28,6 @@ config BOARD_AXUS_TC320 select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/azza/pt-6ibd/Kconfig b/src/mainboard/azza/pt-6ibd/Kconfig index d39662bf54..4e87cd7020 100644 --- a/src/mainboard/azza/pt-6ibd/Kconfig +++ b/src/mainboard/azza/pt-6ibd/Kconfig @@ -27,7 +27,6 @@ config BOARD_AZZA_PT_6IBD select SUPERIO_WINBOND_W83977TF select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/bcom/winnet100/Kconfig b/src/mainboard/bcom/winnet100/Kconfig index a0c09e32b3..6f9cb8c913 100644 --- a/src/mainboard/bcom/winnet100/Kconfig +++ b/src/mainboard/bcom/winnet100/Kconfig @@ -28,7 +28,6 @@ config BOARD_BCOM_WINNET100 select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/bcom/winnetp680/Kconfig b/src/mainboard/bcom/winnetp680/Kconfig index 0dce8af9cf..0bc7b2f12b 100644 --- a/src/mainboard/bcom/winnetp680/Kconfig +++ b/src/mainboard/bcom/winnetp680/Kconfig @@ -7,7 +7,6 @@ config BOARD_BCOM_WINNETP680 select SUPERIO_WINBOND_W83697HF select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_512 config MAINBOARD_DIR diff --git a/src/mainboard/biostar/m6tba/Kconfig b/src/mainboard/biostar/m6tba/Kconfig index 0b46c434d2..d1c06860ff 100644 --- a/src/mainboard/biostar/m6tba/Kconfig +++ b/src/mainboard/biostar/m6tba/Kconfig @@ -27,7 +27,6 @@ config BOARD_BIOSTAR_M6TBA select SUPERIO_SMSC_SMSCSUPERIO select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/broadcom/blast/Kconfig b/src/mainboard/broadcom/blast/Kconfig index 50d1f4b16d..474d39011a 100644 --- a/src/mainboard/broadcom/blast/Kconfig +++ b/src/mainboard/broadcom/blast/Kconfig @@ -13,6 +13,7 @@ config BOARD_BROADCOM_BLAST select USE_DCACHE_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 + select SB_HT_CHAIN_UNITID_OFFSET_ONLY config MAINBOARD_DIR string @@ -41,12 +42,7 @@ config APIC_ID_OFFSET config SB_HT_CHAIN_ON_BUS0 int - default 2 - depends on BOARD_BROADCOM_BLAST - -config SB_HT_CHAIN_UNITID_OFFSET_ONLY - bool - default n + default 1 depends on BOARD_BROADCOM_BLAST config LB_CKS_RANGE_END @@ -81,12 +77,12 @@ config MAX_PHYSICAL_CPUS config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x1 depends on BOARD_BROADCOM_BLAST config HT_CHAIN_UNITID_BASE hex - default 0x0 + default 0x6 depends on BOARD_BROADCOM_BLAST config USE_INIT diff --git a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig index e9ea193f9d..f817e705ff 100644 --- a/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig +++ b/src/mainboard/compaq/deskpro_en_sff_p600/Kconfig @@ -28,7 +28,6 @@ config BOARD_COMPAQ_DESKPRO_EN_SFF_P600 select SUPERIO_NSC_PC97317 select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/dell/s1850/Kconfig b/src/mainboard/dell/s1850/Kconfig index 834e867750..7ef9d24f87 100644 --- a/src/mainboard/dell/s1850/Kconfig +++ b/src/mainboard/dell/s1850/Kconfig @@ -44,12 +44,12 @@ config MAINBOARD_PCI_SUBSYSTEM_VENDOR_ID config MAX_CPUS int - default 2 + default 4 depends on BOARD_DELL_S1850 config MAX_PHYSICAL_CPUS int - default 2 + default 1 depends on BOARD_DELL_S1850 config USE_INIT diff --git a/src/mainboard/digitallogic/msm586seg/Kconfig b/src/mainboard/digitallogic/msm586seg/Kconfig index 2f1f0b9fe6..0503cad34d 100644 --- a/src/mainboard/digitallogic/msm586seg/Kconfig +++ b/src/mainboard/digitallogic/msm586seg/Kconfig @@ -3,7 +3,7 @@ config BOARD_DIGITALLOGIC_MSM586SEG select ARCH_X86 select CPU_AMD_SC520 select HAVE_PIRQ_TABLE - select BOARD_ROMSIZE_KB_256 + select BOARD_ROMSIZE_KB_512 config MAINBOARD_DIR string diff --git a/src/mainboard/digitallogic/msm800sev/Kconfig b/src/mainboard/digitallogic/msm800sev/Kconfig index f04b8fca36..88b1d69217 100644 --- a/src/mainboard/digitallogic/msm800sev/Kconfig +++ b/src/mainboard/digitallogic/msm800sev/Kconfig @@ -8,7 +8,6 @@ config BOARD_DIGITALLOGIC_MSM800SEV select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select USE_DCACHE_RAM select USE_PRINTK_IN_CAR select BOARD_ROMSIZE_KB_256 diff --git a/src/mainboard/eaglelion/5bcm/Kconfig b/src/mainboard/eaglelion/5bcm/Kconfig index 7ab467b52c..9cf46d2faa 100644 --- a/src/mainboard/eaglelion/5bcm/Kconfig +++ b/src/mainboard/eaglelion/5bcm/Kconfig @@ -28,7 +28,6 @@ config BOARD_EAGLELION_5BCM select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/gigabyte/ga-6bxc/Kconfig b/src/mainboard/gigabyte/ga-6bxc/Kconfig index 705af28d91..41a465fcd0 100644 --- a/src/mainboard/gigabyte/ga-6bxc/Kconfig +++ b/src/mainboard/gigabyte/ga-6bxc/Kconfig @@ -27,7 +27,6 @@ config BOARD_GIGABYTE_GA_6BXC select SUPERIO_ITE_IT8671F select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig index 25c081d997..a4796e7c25 100644 --- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig +++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig @@ -11,7 +11,6 @@ config BOARD_GIGABYTE_GA_2761GXDK select USE_DCACHE_RAM select HAVE_HARD_RESET select LIFT_BSP_APIC_ID - select SB_HT_CHAIN_UNITID_OFFSET_ONLY select K8_REV_F_SUPPORT select BOARD_ROMSIZE_KB_512 @@ -112,7 +111,7 @@ config HT_CHAIN_UNITID_BASE config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x20 depends on BOARD_GIGABYTE_GA_2761GXDK config USE_INIT diff --git a/src/mainboard/gigabyte/m57sli/Kconfig b/src/mainboard/gigabyte/m57sli/Kconfig index 32592a6f88..c02cda450d 100644 --- a/src/mainboard/gigabyte/m57sli/Kconfig +++ b/src/mainboard/gigabyte/m57sli/Kconfig @@ -13,7 +13,6 @@ config BOARD_GIGABYTE_M57SLI select USE_DCACHE_RAM select HAVE_HARD_RESET select LIFT_BSP_APIC_ID - select SB_HT_CHAIN_UNITID_OFFSET_ONLY select HAVE_ACPI_TABLES select K8_REV_F_SUPPORT select BOARD_ROMSIZE_KB_512 @@ -115,7 +114,7 @@ config HT_CHAIN_UNITID_BASE config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x20 depends on BOARD_GIGABYTE_M57SLI config USE_INIT diff --git a/src/mainboard/hp/dl145_g3/Kconfig b/src/mainboard/hp/dl145_g3/Kconfig index ea081e5a1f..e036d371cb 100644 --- a/src/mainboard/hp/dl145_g3/Kconfig +++ b/src/mainboard/hp/dl145_g3/Kconfig @@ -14,6 +14,7 @@ config BOARD_HP_DL145_G3 select HAVE_HARD_RESET select LIFT_BSP_APIC_ID select BOARD_ROMSIZE_KB_512 + select SB_HT_CHAIN_UNITID_OFFSET_ONLY config MAINBOARD_DIR string @@ -82,12 +83,12 @@ config MAX_PHYSICAL_CPUS config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x1 depends on BOARD_HP_DL145_G3 config HT_CHAIN_UNITID_BASE hex - default 0x0 + default 0x6 depends on BOARD_HP_DL145_G3 config USE_INIT diff --git a/src/mainboard/hp/e_vectra_p2706t/Kconfig b/src/mainboard/hp/e_vectra_p2706t/Kconfig index 74b101a9eb..fa0292dbe4 100644 --- a/src/mainboard/hp/e_vectra_p2706t/Kconfig +++ b/src/mainboard/hp/e_vectra_p2706t/Kconfig @@ -30,7 +30,6 @@ config BOARD_HP_E_VECTRA_P2706T select SUPERIO_NSC_PC87360 select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_512 config MAINBOARD_DIR diff --git a/src/mainboard/ibm/e325/Kconfig b/src/mainboard/ibm/e325/Kconfig index f752fb982d..764401438e 100644 --- a/src/mainboard/ibm/e325/Kconfig +++ b/src/mainboard/ibm/e325/Kconfig @@ -78,17 +78,17 @@ config HW_MEM_HOLE_SIZE_AUTO_INC config SB_HT_CHAIN_ON_BUS0 int - default 2 + default 0 depends on BOARD_IBM_E325 config HT_CHAIN_END_UNITID_BASE hex - default 0x6 + default 0x20 depends on BOARD_IBM_E325 config HT_CHAIN_UNITID_BASE hex - default 0xa + default 0x1 depends on BOARD_IBM_E325 config USE_INIT diff --git a/src/mainboard/ibm/e326/Kconfig b/src/mainboard/ibm/e326/Kconfig index ceb5b73994..002068ecb1 100644 --- a/src/mainboard/ibm/e326/Kconfig +++ b/src/mainboard/ibm/e326/Kconfig @@ -78,17 +78,17 @@ config HW_MEM_HOLE_SIZE_AUTO_INC config SB_HT_CHAIN_ON_BUS0 int - default 2 + default 0 depends on BOARD_IBM_E326 config HT_CHAIN_END_UNITID_BASE hex - default 0x6 + default 0x20 depends on BOARD_IBM_E326 config HT_CHAIN_UNITID_BASE hex - default 0xa + default 0x1 depends on BOARD_IBM_E326 config USE_INIT diff --git a/src/mainboard/iei/juki-511p/Kconfig b/src/mainboard/iei/juki-511p/Kconfig index 05b4dbd7ed..e5f69bd129 100644 --- a/src/mainboard/iei/juki-511p/Kconfig +++ b/src/mainboard/iei/juki-511p/Kconfig @@ -28,7 +28,6 @@ config BOARD_IEI_JUKI_511P select PIRQ_ROUTE select HAVE_OPTION_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/iei/nova4899r/Kconfig b/src/mainboard/iei/nova4899r/Kconfig index 1fb4e97445..7545030035 100644 --- a/src/mainboard/iei/nova4899r/Kconfig +++ b/src/mainboard/iei/nova4899r/Kconfig @@ -29,7 +29,6 @@ config BOARD_IEI_NOVA_4899R select PIRQ_ROUTE select HAVE_OPTION_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig index 0c2100e779..28b82a35a6 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/Kconfig +++ b/src/mainboard/iei/pcisa-lx-800-r10/Kconfig @@ -8,7 +8,6 @@ config BOARD_IEI_PCISA_LX_800_R10 select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select USE_DCACHE_RAM select USE_PRINTK_IN_CAR select BOARD_ROMSIZE_KB_256 diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig index 6650a4dcae..cd172baf62 100644 --- a/src/mainboard/intel/d945gclf/Kconfig +++ b/src/mainboard/intel/d945gclf/Kconfig @@ -34,7 +34,7 @@ config BOARD_INTEL_D945GCLF select UDELAY_LAPIC select HAVE_ACPI_TABLES select HAVE_SMI_HANDLER - select BOARD_ROMSIZE_KB_1024 + select BOARD_ROMSIZE_KB_512 config MAINBOARD_DIR string @@ -81,6 +81,11 @@ config IRQ_SLOT_COUNT default 18 depends on BOARD_INTEL_D945GCLF +config MAX_CPUS + int + default 4 + depends on BOARD_INTEL_D945GCLF + config MAX_PHYSICAL_CPUS int default 2 diff --git a/src/mainboard/intel/eagleheights/Kconfig b/src/mainboard/intel/eagleheights/Kconfig index 81c51136fd..6ecd903804 100644 --- a/src/mainboard/intel/eagleheights/Kconfig +++ b/src/mainboard/intel/eagleheights/Kconfig @@ -11,7 +11,6 @@ config BOARD_INTEL_EAGLEHEIGHTS select MMCONF_SUPPORT select USE_PRINTK_IN_CAR select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select AP_IN_SIPI_WAIT select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_1024 @@ -61,6 +60,11 @@ config IRQ_SLOT_COUNT default 18 depends on BOARD_INTEL_EAGLEHEIGHTS +config MAX_CPUS + int + default 4 + depends on BOARD_INTEL_EAGLEHEIGHTS + config MAX_PHYSICAL_CPUS int default 2 diff --git a/src/mainboard/intel/mtarvon/Kconfig b/src/mainboard/intel/mtarvon/Kconfig index 91ae6a59fd..f7df636f97 100644 --- a/src/mainboard/intel/mtarvon/Kconfig +++ b/src/mainboard/intel/mtarvon/Kconfig @@ -49,3 +49,8 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID hex default 0x2680 depends on BOARD_INTEL_MTARVON + +config MAX_CPUS + int + default 4 + depends on BOARD_INTEL_MTARVON diff --git a/src/mainboard/intel/truxton/Kconfig b/src/mainboard/intel/truxton/Kconfig index 9129b862ee..260b8a1a4d 100644 --- a/src/mainboard/intel/truxton/Kconfig +++ b/src/mainboard/intel/truxton/Kconfig @@ -51,3 +51,7 @@ config MAINBOARD_PCI_SUBSYSTEM_DEVICE_ID default 0x2680 depends on BOARD_INTEL_TRUXTON +config MAX_CPUS + int + default 4 + depends on BOARD_INTEL_TRUXTON diff --git a/src/mainboard/iwill/dk8s2/Kconfig b/src/mainboard/iwill/dk8s2/Kconfig index 182d93c168..ebf7ecc322 100644 --- a/src/mainboard/iwill/dk8s2/Kconfig +++ b/src/mainboard/iwill/dk8s2/Kconfig @@ -64,7 +64,7 @@ config HW_MEM_HOLE_SIZEK config MAX_CPUS int - default 4 + default 2 depends on BOARD_IWILL_DK8S2 config MAX_PHYSICAL_CPUS @@ -79,17 +79,17 @@ config HW_MEM_HOLE_SIZE_AUTO_INC config SB_HT_CHAIN_ON_BUS0 int - default 2 + default 0 depends on BOARD_IWILL_DK8S2 config HT_CHAIN_END_UNITID_BASE hex - default 0x6 + default 0x20 depends on BOARD_IWILL_DK8S2 config HT_CHAIN_UNITID_BASE hex - default 0xa + default 0x1 depends on BOARD_IWILL_DK8S2 config USE_INIT diff --git a/src/mainboard/iwill/dk8x/Kconfig b/src/mainboard/iwill/dk8x/Kconfig index 3e304bdfcb..2fef70be34 100644 --- a/src/mainboard/iwill/dk8x/Kconfig +++ b/src/mainboard/iwill/dk8x/Kconfig @@ -63,7 +63,7 @@ config HW_MEM_HOLE_SIZEK config MAX_CPUS int - default 4 + default 2 depends on BOARD_IWILL_DK8X config MAX_PHYSICAL_CPUS @@ -78,17 +78,17 @@ config HW_MEM_HOLE_SIZE_AUTO_INC config SB_HT_CHAIN_ON_BUS0 int - default 2 + default 0 depends on BOARD_IWILL_DK8X config HT_CHAIN_END_UNITID_BASE hex - default 0x6 + default 0x20 depends on BOARD_IWILL_DK8X config HT_CHAIN_UNITID_BASE hex - default 0xa + default 0x1 depends on BOARD_IWILL_DK8X config USE_INIT diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig index b7b9a8fa23..c0a01dcc68 100644 --- a/src/mainboard/kontron/986lcd-m/Kconfig +++ b/src/mainboard/kontron/986lcd-m/Kconfig @@ -62,6 +62,11 @@ config IRQ_SLOT_COUNT default 18 depends on BOARD_KONTRON_986LCD_M +config MAX_CPUS + int + default 4 + depends on BOARD_KONTRON_986LCD_M + config MAX_PHYSICAL_CPUS int default 2 diff --git a/src/mainboard/kontron/kt690/Kconfig b/src/mainboard/kontron/kt690/Kconfig index 9999ca686a..6615fc7596 100644 --- a/src/mainboard/kontron/kt690/Kconfig +++ b/src/mainboard/kontron/kt690/Kconfig @@ -15,7 +15,7 @@ config BOARD_KONTRON_KT690 select USE_DCACHE_RAM select HAVE_HARD_RESET select HAVE_ACPI_TABLES - select BOARD_ROMSIZE_KB_512 + select BOARD_ROMSIZE_KB_1024 select SB_HT_CHAIN_UNITID_OFFSET_ONLY config MAINBOARD_DIR diff --git a/src/mainboard/lippert/frontrunner/Kconfig b/src/mainboard/lippert/frontrunner/Kconfig index 67e32826be..904caa63a4 100644 --- a/src/mainboard/lippert/frontrunner/Kconfig +++ b/src/mainboard/lippert/frontrunner/Kconfig @@ -5,7 +5,6 @@ config BOARD_LIPPERT_FRONTRUNNER select NORTHBRIDGE_AMD_GX2 select SOUTHBRIDGE_AMD_CS5535 select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select HAVE_PIRQ_TABLE select BOARD_ROMSIZE_KB_256 diff --git a/src/mainboard/lippert/roadrunner-lx/Kconfig b/src/mainboard/lippert/roadrunner-lx/Kconfig index 827d2f24b3..73568480e4 100644 --- a/src/mainboard/lippert/roadrunner-lx/Kconfig +++ b/src/mainboard/lippert/roadrunner-lx/Kconfig @@ -8,7 +8,6 @@ config BOARD_LIPPERT_ROADRUNNER_LX select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select USE_DCACHE_RAM select USE_PRINTK_IN_CAR select BOARD_ROMSIZE_KB_512 diff --git a/src/mainboard/lippert/spacerunner-lx/Kconfig b/src/mainboard/lippert/spacerunner-lx/Kconfig index 136cf35781..1043b0efbe 100644 --- a/src/mainboard/lippert/spacerunner-lx/Kconfig +++ b/src/mainboard/lippert/spacerunner-lx/Kconfig @@ -8,7 +8,6 @@ config BOARD_LIPPERT_SPACERUNNER_LX select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select USE_DCACHE_RAM select USE_PRINTK_IN_CAR select BOARD_ROMSIZE_KB_512 diff --git a/src/mainboard/mitac/6513wu/Kconfig b/src/mainboard/mitac/6513wu/Kconfig index 95a0924d8e..77cf8946c6 100644 --- a/src/mainboard/mitac/6513wu/Kconfig +++ b/src/mainboard/mitac/6513wu/Kconfig @@ -27,7 +27,6 @@ config BOARD_MITAC_6513WU select SUPERIO_SMSC_SMSCSUPERIO select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_512 config MAINBOARD_DIR diff --git a/src/mainboard/msi/ms6119/Kconfig b/src/mainboard/msi/ms6119/Kconfig index 27dbe6b1dd..6c9cf55fc6 100644 --- a/src/mainboard/msi/ms6119/Kconfig +++ b/src/mainboard/msi/ms6119/Kconfig @@ -27,7 +27,6 @@ config BOARD_MSI_MS_6119 select SUPERIO_WINBOND_W83977TF select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/msi/ms6147/Kconfig b/src/mainboard/msi/ms6147/Kconfig index 6c8e0921bd..7140479876 100644 --- a/src/mainboard/msi/ms6147/Kconfig +++ b/src/mainboard/msi/ms6147/Kconfig @@ -27,7 +27,6 @@ config BOARD_MSI_MS_6147 select SUPERIO_WINBOND_W83977TF select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/msi/ms6156/Kconfig b/src/mainboard/msi/ms6156/Kconfig index 0ffb63851c..057cfc3b03 100644 --- a/src/mainboard/msi/ms6156/Kconfig +++ b/src/mainboard/msi/ms6156/Kconfig @@ -27,7 +27,6 @@ config BOARD_MSI_MS_6156 select SUPERIO_WINBOND_W83977TF select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/msi/ms7260/Kconfig b/src/mainboard/msi/ms7260/Kconfig index 6f8c34dfed..b2dc6a77b3 100644 --- a/src/mainboard/msi/ms7260/Kconfig +++ b/src/mainboard/msi/ms7260/Kconfig @@ -12,7 +12,6 @@ config BOARD_MSI_MS7260 select USE_DCACHE_RAM select HAVE_HARD_RESET select LIFT_BSP_APIC_ID - select SB_HT_CHAIN_UNITID_OFFSET_ONLY select K8_REV_F_SUPPORT select BOARD_ROMSIZE_KB_512 @@ -113,7 +112,7 @@ config HT_CHAIN_UNITID_BASE config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x20 depends on BOARD_MSI_MS7260 config USE_INIT diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig index bbf5c39dba..413d1fa9c9 100644 --- a/src/mainboard/msi/ms9185/Kconfig +++ b/src/mainboard/msi/ms9185/Kconfig @@ -14,6 +14,7 @@ config BOARD_MSI_MS9185 select HAVE_HARD_RESET select LIFT_BSP_APIC_ID select BOARD_ROMSIZE_KB_512 + select SB_HT_CHAIN_UNITID_OFFSET_ONLY config MAINBOARD_DIR string @@ -45,11 +46,6 @@ config SB_HT_CHAIN_ON_BUS0 default 2 depends on BOARD_MSI_MS9185 -config SB_HT_CHAIN_UNITID_OFFSET_ONLY - bool - default n - depends on BOARD_MSI_MS9185 - config LB_CKS_RANGE_END int default 122 @@ -82,12 +78,12 @@ config MAX_PHYSICAL_CPUS config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x1 depends on BOARD_MSI_MS9185 config HT_CHAIN_UNITID_BASE hex - default 0x0 + default 0x6 depends on BOARD_MSI_MS9185 config USE_INIT @@ -95,11 +91,6 @@ config USE_INIT default n depends on BOARD_MSI_MS9185 -config SB_HT_CHAIN_ON_BUS0 - int - default 2 - depends on BOARD_MSI_MS9185 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/msi/ms9282/Kconfig b/src/mainboard/msi/ms9282/Kconfig index 31a993a8f1..ae10301c32 100644 --- a/src/mainboard/msi/ms9282/Kconfig +++ b/src/mainboard/msi/ms9282/Kconfig @@ -11,7 +11,6 @@ config BOARD_MSI_MS9282 select USE_PRINTK_IN_CAR select USE_DCACHE_RAM select HAVE_HARD_RESET - select SB_HT_CHAIN_UNITID_OFFSET_ONLY select K8_REV_F_SUPPORT select BOARD_ROMSIZE_KB_512 @@ -42,7 +41,7 @@ config APIC_ID_OFFSET config SB_HT_CHAIN_ON_BUS0 int - default 2 + default 1 depends on BOARD_MSI_MS9282 config LB_CKS_RANGE_START @@ -87,12 +86,12 @@ config HW_MEM_HOLE_SIZEK config MAX_CPUS int - default 2 + default 4 depends on BOARD_MSI_MS9282 config MAX_PHYSICAL_CPUS int - default 1 + default 2 depends on BOARD_MSI_MS9282 config HW_MEM_HOLE_SIZE_AUTO_INC @@ -107,7 +106,7 @@ config HT_CHAIN_UNITID_BASE config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x20 depends on BOARD_MSI_MS9282 config USE_INIT diff --git a/src/mainboard/nec/powermate2000/Kconfig b/src/mainboard/nec/powermate2000/Kconfig index 175c6958da..1c161de0b0 100644 --- a/src/mainboard/nec/powermate2000/Kconfig +++ b/src/mainboard/nec/powermate2000/Kconfig @@ -27,7 +27,6 @@ config BOARD_NEC_POWERMATE_2000 select SUPERIO_SMSC_SMSCSUPERIO select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_512 config MAINBOARD_DIR diff --git a/src/mainboard/newisys/khepri/Kconfig b/src/mainboard/newisys/khepri/Kconfig index 968989b171..8ad22ca283 100644 --- a/src/mainboard/newisys/khepri/Kconfig +++ b/src/mainboard/newisys/khepri/Kconfig @@ -13,6 +13,7 @@ config BOARD_NEWISYS_KHEPRI select USE_DCACHE_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 + select SB_HT_CHAIN_UNITID_OFFSET_ONLY config MAINBOARD_DIR string @@ -41,12 +42,7 @@ config K8_REV_F_SUPPORT config SB_HT_CHAIN_ON_BUS0 int - default 2 - depends on BOARD_NEWISYS_KHEPRI - -config SB_HT_CHAIN_UNITID_OFFSET_ONLY - bool - default n + default 0 depends on BOARD_NEWISYS_KHEPRI config LB_CKS_RANGE_END @@ -81,12 +77,12 @@ config MAX_PHYSICAL_CPUS config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x20 depends on BOARD_NEWISYS_KHEPRI config HT_CHAIN_UNITID_BASE hex - default 0x0 + default 0x1 depends on BOARD_NEWISYS_KHEPRI config USE_INIT diff --git a/src/mainboard/nvidia/l1_2pvv/Kconfig b/src/mainboard/nvidia/l1_2pvv/Kconfig index 661d664941..c7c1f1dbfa 100644 --- a/src/mainboard/nvidia/l1_2pvv/Kconfig +++ b/src/mainboard/nvidia/l1_2pvv/Kconfig @@ -12,7 +12,6 @@ config BOARD_NVIDIA_L1_2PVV select USE_DCACHE_RAM select HAVE_HARD_RESET select LIFT_BSP_APIC_ID - select SB_HT_CHAIN_UNITID_OFFSET_ONLY select K8_REV_F_SUPPORT select BOARD_ROMSIZE_KB_512 @@ -93,12 +92,12 @@ config HW_MEM_HOLE_SIZEK config MAX_CPUS int - default 2 + default 4 depends on BOARD_NVIDIA_L1_2PVV config MAX_PHYSICAL_CPUS int - default 1 + default 2 depends on BOARD_NVIDIA_L1_2PVV config HW_MEM_HOLE_SIZE_AUTO_INC @@ -113,7 +112,7 @@ config HT_CHAIN_UNITID_BASE config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x20 depends on BOARD_NVIDIA_L1_2PVV config USE_INIT diff --git a/src/mainboard/olpc/btest/Kconfig b/src/mainboard/olpc/btest/Kconfig index 2f55f4a488..c6e185742b 100644 --- a/src/mainboard/olpc/btest/Kconfig +++ b/src/mainboard/olpc/btest/Kconfig @@ -5,7 +5,6 @@ config BOARD_OLPC_BTEST select NORTHBRIDGE_AMD_GX2 select SOUTHBRIDGE_AMD_CS5536 select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select HAVE_PIRQ_TABLE select BOARD_ROMSIZE_KB_256 diff --git a/src/mainboard/olpc/rev_a/Kconfig b/src/mainboard/olpc/rev_a/Kconfig index 6f8cd1fd1b..e43caa0445 100644 --- a/src/mainboard/olpc/rev_a/Kconfig +++ b/src/mainboard/olpc/rev_a/Kconfig @@ -5,7 +5,6 @@ config BOARD_OLPC_REV_A select NORTHBRIDGE_AMD_GX2 select SOUTHBRIDGE_AMD_CS5536 select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select HAVE_PIRQ_TABLE select BOARD_ROMSIZE_KB_256 diff --git a/src/mainboard/pcengines/alix1c/Kconfig b/src/mainboard/pcengines/alix1c/Kconfig index a7fb2b99c3..44281254b6 100644 --- a/src/mainboard/pcengines/alix1c/Kconfig +++ b/src/mainboard/pcengines/alix1c/Kconfig @@ -8,7 +8,6 @@ config BOARD_PCENGINES_ALIX1C select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select USE_DCACHE_RAM select USE_PRINTK_IN_CAR select BOARD_ROMSIZE_KB_512 diff --git a/src/mainboard/rca/rm4100/Kconfig b/src/mainboard/rca/rm4100/Kconfig index e3381a8596..64b63eb85b 100644 --- a/src/mainboard/rca/rm4100/Kconfig +++ b/src/mainboard/rca/rm4100/Kconfig @@ -7,7 +7,6 @@ config BOARD_RCA_RM4100 select SUPERIO_SMSC_SMSCSUPERIO select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_512 config MAINBOARD_DIR diff --git a/src/mainboard/roda/rk886ex/Kconfig b/src/mainboard/roda/rk886ex/Kconfig index 4f1f8727fd..33c5cec827 100644 --- a/src/mainboard/roda/rk886ex/Kconfig +++ b/src/mainboard/roda/rk886ex/Kconfig @@ -58,6 +58,11 @@ config IRQ_SLOT_COUNT default 18 depends on BOARD_RODA_RK886EX +config MAX_CPUS + int + default 4 + depends on BOARD_RODA_RK886EX + config MAX_PHYSICAL_CPUS int default 2 diff --git a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig index 1a24a73d22..83fd87cf8d 100644 --- a/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig +++ b/src/mainboard/soyo/sy-6ba-plus-iii/Kconfig @@ -27,7 +27,6 @@ config BOARD_SOYO_SY_6BA_PLUS_III select SUPERIO_ITE_IT8671F select HAVE_PIRQ_TABLE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig index 2540ac9c40..71aa3bdb0e 100644 --- a/src/mainboard/sunw/ultra40/Kconfig +++ b/src/mainboard/sunw/ultra40/Kconfig @@ -80,7 +80,7 @@ config MAX_PHYSICAL_CPUS config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x20 depends on BOARD_SUNW_ULTRA40 config HT_CHAIN_UNITID_BASE diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig index 484f4223f2..10e97a1384 100644 --- a/src/mainboard/supermicro/h8dme/Kconfig +++ b/src/mainboard/supermicro/h8dme/Kconfig @@ -87,7 +87,7 @@ config MAX_PHYSICAL_CPUS config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x20 depends on BOARD_SUPERMICRO_H8DME config HT_CHAIN_UNITID_BASE diff --git a/src/mainboard/supermicro/h8dmr/Kconfig b/src/mainboard/supermicro/h8dmr/Kconfig index 9dbb65b427..77109555a2 100644 --- a/src/mainboard/supermicro/h8dmr/Kconfig +++ b/src/mainboard/supermicro/h8dmr/Kconfig @@ -12,7 +12,7 @@ config BOARD_SUPERMICRO_H8DMR select USE_DCACHE_RAM select HAVE_HARD_RESET select LIFT_BSP_APIC_ID - select BOARD_ROMSIZE_KB_512 + select BOARD_ROMSIZE_KB_1024 config MAINBOARD_DIR string @@ -86,7 +86,7 @@ config MAX_PHYSICAL_CPUS config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x20 depends on BOARD_SUPERMICRO_H8DMR config HT_CHAIN_UNITID_BASE diff --git a/src/mainboard/technexion/tim8690/Kconfig b/src/mainboard/technexion/tim8690/Kconfig index efdec94612..00aabc61cb 100644 --- a/src/mainboard/technexion/tim8690/Kconfig +++ b/src/mainboard/technexion/tim8690/Kconfig @@ -79,17 +79,17 @@ config HW_MEM_HOLE_SIZE_AUTO_INC config SB_HT_CHAIN_ON_BUS0 int - default 2 + default 1 depends on BOARD_TECHNEXION_TIM8690 config HT_CHAIN_END_UNITID_BASE hex - default 0x6 + default 0x1 depends on BOARD_TECHNEXION_TIM8690 config HT_CHAIN_UNITID_BASE hex - default 0xa + default 0x0 depends on BOARD_TECHNEXION_TIM8690 config USE_INIT diff --git a/src/mainboard/technologic/ts5300/Kconfig b/src/mainboard/technologic/ts5300/Kconfig index 982e174d28..56cf3d0b07 100644 --- a/src/mainboard/technologic/ts5300/Kconfig +++ b/src/mainboard/technologic/ts5300/Kconfig @@ -3,7 +3,7 @@ config BOARD_TECHNOLOGIC_TS5300 select ARCH_X86 select CPU_AMD_SC520 select HAVE_PIRQ_TABLE - select BOARD_ROMSIZE_KB_256 + select BOARD_ROMSIZE_KB_128 config MAINBOARD_DIR string diff --git a/src/mainboard/televideo/tc7020/Kconfig b/src/mainboard/televideo/tc7020/Kconfig index 681e918553..2dc56ca266 100644 --- a/src/mainboard/televideo/tc7020/Kconfig +++ b/src/mainboard/televideo/tc7020/Kconfig @@ -28,7 +28,6 @@ config BOARD_TELEVIDEO_TC7020 select HAVE_PIRQ_TABLE select PIRQ_ROUTE select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/tyan/s1846/Kconfig b/src/mainboard/tyan/s1846/Kconfig index 5edaefadda..d48e265a2a 100644 --- a/src/mainboard/tyan/s1846/Kconfig +++ b/src/mainboard/tyan/s1846/Kconfig @@ -26,7 +26,6 @@ config BOARD_TYAN_S1846 select SOUTHBRIDGE_INTEL_I82371EB select SUPERIO_NSC_PC87309 select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_256 config MAINBOARD_DIR diff --git a/src/mainboard/tyan/s2880/Kconfig b/src/mainboard/tyan/s2880/Kconfig index 6481d5ff7d..06dac3df3f 100644 --- a/src/mainboard/tyan/s2880/Kconfig +++ b/src/mainboard/tyan/s2880/Kconfig @@ -10,6 +10,7 @@ config BOARD_TYAN_S2880 select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 + select SB_HT_CHAIN_UNITID_OFFSET_ONLY config MAINBOARD_DIR string @@ -23,7 +24,7 @@ config APIC_ID_OFFSET config SB_HT_CHAIN_ON_BUS0 int - default 2 + default 0 depends on BOARD_TYAN_S2880 config LB_CKS_RANGE_END @@ -53,7 +54,7 @@ config HW_MEM_HOLE_SIZEK config MAX_CPUS int - default 4 + default 2 depends on BOARD_TYAN_S2880 config MAX_PHYSICAL_CPUS @@ -68,12 +69,12 @@ config HW_MEM_HOLE_SIZE_AUTO_INC config HT_CHAIN_UNITID_BASE hex - default 0xa + default 0x1 depends on BOARD_TYAN_S2880 config HT_CHAIN_END_UNITID_BASE hex - default 0x6 + default 0x20 depends on BOARD_TYAN_S2880 config USE_INIT @@ -86,16 +87,6 @@ config WAIT_BEFORE_CPUS_INIT default n depends on BOARD_TYAN_S2880 -config SB_HT_CHAIN_ON_BUS0 - int - default 0 - depends on BOARD_TYAN_S2880 - -config SB_HT_CHAIN_UNITID_OFFSET_ONLY - bool - default n - depends on BOARD_TYAN_S2880 - config IRQ_SLOT_COUNT int default 9 diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig index 335f1dbb99..2cfa52a660 100644 --- a/src/mainboard/tyan/s2881/Kconfig +++ b/src/mainboard/tyan/s2881/Kconfig @@ -10,6 +10,7 @@ config BOARD_TYAN_S2881 select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 + select SB_HT_CHAIN_UNITID_OFFSET_ONLY config MAINBOARD_DIR string @@ -23,7 +24,7 @@ config APIC_ID_OFFSET config SB_HT_CHAIN_ON_BUS0 int - default 2 + default 0 depends on BOARD_TYAN_S2881 config LB_CKS_RANGE_END @@ -86,16 +87,6 @@ config WAIT_BEFORE_CPUS_INIT default n depends on BOARD_TYAN_S2881 -config SB_HT_CHAIN_ON_BUS0 - int - default 0 - depends on BOARD_TYAN_S2881 - -config SB_HT_CHAIN_UNITID_OFFSET_ONLY - bool - default n - depends on BOARD_TYAN_S2881 - config IRQ_SLOT_COUNT int default 9 diff --git a/src/mainboard/tyan/s2882/Kconfig b/src/mainboard/tyan/s2882/Kconfig index 7de1434153..2af58fe443 100644 --- a/src/mainboard/tyan/s2882/Kconfig +++ b/src/mainboard/tyan/s2882/Kconfig @@ -10,6 +10,7 @@ config BOARD_TYAN_S2882 select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 + select SB_HT_CHAIN_UNITID_OFFSET_ONLY config MAINBOARD_DIR string @@ -23,7 +24,7 @@ config APIC_ID_OFFSET config SB_HT_CHAIN_ON_BUS0 int - default 2 + default 0 depends on BOARD_TYAN_S2882 config LB_CKS_RANGE_END @@ -68,12 +69,12 @@ config HW_MEM_HOLE_SIZE_AUTO_INC config HT_CHAIN_UNITID_BASE hex - default 0xa + default 0x1 depends on BOARD_TYAN_S2882 config HT_CHAIN_END_UNITID_BASE hex - default 0x6 + default 0x20 depends on BOARD_TYAN_S2882 config USE_INIT @@ -86,16 +87,6 @@ config WAIT_BEFORE_CPUS_INIT default n depends on BOARD_TYAN_S2882 -config SB_HT_CHAIN_ON_BUS0 - int - default 0 - depends on BOARD_TYAN_S2882 - -config SB_HT_CHAIN_UNITID_OFFSET_ONLY - bool - default n - depends on BOARD_TYAN_S2882 - config IRQ_SLOT_COUNT int default 9 diff --git a/src/mainboard/tyan/s2885/Kconfig b/src/mainboard/tyan/s2885/Kconfig index 97fb043c0f..12bf3e3f39 100644 --- a/src/mainboard/tyan/s2885/Kconfig +++ b/src/mainboard/tyan/s2885/Kconfig @@ -10,6 +10,7 @@ config BOARD_TYAN_S2885 select HAVE_PIRQ_TABLE select HAVE_MP_TABLE select BOARD_ROMSIZE_KB_512 + select SB_HT_CHAIN_UNITID_OFFSET_ONLY config MAINBOARD_DIR string @@ -86,16 +87,6 @@ config WAIT_BEFORE_CPUS_INIT default n depends on BOARD_TYAN_S2885 -config SB_HT_CHAIN_ON_BUS0 - int - default 0 - depends on BOARD_TYAN_S2885 - -config SB_HT_CHAIN_UNITID_OFFSET_ONLY - bool - default n - depends on BOARD_TYAN_S2885 - config IRQ_SLOT_COUNT int default 9 diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig index b891e4da10..ef609bce64 100644 --- a/src/mainboard/tyan/s2891/Kconfig +++ b/src/mainboard/tyan/s2891/Kconfig @@ -11,7 +11,8 @@ config BOARD_TYAN_S2891 select HAVE_MP_TABLE select SERIAL_CPU_INIT select HAVE_ACPI_TABLES - select BOARD_ROMSIZE_KB_1024 + select BOARD_ROMSIZE_KB_512 + select SB_HT_CHAIN_UNITID_OFFSET_ONLY config MAINBOARD_DIR string @@ -88,16 +89,6 @@ config WAIT_BEFORE_CPUS_INIT default n depends on BOARD_TYAN_S2891 -config SB_HT_CHAIN_ON_BUS0 - int - default 2 - depends on BOARD_TYAN_S2891 - -config SB_HT_CHAIN_UNITID_OFFSET_ONLY - bool - default n - depends on BOARD_TYAN_S2891 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/tyan/s2912/Kconfig b/src/mainboard/tyan/s2912/Kconfig index 883ea6f7e4..8b02d3e845 100644 --- a/src/mainboard/tyan/s2912/Kconfig +++ b/src/mainboard/tyan/s2912/Kconfig @@ -12,7 +12,6 @@ config BOARD_TYAN_S2912 select USE_DCACHE_RAM select HAVE_HARD_RESET select LIFT_BSP_APIC_ID - select SB_HT_CHAIN_UNITID_OFFSET_ONLY select K8_REV_F_SUPPORT select BOARD_ROMSIZE_KB_512 @@ -93,12 +92,12 @@ config HW_MEM_HOLE_SIZEK config MAX_CPUS int - default 2 + default 4 depends on BOARD_TYAN_S2912 config MAX_PHYSICAL_CPUS int - default 1 + default 2 depends on BOARD_TYAN_S2912 config HW_MEM_HOLE_SIZE_AUTO_INC @@ -113,7 +112,7 @@ config HT_CHAIN_UNITID_BASE config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x20 depends on BOARD_TYAN_S2912 config USE_INIT diff --git a/src/mainboard/tyan/s4880/Kconfig b/src/mainboard/tyan/s4880/Kconfig index 9ba1d57528..756b69423b 100644 --- a/src/mainboard/tyan/s4880/Kconfig +++ b/src/mainboard/tyan/s4880/Kconfig @@ -13,6 +13,7 @@ config BOARD_TYAN_S4880 select USE_DCACHE_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 + select SB_HT_CHAIN_UNITID_OFFSET_ONLY config MAINBOARD_DIR string @@ -41,12 +42,7 @@ config K8_REV_F_SUPPORT config SB_HT_CHAIN_ON_BUS0 int - default 2 - depends on BOARD_TYAN_S4880 - -config SB_HT_CHAIN_UNITID_OFFSET_ONLY - bool - default n + default 0 depends on BOARD_TYAN_S4880 config LB_CKS_RANGE_END @@ -71,22 +67,22 @@ config HW_MEM_HOLE_SIZEK config MAX_CPUS int - default 4 + default 8 depends on BOARD_TYAN_S4880 config MAX_PHYSICAL_CPUS int - default 2 + default 4 depends on BOARD_TYAN_S4880 config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x20 depends on BOARD_TYAN_S4880 config HT_CHAIN_UNITID_BASE hex - default 0x0 + default 0x1 depends on BOARD_TYAN_S4880 config USE_INIT @@ -94,11 +90,6 @@ config USE_INIT default n depends on BOARD_TYAN_S4880 -config SB_HT_CHAIN_ON_BUS0 - int - default 2 - depends on BOARD_TYAN_S4880 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/tyan/s4882/Kconfig b/src/mainboard/tyan/s4882/Kconfig index 8970280344..ae48dc43d7 100644 --- a/src/mainboard/tyan/s4882/Kconfig +++ b/src/mainboard/tyan/s4882/Kconfig @@ -13,6 +13,7 @@ config BOARD_TYAN_S4882 select USE_DCACHE_RAM select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 + select SB_HT_CHAIN_UNITID_OFFSET_ONLY config MAINBOARD_DIR string @@ -41,12 +42,7 @@ config K8_REV_F_SUPPORT config SB_HT_CHAIN_ON_BUS0 int - default 2 - depends on BOARD_TYAN_S4882 - -config SB_HT_CHAIN_UNITID_OFFSET_ONLY - bool - default n + default 0 depends on BOARD_TYAN_S4882 config LB_CKS_RANGE_END @@ -71,22 +67,22 @@ config HW_MEM_HOLE_SIZEK config MAX_CPUS int - default 4 + default 8 depends on BOARD_TYAN_S4882 config MAX_PHYSICAL_CPUS int - default 2 + default 4 depends on BOARD_TYAN_S4882 config HT_CHAIN_END_UNITID_BASE hex - default 0x0 + default 0x20 depends on BOARD_TYAN_S4882 config HT_CHAIN_UNITID_BASE hex - default 0x0 + default 0x1 depends on BOARD_TYAN_S4882 config USE_INIT @@ -94,11 +90,6 @@ config USE_INIT default n depends on BOARD_TYAN_S4882 -config SB_HT_CHAIN_ON_BUS0 - int - default 2 - depends on BOARD_TYAN_S4882 - config IRQ_SLOT_COUNT int default 11 diff --git a/src/mainboard/via/pc2500e/Kconfig b/src/mainboard/via/pc2500e/Kconfig index 9b88aad1e1..a23ec454cd 100644 --- a/src/mainboard/via/pc2500e/Kconfig +++ b/src/mainboard/via/pc2500e/Kconfig @@ -9,7 +9,6 @@ config BOARD_VIA_PC2500E select HAVE_MP_TABLE select SMP select UDELAY_TSC - select TSC_X86RDTSC_CALIBRATE_WITH_TIMER2 select BOARD_ROMSIZE_KB_512 config MAINBOARD_DIR diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig index bee9bfec9a..9428b3aac9 100644 --- a/src/mainboard/via/vt8454c/Kconfig +++ b/src/mainboard/via/vt8454c/Kconfig @@ -10,7 +10,7 @@ config BOARD_VIA_VT8454C # select MMCONF_SUPPORT select USE_PRINTK_IN_CAR select HAVE_ACPI_TABLES - select BOARD_ROMSIZE_KB_1024 + select BOARD_ROMSIZE_KB_512 config MAINBOARD_DIR string |