summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/amd/dinar/Kconfig8
-rw-r--r--src/mainboard/amd/dinar/acpi_tables.c11
-rw-r--r--src/mainboard/amd/dinar/mptable.c11
-rw-r--r--src/mainboard/supermicro/h8qgi/Kconfig4
-rw-r--r--src/mainboard/supermicro/h8qgi/acpi_tables.c11
-rw-r--r--src/mainboard/supermicro/h8qgi/mptable.c9
-rw-r--r--src/mainboard/supermicro/h8scm/Kconfig4
-rw-r--r--src/mainboard/supermicro/h8scm/acpi_tables.c11
-rw-r--r--src/mainboard/supermicro/h8scm/mptable.c9
-rw-r--r--src/mainboard/tyan/s8226/Kconfig4
-rw-r--r--src/mainboard/tyan/s8226/acpi_tables.c11
-rw-r--r--src/mainboard/tyan/s8226/mptable.c9
12 files changed, 37 insertions, 65 deletions
diff --git a/src/mainboard/amd/dinar/Kconfig b/src/mainboard/amd/dinar/Kconfig
index b5434b42b3..6768a57dac 100644
--- a/src/mainboard/amd/dinar/Kconfig
+++ b/src/mainboard/amd/dinar/Kconfig
@@ -42,10 +42,6 @@ config MAINBOARD_DIR
string
default amd/dinar
-config APIC_ID_OFFSET
- hex
- default 0x0
-
config MAINBOARD_PART_NUMBER
string
default "Dinar"
@@ -58,10 +54,6 @@ config MAX_CPUS
int
default 64
-config MAX_PHYSICAL_CPUS
- int
- default 16
-
config HW_MEM_HOLE_SIZE_AUTO_INC
bool
default n
diff --git a/src/mainboard/amd/dinar/acpi_tables.c b/src/mainboard/amd/dinar/acpi_tables.c
index c4a42dc1d6..b0105651ea 100644
--- a/src/mainboard/amd/dinar/acpi_tables.c
+++ b/src/mainboard/amd/dinar/acpi_tables.c
@@ -73,12 +73,11 @@ unsigned long acpi_fill_madt(unsigned long current)
* For systems with < 16 APICs, put the Local-APICs at 0..n and
* put the IO-APICs at (n + 1)..z
*/
-#if CONFIG_MAX_CPUS >= 16
- apicid_sb700 = 0x0;
-#else
- apicid_sb700 = CONFIG_MAX_CPUS + 1
-#endif
- apicid_rd890 = apicid_sb700 + 1;
+ if (CONFIG_MAX_CPUS >= 16)
+ apicid_sb700 = 0x0;
+ else
+ apicid_sb700 = CONFIG_MAX_CPUS + 1;
+ apicid_rd890 = apicid_sb700 + 1;
/* create all subtables for processors */
current = acpi_create_madt_lapics(current);
diff --git a/src/mainboard/amd/dinar/mptable.c b/src/mainboard/amd/dinar/mptable.c
index 60779f8fa9..5f9e83bdac 100644
--- a/src/mainboard/amd/dinar/mptable.c
+++ b/src/mainboard/amd/dinar/mptable.c
@@ -58,12 +58,11 @@ static void *smp_write_config_table(void *v)
* For systems with < 16 APICs, put the Local-APICs at 0..n and
* put the IO-APICs at (n + 1)..z
*/
-#if CONFIG_MAX_CPUS >= 16
- apicid_sb700 = 0x0;
-#else
- apicid_sb700 = CONFIG_MAX_CPUS + 1
-#endif
- apicid_rd890 = apicid_sb700 + 1;
+ if (CONFIG_MAX_CPUS >= 16)
+ apicid_sb700 = 0x0;
+ else
+ apicid_sb700 = CONFIG_MAX_CPUS + 1;
+ apicid_rd890 = apicid_sb700 + 1;
//bus_sb700[0], TODO: why bus_sb700[0] use same value of bus_rd890[0] assigned by get_pci1234(), instead of 0.
dev = dev_find_slot(0, PCI_DEVFN(sbdn_sb700 + 0x14, 0));
diff --git a/src/mainboard/supermicro/h8qgi/Kconfig b/src/mainboard/supermicro/h8qgi/Kconfig
index 6371d9eb81..2ff782a765 100644
--- a/src/mainboard/supermicro/h8qgi/Kconfig
+++ b/src/mainboard/supermicro/h8qgi/Kconfig
@@ -54,10 +54,6 @@ config MAX_CPUS
int
default 64
-config MAX_PHYSICAL_CPUS
- int
- default 16
-
config HW_MEM_HOLE_SIZE_AUTO_INC
bool
default n
diff --git a/src/mainboard/supermicro/h8qgi/acpi_tables.c b/src/mainboard/supermicro/h8qgi/acpi_tables.c
index 0b62af7ffc..90d39bc19e 100644
--- a/src/mainboard/supermicro/h8qgi/acpi_tables.c
+++ b/src/mainboard/supermicro/h8qgi/acpi_tables.c
@@ -72,12 +72,11 @@ unsigned long acpi_fill_madt(unsigned long current)
* For systems with < 16 APICs, put the Local-APICs at 0..n and
* put the IO-APICs at (n + 1)..z
*/
-#if CONFIG_MAX_CPUS >= 16
- apicid_sp5100 = 0x0;
-#else
- apicid_sp5100 = CONFIG_MAX_CPUS + 1
-#endif
- apicid_sr5650 = apicid_sp5100 + 1;
+ if (CONFIG_MAX_CPUS >= 16)
+ apicid_sp5100 = 0x0;
+ else
+ apicid_sp5100 = CONFIG_MAX_CPUS + 1;
+ apicid_sr5650 = apicid_sp5100 + 1;
/* create all subtables for processors */
current = acpi_create_madt_lapics(current);
diff --git a/src/mainboard/supermicro/h8qgi/mptable.c b/src/mainboard/supermicro/h8qgi/mptable.c
index c10a21950d..0365ae6611 100644
--- a/src/mainboard/supermicro/h8qgi/mptable.c
+++ b/src/mainboard/supermicro/h8qgi/mptable.c
@@ -58,11 +58,10 @@ static void *smp_write_config_table(void *v)
* For systems with < 16 APICs, put the Local-APICs at 0..n and
* put the IO-APICs at (n + 1)..z
*/
-#if CONFIG_MAX_CPUS >= 16
- apicid_sp5100 = 0x0;
-#else
- apicid_sp5100 = CONFIG_MAX_CPUS + 1
-#endif
+ if (CONFIG_MAX_CPUS >= 16)
+ apicid_sp5100 = 0x0;
+ else
+ apicid_sp5100 = CONFIG_MAX_CPUS + 1;
apicid_sr5650 = apicid_sp5100 + 1;
dev = dev_find_slot(0, PCI_DEVFN(sbdn_sp5100 + 0x14, 0));
diff --git a/src/mainboard/supermicro/h8scm/Kconfig b/src/mainboard/supermicro/h8scm/Kconfig
index 86395e4ebf..7260f998cf 100644
--- a/src/mainboard/supermicro/h8scm/Kconfig
+++ b/src/mainboard/supermicro/h8scm/Kconfig
@@ -53,10 +53,6 @@ config MAX_CPUS
int
default 64
-config MAX_PHYSICAL_CPUS
- int
- default 16
-
config CPU_ADDR_BITS
int
default 36 # TODO: Set it conservatively to match both fam10 & 15
diff --git a/src/mainboard/supermicro/h8scm/acpi_tables.c b/src/mainboard/supermicro/h8scm/acpi_tables.c
index 05c99950ca..ffcdf1cadd 100644
--- a/src/mainboard/supermicro/h8scm/acpi_tables.c
+++ b/src/mainboard/supermicro/h8scm/acpi_tables.c
@@ -72,12 +72,11 @@ unsigned long acpi_fill_madt(unsigned long current)
* For systems with < 16 APICs, put the Local-APICs at 0..n and
* put the IO-APICs at (n + 1)..z
*/
-#if CONFIG_MAX_CPUS >= 16
- apicid_sp5100 = 0x0;
-#else
- apicid_sp5100 = CONFIG_MAX_CPUS + 1
-#endif
- apicid_sr5650 = apicid_sp5100 + 1;
+ if (CONFIG_MAX_CPUS >= 16)
+ apicid_sp5100 = 0x0;
+ else
+ apicid_sp5100 = CONFIG_MAX_CPUS + 1;
+ apicid_sr5650 = apicid_sp5100 + 1;
/* create all subtables for processors */
current = acpi_create_madt_lapics(current);
diff --git a/src/mainboard/supermicro/h8scm/mptable.c b/src/mainboard/supermicro/h8scm/mptable.c
index c10a21950d..0365ae6611 100644
--- a/src/mainboard/supermicro/h8scm/mptable.c
+++ b/src/mainboard/supermicro/h8scm/mptable.c
@@ -58,11 +58,10 @@ static void *smp_write_config_table(void *v)
* For systems with < 16 APICs, put the Local-APICs at 0..n and
* put the IO-APICs at (n + 1)..z
*/
-#if CONFIG_MAX_CPUS >= 16
- apicid_sp5100 = 0x0;
-#else
- apicid_sp5100 = CONFIG_MAX_CPUS + 1
-#endif
+ if (CONFIG_MAX_CPUS >= 16)
+ apicid_sp5100 = 0x0;
+ else
+ apicid_sp5100 = CONFIG_MAX_CPUS + 1;
apicid_sr5650 = apicid_sp5100 + 1;
dev = dev_find_slot(0, PCI_DEVFN(sbdn_sp5100 + 0x14, 0));
diff --git a/src/mainboard/tyan/s8226/Kconfig b/src/mainboard/tyan/s8226/Kconfig
index 68ce152869..e8d2f88b8b 100644
--- a/src/mainboard/tyan/s8226/Kconfig
+++ b/src/mainboard/tyan/s8226/Kconfig
@@ -54,10 +54,6 @@ config MAX_CPUS
int
default 64
-config MAX_PHYSICAL_CPUS
- int
- default 2
-
config HW_MEM_HOLE_SIZE_AUTO_INC
bool
default n
diff --git a/src/mainboard/tyan/s8226/acpi_tables.c b/src/mainboard/tyan/s8226/acpi_tables.c
index 0cac9148c9..fde10f182a 100644
--- a/src/mainboard/tyan/s8226/acpi_tables.c
+++ b/src/mainboard/tyan/s8226/acpi_tables.c
@@ -72,12 +72,11 @@ unsigned long acpi_fill_madt(unsigned long current)
* For systems with < 16 APICs, put the Local-APICs at 0..n and
* put the IO-APICs at (n + 1)..z
*/
-#if CONFIG_MAX_CPUS >= 16
- apicid_sp5100 = 0x0;
-#else
- apicid_sp5100 = CONFIG_MAX_CPUS + 1
-#endif
- apicid_sr5650 = apicid_sp5100 + 1;
+ if (CONFIG_MAX_CPUS >= 16)
+ apicid_sp5100 = 0x0;
+ else
+ apicid_sp5100 = CONFIG_MAX_CPUS + 1;
+ apicid_sr5650 = apicid_sp5100 + 1;
/* create all subtables for processors */
current = acpi_create_madt_lapics(current);
diff --git a/src/mainboard/tyan/s8226/mptable.c b/src/mainboard/tyan/s8226/mptable.c
index c10a21950d..0365ae6611 100644
--- a/src/mainboard/tyan/s8226/mptable.c
+++ b/src/mainboard/tyan/s8226/mptable.c
@@ -58,11 +58,10 @@ static void *smp_write_config_table(void *v)
* For systems with < 16 APICs, put the Local-APICs at 0..n and
* put the IO-APICs at (n + 1)..z
*/
-#if CONFIG_MAX_CPUS >= 16
- apicid_sp5100 = 0x0;
-#else
- apicid_sp5100 = CONFIG_MAX_CPUS + 1
-#endif
+ if (CONFIG_MAX_CPUS >= 16)
+ apicid_sp5100 = 0x0;
+ else
+ apicid_sp5100 = CONFIG_MAX_CPUS + 1;
apicid_sr5650 = apicid_sp5100 + 1;
dev = dev_find_slot(0, PCI_DEVFN(sbdn_sp5100 + 0x14, 0));
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-20 18:37:39 +0000