4 files changed, 5 insertions, 39 deletions
diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig
index 5d1acfc8e1..4617c9f8f9 100644
--- a/src/mainboard/msi/ms7135/Kconfig
+++ b/src/mainboard/msi/ms7135/Kconfig
@@ -79,11 +79,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 2
 	depends on BOARD_MSI_MS7135
 
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default n
-	depends on BOARD_MSI_MS7135
-
 config IRQ_SLOT_COUNT
 	int
 	default 13
diff --git a/src/mainboard/msi/ms9282/get_bus_conf.c b/src/mainboard/msi/ms9282/get_bus_conf.c
index f2b9f5932a..a1326b84dd 100644
--- a/src/mainboard/msi/ms9282/get_bus_conf.c
+++ b/src/mainboard/msi/ms9282/get_bus_conf.c
@@ -68,31 +68,6 @@ extern void get_sblk_pci1234(void);
 
 static unsigned get_bus_conf_done = 0;
 
-static unsigned get_hcid(unsigned i)
-{
-        unsigned id = 0;
-
-        unsigned busn = (sysconf.pci1234[i] >> 16) & 0xff;
-
-        unsigned devn = sysconf.hcdn[i] & 0xff;
-
-        device_t dev;
-
-        dev = dev_find_slot(busn, PCI_DEVFN(devn,0));
-
-        switch (dev->device) {
-        case 0x0369: //IO55
-                id = 4;
-                break;
-        }
-
-        // we may need more way to find out hcid: subsystem id? GPIO read ?
-
-        // we need use id for 1. bus num, 2. mptable, 3. acpi table
-
-        return id;
-}
-
 void get_bus_conf(void)
 {
 
diff --git a/src/mainboard/msi/ms9282/mptable.c b/src/mainboard/msi/ms9282/mptable.c
index 02a4ede25b..f8a3195614 100644
--- a/src/mainboard/msi/ms9282/mptable.c
+++ b/src/mainboard/msi/ms9282/mptable.c
@@ -38,12 +38,12 @@ static void *smp_write_config_table(void *v)
 {
         static const char sig[4] = "PCMP";
         static const char oem[8] = "MSI    ";
-        static const char productid[12] = "MS9282       ";
+        static const char productid[12] = "MS9282      ";
         struct mp_config_table *mc;
-       struct mb_sysconf_t *m;
-       unsigned sbdn;
+	struct mb_sysconf_t *m;
+	unsigned sbdn;
 
-       int i,j;
+	int i,j;
 
         mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
         memset(mc, 0, sizeof(*mc));
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index aa8a6b261d..4a80544342 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -16,6 +16,7 @@ config BOARD_MSI_MS9652_FAM10
 	select ENABLE_APIC_EXT_ID
 	select AMDMCT
 	select TINY_BOOTBLOCK
+	select SB_HT_CHAIN_UNITID_OFFSET_ONLY
 
 config MAINBOARD_DIR
 	string
@@ -189,11 +190,6 @@ config SB_HT_CHAIN_ON_BUS0
 	default 1
 	depends on BOARD_MSI_MS9652_FAM10
 
-config SB_HT_CHAIN_UNITID_OFFSET_ONLY
-	bool
-	default y
-	depends on BOARD_MSI_MS9652_FAM10
-
 config VAR_MTRR_HOLE
 	bool
 	default n