3 files changed, 9 insertions, 15 deletions
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));