diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig
index c581945b0c..d1633399be 100644
--- a/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -49,11 +49,6 @@ config IOAPIC
 	default y
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-	depends on BOARD_AMD_SERENGETI_CHEETAH
-
 config LB_CKS_RANGE_END
 	int
 	default 122
@@ -114,6 +109,16 @@ config HW_MEM_HOLE_SIZE_AUTO_INC
 	default n
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
+config SB_HT_CHAIN_UNITID_OFFSET_ONLY
+	int
+	default 1
+	depends on BOARD_AMD_SERENGETI_CHEETAH
+
+config SB_HT_CHAIN_ON_BUS0
+	int
+	default 2
+	depends on BOARD_AMD_SERENGETI_CHEETAH
+
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x6
@@ -144,11 +149,6 @@ config WAIT_BEFORE_CPUS_INIT
 	default y
 	depends on BOARD_AMD_SERENGETI_CHEETAH
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-	depends on BOARD_AMD_SERENGETI_CHEETAH
-
 config CONSOLE_VGA
 	bool
 	default y