AMD K8 fam10: Refactor Kconfig SB_HT_CHAIN_ON_BUS0

If SB_HT_CHAIN_ON_BUS0 is selected, HyperTransport chain for System Bus
is the first to scan and it will be assigned with bus number 0.

If HT_CHAIN_DISTRIBUTE is selected, each link will reserve a fixed range
of bus numbers instead of assigning consecutive numbers across all the links.

All fam10 have SB_HT_CHAIN_ON_BUS0 selected under northbridge.
Follow-up can easily drop this if we find this is dictated by architecture.

Change-Id: I8deddcb4c3fd679b6b27e2879d9dba3895c4dd6f
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/8366
Tested-by: build bot (Jenkins)
Reviewed-by: Edward O'Callaghan <edward.ocallaghan@koparo.com>
Reviewed-by: Timothy Pearson <tpearson@raptorengineeringinc.com>

64 files changed, 41 insertions, 246 deletions

diff --git a/src/mainboard/advansus/a785e-i/Kconfig b/src/mainboard/advansus/a785e-i/Kconfig
index 388249fc70..b6213d512b 100644
--- a/src/mainboard/advansus/a785e-i/Kconfig
+++ b/src/mainboard/advansus/a785e-i/Kconfig
@@ -52,10 +52,6 @@ config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/amd/bimini_fam10/Kconfig b/src/mainboard/amd/bimini_fam10/Kconfig
index 369cb7e7c8..261c60a575 100644
--- a/src/mainboard/amd/bimini_fam10/Kconfig
+++ b/src/mainboard/amd/bimini_fam10/Kconfig
@@ -52,10 +52,6 @@ config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/amd/dbm690t/Kconfig b/src/mainboard/amd/dbm690t/Kconfig
index 70d63ad5eb..77bafc5cfb 100644
--- a/src/mainboard/amd/dbm690t/Kconfig
+++ b/src/mainboard/amd/dbm690t/Kconfig
@@ -36,10 +36,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 1
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/amd/mahogany/Kconfig b/src/mainboard/amd/mahogany/Kconfig
index 394ad77173..8861b4aad5 100644
--- a/src/mainboard/amd/mahogany/Kconfig
+++ b/src/mainboard/amd/mahogany/Kconfig
@@ -47,10 +47,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/amd/mahogany_fam10/Kconfig b/src/mainboard/amd/mahogany_fam10/Kconfig
index ec5ca0b3fe..393882ca28 100644
--- a/src/mainboard/amd/mahogany_fam10/Kconfig
+++ b/src/mainboard/amd/mahogany_fam10/Kconfig
@@ -40,10 +40,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/amd/pistachio/Kconfig b/src/mainboard/amd/pistachio/Kconfig
index 9a91eece24..2296e829ff 100644
--- a/src/mainboard/amd/pistachio/Kconfig
+++ b/src/mainboard/amd/pistachio/Kconfig
@@ -44,10 +44,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 1
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig
index e1363eb340..2d2d4d172c 100644
--- a/src/mainboard/amd/serengeti_cheetah/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah/Kconfig
@@ -10,6 +10,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SOUTHBRIDGE_AMD_AMD8131
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_WINBOND_W83627HF
 	select PARALLEL_CPU_INIT
 	select HAVE_OPTION_TABLE
@@ -55,10 +56,6 @@ config MEM_TRAIN_SEQ
 	int
 	default 1
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x6
diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index 2a3e6a73d3..3e6e025a90 100644
--- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
+++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
@@ -8,6 +8,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SOUTHBRIDGE_AMD_AMD8132
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
@@ -41,10 +42,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 8
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x6
diff --git a/src/mainboard/amd/tilapia_fam10/Kconfig b/src/mainboard/amd/tilapia_fam10/Kconfig
index 901d6b11a9..254cf6686c 100644
--- a/src/mainboard/amd/tilapia_fam10/Kconfig
+++ b/src/mainboard/amd/tilapia_fam10/Kconfig
@@ -40,10 +40,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/arima/hdama/Kconfig b/src/mainboard/arima/hdama/Kconfig
index 49860b303b..66177f5418 100644
--- a/src/mainboard/arima/hdama/Kconfig
+++ b/src/mainboard/arima/hdama/Kconfig
@@ -38,10 +38,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
diff --git a/src/mainboard/asrock/939a785gmh/Kconfig b/src/mainboard/asrock/939a785gmh/Kconfig
index cfaa599784..2148385def 100644
--- a/src/mainboard/asrock/939a785gmh/Kconfig
+++ b/src/mainboard/asrock/939a785gmh/Kconfig
@@ -49,10 +49,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/asus/a8n_e/Kconfig b/src/mainboard/asus/a8n_e/Kconfig
index 5b7c1e6e4a..1852ae45e0 100644
--- a/src/mainboard/asus/a8n_e/Kconfig
+++ b/src/mainboard/asus/a8n_e/Kconfig
@@ -5,6 +5,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select CPU_AMD_SOCKET_939
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_CK804
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_ITE_IT8712F
 	select HAVE_OPTION_TABLE
 	select HAVE_CMOS_DEFAULT
@@ -54,10 +55,6 @@ config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config IRQ_SLOT_COUNT
 	int
 	default 13
diff --git a/src/mainboard/asus/a8v-e_deluxe/Kconfig b/src/mainboard/asus/a8v-e_deluxe/Kconfig
index 8ebff310fb..a1c2fd9732 100644
--- a/src/mainboard/asus/a8v-e_deluxe/Kconfig
+++ b/src/mainboard/asus/a8v-e_deluxe/Kconfig
@@ -33,10 +33,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0x10
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "A8V-E Deluxe"
diff --git a/src/mainboard/asus/a8v-e_se/Kconfig b/src/mainboard/asus/a8v-e_se/Kconfig
index d819b0dad9..dffe9eb14f 100644
--- a/src/mainboard/asus/a8v-e_se/Kconfig
+++ b/src/mainboard/asus/a8v-e_se/Kconfig
@@ -33,10 +33,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0x10
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "A8V-E SE"
diff --git a/src/mainboard/asus/k8v-x/Kconfig b/src/mainboard/asus/k8v-x/Kconfig
index 1deb5b673f..52bf661f79 100644
--- a/src/mainboard/asus/k8v-x/Kconfig
+++ b/src/mainboard/asus/k8v-x/Kconfig
@@ -32,10 +32,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0x10
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "K8V-X"
diff --git a/src/mainboard/asus/kfsn4-dre/Kconfig b/src/mainboard/asus/kfsn4-dre/Kconfig
index 47fccdace4..2750c17822 100644
--- a/src/mainboard/asus/kfsn4-dre/Kconfig
+++ b/src/mainboard/asus/kfsn4-dre/Kconfig
@@ -44,10 +44,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "KFSN4-DRE"
diff --git a/src/mainboard/asus/m2n-e/Kconfig b/src/mainboard/asus/m2n-e/Kconfig
index b7375f2090..02e516e426 100644
--- a/src/mainboard/asus/m2n-e/Kconfig
+++ b/src/mainboard/asus/m2n-e/Kconfig
@@ -26,6 +26,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_MCP55
+	select HT_CHAIN_DISTRIBUTE
 	select MCP55_USE_NIC
 	select MCP55_USE_AZA
 	select SUPERIO_ITE_IT8716F
@@ -57,10 +58,6 @@ config MEM_TRAIN_SEQ
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "M2N-E"
diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index ab155b9567..efcfc81921 100644
--- a/src/mainboard/asus/m2v-mx_se/Kconfig
+++ b/src/mainboard/asus/m2v-mx_se/Kconfig
@@ -67,10 +67,6 @@ config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
diff --git a/src/mainboard/asus/m2v/Kconfig b/src/mainboard/asus/m2v/Kconfig
index 35ad38dd1b..72527be3bb 100644
--- a/src/mainboard/asus/m2v/Kconfig
+++ b/src/mainboard/asus/m2v/Kconfig
@@ -36,10 +36,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0x10
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "M2V"
diff --git a/src/mainboard/asus/m4a78-em/Kconfig b/src/mainboard/asus/m4a78-em/Kconfig
index b00a0b6014..0382daf731 100644
--- a/src/mainboard/asus/m4a78-em/Kconfig
+++ b/src/mainboard/asus/m4a78-em/Kconfig
@@ -39,10 +39,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/asus/m4a785-m/Kconfig b/src/mainboard/asus/m4a785-m/Kconfig
index f93c48464d..a945d2a16a 100644
--- a/src/mainboard/asus/m4a785-m/Kconfig
+++ b/src/mainboard/asus/m4a785-m/Kconfig
@@ -40,10 +40,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/asus/m4a785t-m/Kconfig b/src/mainboard/asus/m4a785t-m/Kconfig
index d98ad959bf..a347f02039 100644
--- a/src/mainboard/asus/m4a785t-m/Kconfig
+++ b/src/mainboard/asus/m4a785t-m/Kconfig
@@ -42,10 +42,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/asus/m5a88-v/Kconfig b/src/mainboard/asus/m5a88-v/Kconfig
index 143018948a..a5f19f5bd4 100644
--- a/src/mainboard/asus/m5a88-v/Kconfig
+++ b/src/mainboard/asus/m5a88-v/Kconfig
@@ -50,10 +50,6 @@ config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/avalue/eax-785e/Kconfig b/src/mainboard/avalue/eax-785e/Kconfig
index 38a3aa3e37..9d7c2e0583 100644
--- a/src/mainboard/avalue/eax-785e/Kconfig
+++ b/src/mainboard/avalue/eax-785e/Kconfig
@@ -52,10 +52,6 @@ config HW_MEM_HOLE_SIZE_AUTO_INC
 	bool
 	default n
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/broadcom/blast/Kconfig b/src/mainboard/broadcom/blast/Kconfig
index b821f7aa8b..ddd2acad36 100644
--- a/src/mainboard/broadcom/blast/Kconfig
+++ b/src/mainboard/broadcom/blast/Kconfig
@@ -31,10 +31,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0x0
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "Blast"
diff --git a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
index a79c28f5ca..e182c996e2 100644
--- a/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
+++ b/src/mainboard/gigabyte/ga_2761gxdk/Kconfig
@@ -6,6 +6,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_SIS_SIS966
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_ITE_IT8716F
 	select PARALLEL_CPU_INIT
 	select HAVE_OPTION_TABLE
@@ -37,10 +38,6 @@ config MEM_TRAIN_SEQ
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "GA-2761GXDK"
diff --git a/src/mainboard/gigabyte/m57sli/Kconfig b/src/mainboard/gigabyte/m57sli/Kconfig
index 6ef94ce201..cc8be43ed8 100644
--- a/src/mainboard/gigabyte/m57sli/Kconfig
+++ b/src/mainboard/gigabyte/m57sli/Kconfig
@@ -6,6 +6,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_MCP55
+	select HT_CHAIN_DISTRIBUTE
 	select MCP55_USE_NIC
 	select MCP55_USE_AZA
 	select SUPERIO_ITE_IT8716F
@@ -41,10 +42,6 @@ config MEM_TRAIN_SEQ
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "GA-M57SLI-S4"
diff --git a/src/mainboard/gigabyte/ma785gm/Kconfig b/src/mainboard/gigabyte/ma785gm/Kconfig
index 8f44e7689a..bf441e9d29 100644
--- a/src/mainboard/gigabyte/ma785gm/Kconfig
+++ b/src/mainboard/gigabyte/ma785gm/Kconfig
@@ -40,10 +40,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/gigabyte/ma785gmt/Kconfig b/src/mainboard/gigabyte/ma785gmt/Kconfig
index 03b9237583..827c8da6bf 100644
--- a/src/mainboard/gigabyte/ma785gmt/Kconfig
+++ b/src/mainboard/gigabyte/ma785gmt/Kconfig
@@ -40,10 +40,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/gigabyte/ma78gm/Kconfig b/src/mainboard/gigabyte/ma78gm/Kconfig
index 32421e8bd4..3d85708477 100644
--- a/src/mainboard/gigabyte/ma78gm/Kconfig
+++ b/src/mainboard/gigabyte/ma78gm/Kconfig
@@ -40,10 +40,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/hp/dl145_g1/Kconfig b/src/mainboard/hp/dl145_g1/Kconfig
index 0c6d6428f1..74ce0e726c 100644
--- a/src/mainboard/hp/dl145_g1/Kconfig
+++ b/src/mainboard/hp/dl145_g1/Kconfig
@@ -6,6 +6,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SOUTHBRIDGE_AMD_AMD8111
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_HARD_RESET
 	select HAVE_OPTION_TABLE
@@ -28,10 +29,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0x0
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "ProLiant DL145 G1"
diff --git a/src/mainboard/hp/dl145_g3/Kconfig b/src/mainboard/hp/dl145_g3/Kconfig
index 439188a879..da20fb339e 100644
--- a/src/mainboard/hp/dl145_g3/Kconfig
+++ b/src/mainboard/hp/dl145_g3/Kconfig
@@ -8,6 +8,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_BROADCOM_BCM21000
 	select SOUTHBRIDGE_BROADCOM_BCM5785
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_SERVERENGINES_PILOT
 	select SUPERIO_NSC_PC87417
 	select HAVE_OPTION_TABLE
@@ -56,10 +57,6 @@ config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x6
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config IRQ_SLOT_COUNT
 	int
 	default 15
diff --git a/src/mainboard/hp/dl165_g6_fam10/Kconfig b/src/mainboard/hp/dl165_g6_fam10/Kconfig
index 8376d895e1..ca36aafb36 100644
--- a/src/mainboard/hp/dl165_g6_fam10/Kconfig
+++ b/src/mainboard/hp/dl165_g6_fam10/Kconfig
@@ -6,6 +6,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_BROADCOM_BCM21000
 	select SOUTHBRIDGE_BROADCOM_BCM5785
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_SERVERENGINES_PILOT
 	select SUPERIO_NSC_PC87417
 	select DIMM_DDR2
@@ -55,10 +56,6 @@ config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x6
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config IRQ_SLOT_COUNT
 	int
 	default 15
diff --git a/src/mainboard/iei/kino-780am2-fam10/Kconfig b/src/mainboard/iei/kino-780am2-fam10/Kconfig
index deea8989d7..4b3bce6f9f 100644
--- a/src/mainboard/iei/kino-780am2-fam10/Kconfig
+++ b/src/mainboard/iei/kino-780am2-fam10/Kconfig
@@ -40,10 +40,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/iwill/dk8_htx/Kconfig b/src/mainboard/iwill/dk8_htx/Kconfig
index cdfd99a1bb..929f47f540 100644
--- a/src/mainboard/iwill/dk8_htx/Kconfig
+++ b/src/mainboard/iwill/dk8_htx/Kconfig
@@ -6,6 +6,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SOUTHBRIDGE_AMD_AMD8131
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_WINBOND_W83627HF
 	select PARALLEL_CPU_INIT
 	select HAVE_OPTION_TABLE
@@ -38,10 +39,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x6
diff --git a/src/mainboard/jetway/pa78vm5/Kconfig b/src/mainboard/jetway/pa78vm5/Kconfig
index b13bead632..30478d2294 100644
--- a/src/mainboard/jetway/pa78vm5/Kconfig
+++ b/src/mainboard/jetway/pa78vm5/Kconfig
@@ -40,10 +40,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/kontron/kt690/Kconfig b/src/mainboard/kontron/kt690/Kconfig
index 8d1f039a12..e679e66154 100644
--- a/src/mainboard/kontron/kt690/Kconfig
+++ b/src/mainboard/kontron/kt690/Kconfig
@@ -37,10 +37,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 1
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/msi/ms7135/Kconfig b/src/mainboard/msi/ms7135/Kconfig
index f2cfd9a7b2..50f989e675 100644
--- a/src/mainboard/msi/ms7135/Kconfig
+++ b/src/mainboard/msi/ms7135/Kconfig
@@ -5,6 +5,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select CPU_AMD_SOCKET_754
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_CK804
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_WINBOND_W83627THG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
@@ -43,10 +44,6 @@ config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config IRQ_SLOT_COUNT
 	int
 	default 13
diff --git a/src/mainboard/msi/ms7260/Kconfig b/src/mainboard/msi/ms7260/Kconfig
index 0e7e59238f..e3863a0908 100644
--- a/src/mainboard/msi/ms7260/Kconfig
+++ b/src/mainboard/msi/ms7260/Kconfig
@@ -6,6 +6,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select DIMM_DDR2
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_MCP55
+	select HT_CHAIN_DISTRIBUTE
 	select MCP55_USE_NIC
 	select MCP55_USE_AZA
 	select SUPERIO_WINBOND_W83627EHG
@@ -39,10 +40,6 @@ config MEM_TRAIN_SEQ
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-7260"
diff --git a/src/mainboard/msi/ms9185/Kconfig b/src/mainboard/msi/ms9185/Kconfig
index 0b0ff1cb0e..355fdcfa35 100644
--- a/src/mainboard/msi/ms9185/Kconfig
+++ b/src/mainboard/msi/ms9185/Kconfig
@@ -8,6 +8,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_BROADCOM_BCM5780
 	select SOUTHBRIDGE_BROADCOM_BCM5785
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_NSC_PC87417
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
@@ -34,10 +35,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0x8
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-9185"
diff --git a/src/mainboard/msi/ms9282/Kconfig b/src/mainboard/msi/ms9282/Kconfig
index f109375b71..dd9699216e 100644
--- a/src/mainboard/msi/ms9282/Kconfig
+++ b/src/mainboard/msi/ms9282/Kconfig
@@ -33,10 +33,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0x10
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "MS-9282"
diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index c1c095b9ce..c64fddafb0 100644
--- a/src/mainboard/msi/ms9652_fam10/Kconfig
+++ b/src/mainboard/msi/ms9652_fam10/Kconfig
@@ -76,10 +76,6 @@ config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x00
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config VAR_MTRR_HOLE
 	bool
 	default n
diff --git a/src/mainboard/nvidia/l1_2pvv/Kconfig b/src/mainboard/nvidia/l1_2pvv/Kconfig
index 57911f7b00..e9664ac737 100644
--- a/src/mainboard/nvidia/l1_2pvv/Kconfig
+++ b/src/mainboard/nvidia/l1_2pvv/Kconfig
@@ -7,6 +7,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_MCP55
+	select HT_CHAIN_DISTRIBUTE
 	select MCP55_USE_NIC
 	select MCP55_USE_AZA
 	select SUPERIO_WINBOND_W83627EHG
@@ -43,10 +44,6 @@ config MCP55_NUM
 	int
 	default 2
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "l1_2pvv"
diff --git a/src/mainboard/siemens/sitemp_g1p1/Kconfig b/src/mainboard/siemens/sitemp_g1p1/Kconfig
index dff329f751..d9ad74b212 100644
--- a/src/mainboard/siemens/sitemp_g1p1/Kconfig
+++ b/src/mainboard/siemens/sitemp_g1p1/Kconfig
@@ -43,10 +43,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 1
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/sunw/ultra40/Kconfig b/src/mainboard/sunw/ultra40/Kconfig
index 8f3ff2a825..a29cf16ea5 100644
--- a/src/mainboard/sunw/ultra40/Kconfig
+++ b/src/mainboard/sunw/ultra40/Kconfig
@@ -5,6 +5,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_CK804
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_SMSC_LPC47B397
 	select SUPERIO_SMSC_LPC47M10X
 	select HAVE_OPTION_TABLE
@@ -56,10 +57,6 @@ config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config IRQ_SLOT_COUNT
 	int
 	default 11
diff --git a/src/mainboard/supermicro/h8dme/Kconfig b/src/mainboard/supermicro/h8dme/Kconfig
index 52d5581fac..35f9bf0aaf 100644
--- a/src/mainboard/supermicro/h8dme/Kconfig
+++ b/src/mainboard/supermicro/h8dme/Kconfig
@@ -7,6 +7,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_MCP55
+	select HT_CHAIN_DISTRIBUTE
 	select MCP55_USE_NIC
 	select MCP55_USE_AZA
 	select SUPERIO_WINBOND_W83627HF
@@ -60,10 +61,6 @@ config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config IRQ_SLOT_COUNT
 	int
 	default 11
diff --git a/src/mainboard/supermicro/h8dmr/Kconfig b/src/mainboard/supermicro/h8dmr/Kconfig
index f85460be08..9efc5d2ee2 100644
--- a/src/mainboard/supermicro/h8dmr/Kconfig
+++ b/src/mainboard/supermicro/h8dmr/Kconfig
@@ -7,6 +7,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_MCP55
+	select HT_CHAIN_DISTRIBUTE
 	select MCP55_USE_NIC
 	select MCP55_USE_AZA
 	select SUPERIO_WINBOND_W83627HF
@@ -59,10 +60,6 @@ config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x0
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config IRQ_SLOT_COUNT
 	int
 	default 11
diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
index 0f94620026..0d20204285 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
@@ -7,6 +7,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_NVIDIA_MCP55
+	select HT_CHAIN_DISTRIBUTE
 	select MCP55_USE_NIC
 	select MCP55_USE_AZA
 	select SUPERIO_WINBOND_W83627HF
@@ -55,10 +56,6 @@ config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x1
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config IRQ_SLOT_COUNT
 	int
 	default 11
diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig b/src/mainboard/supermicro/h8qme_fam10/Kconfig
index 5b195bb26f..27a74bbf51 100644
--- a/src/mainboard/supermicro/h8qme_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig
@@ -8,6 +8,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_AMD_AMD8132
 	select SOUTHBRIDGE_NVIDIA_MCP55
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
@@ -53,10 +54,6 @@ config HT_CHAIN_UNITID_BASE
 	hex
 	default 0x1
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config IRQ_SLOT_COUNT
 	int
 	default 11
diff --git a/src/mainboard/supermicro/h8scm_fam10/Kconfig b/src/mainboard/supermicro/h8scm_fam10/Kconfig
index 3105493680..0673390092 100644
--- a/src/mainboard/supermicro/h8scm_fam10/Kconfig
+++ b/src/mainboard/supermicro/h8scm_fam10/Kconfig
@@ -40,10 +40,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 1
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/technexion/tim5690/Kconfig b/src/mainboard/technexion/tim5690/Kconfig
index 98dce39aa2..0220d7762b 100644
--- a/src/mainboard/technexion/tim5690/Kconfig
+++ b/src/mainboard/technexion/tim5690/Kconfig
@@ -37,10 +37,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 1
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/technexion/tim8690/Kconfig b/src/mainboard/technexion/tim8690/Kconfig
index 4e0b25a146..ad80e853c3 100644
--- a/src/mainboard/technexion/tim8690/Kconfig
+++ b/src/mainboard/technexion/tim8690/Kconfig
@@ -36,10 +36,6 @@ config MAX_PHYSICAL_CPUS
 	int
 	default 1
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 1
-
 config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x1
diff --git a/src/mainboard/tyan/s2881/Kconfig b/src/mainboard/tyan/s2881/Kconfig
index 6c759e1f0c..de641cd6fa 100644
--- a/src/mainboard/tyan/s2881/Kconfig
+++ b/src/mainboard/tyan/s2881/Kconfig
@@ -6,6 +6,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SOUTHBRIDGE_AMD_AMD8111
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
@@ -24,10 +25,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0x0
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2881"
diff --git a/src/mainboard/tyan/s2885/Kconfig b/src/mainboard/tyan/s2885/Kconfig
index 86e43f8b9a..b218ab7eb6 100644
--- a/src/mainboard/tyan/s2885/Kconfig
+++ b/src/mainboard/tyan/s2885/Kconfig
@@ -7,6 +7,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select SOUTHBRIDGE_AMD_AMD8111
 	select SOUTHBRIDGE_AMD_AMD8131
 	select SOUTHBRIDGE_AMD_AMD8151
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
@@ -23,10 +24,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0x10
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2885"
diff --git a/src/mainboard/tyan/s2891/Kconfig b/src/mainboard/tyan/s2891/Kconfig
index 3d1c1fb62f..238f5bc75e 100644
--- a/src/mainboard/tyan/s2891/Kconfig
+++ b/src/mainboard/tyan/s2891/Kconfig
@@ -6,6 +6,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_CK804
 	select SOUTHBRIDGE_AMD_AMD8131
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
@@ -23,10 +24,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0x10
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2891"
diff --git a/src/mainboard/tyan/s2892/Kconfig b/src/mainboard/tyan/s2892/Kconfig
index b9c4105e75..cbe076c5da 100644
--- a/src/mainboard/tyan/s2892/Kconfig
+++ b/src/mainboard/tyan/s2892/Kconfig
@@ -6,6 +6,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_CK804
 	select SOUTHBRIDGE_AMD_AMD8131
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_WINBOND_W83627HF
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
@@ -43,10 +44,6 @@ config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config IRQ_SLOT_COUNT
 	int
 	default 11
diff --git a/src/mainboard/tyan/s2895/Kconfig b/src/mainboard/tyan/s2895/Kconfig
index 544b0c59f5..21db63ccaf 100644
--- a/src/mainboard/tyan/s2895/Kconfig
+++ b/src/mainboard/tyan/s2895/Kconfig
@@ -6,6 +6,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_CK804
 	select SOUTHBRIDGE_AMD_AMD8131
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_SMSC_LPC47B397
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
@@ -47,10 +48,6 @@ config HT_CHAIN_END_UNITID_BASE
 	hex
 	default 0x20
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config IRQ_SLOT_COUNT
 	int
 	default 11
diff --git a/src/mainboard/tyan/s2912/Kconfig b/src/mainboard/tyan/s2912/Kconfig
index 26d9a530e1..7ad1a1ce31 100644
--- a/src/mainboard/tyan/s2912/Kconfig
+++ b/src/mainboard/tyan/s2912/Kconfig
@@ -7,6 +7,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_MCP55
+	select HT_CHAIN_DISTRIBUTE
 	select MCP55_USE_NIC
 	select SUPERIO_WINBOND_W83627HF
 	select PARALLEL_CPU_INIT
@@ -38,10 +39,6 @@ config MEM_TRAIN_SEQ
 	int
 	default 1
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2912"
diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig
index 1dd74ca9e5..b5e31fa779 100644
--- a/src/mainboard/tyan/s2912_fam10/Kconfig
+++ b/src/mainboard/tyan/s2912_fam10/Kconfig
@@ -7,6 +7,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select DIMM_REGISTERED
 	select NORTHBRIDGE_AMD_AMDFAM10
 	select SOUTHBRIDGE_NVIDIA_MCP55
+	select HT_CHAIN_DISTRIBUTE
 	select MCP55_USE_NIC
 	select SUPERIO_WINBOND_W83627HF
 	select PARALLEL_CPU_INIT
@@ -35,10 +36,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "S2912 (Fam10)"
diff --git a/src/mainboard/winent/mb6047/Kconfig b/src/mainboard/winent/mb6047/Kconfig
index 86b0ae0a27..622441e3ba 100644
--- a/src/mainboard/winent/mb6047/Kconfig
+++ b/src/mainboard/winent/mb6047/Kconfig
@@ -5,6 +5,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
 	select CPU_AMD_SOCKET_940
 	select NORTHBRIDGE_AMD_AMDK8
 	select SOUTHBRIDGE_NVIDIA_CK804
+	select HT_CHAIN_DISTRIBUTE
 	select SUPERIO_WINBOND_W83627THG
 	select HAVE_OPTION_TABLE
 	select HAVE_PIRQ_TABLE
@@ -25,10 +26,6 @@ config APIC_ID_OFFSET
 	hex
 	default 0x10
 
-config SB_HT_CHAIN_ON_BUS0
-	int
-	default 2
-
 config MAINBOARD_PART_NUMBER
 	string
 	default "MB6047"
diff --git a/src/northbridge/amd/amdfam10/Kconfig b/src/northbridge/amd/amdfam10/Kconfig
index b298ee115e..fa8a26a727 100644
--- a/src/northbridge/amd/amdfam10/Kconfig
+++ b/src/northbridge/amd/amdfam10/Kconfig
@@ -64,6 +64,12 @@ config SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	bool
 	default n
 
+config SB_HT_CHAIN_ON_BUS0
+	def_bool y
+
+config HT_CHAIN_DISTRIBUTE
+	def_bool n
+
 config DIMM_FBDIMM
 	bool
 	default n
diff --git a/src/northbridge/amd/amdfam10/northbridge.c b/src/northbridge/amd/amdfam10/northbridge.c
index c7888ff568..e4d32f9c56 100644
--- a/src/northbridge/amd/amdfam10/northbridge.c
+++ b/src/northbridge/amd/amdfam10/northbridge.c
@@ -216,11 +216,11 @@ static u32 amdfam10_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool
 		 * so we set the subordinate bus number to 0xff for the moment.
 		 */
 
-		if ((CONFIG_SB_HT_CHAIN_ON_BUS0 == 0) || !is_sblink)
+		if (!CONFIG_SB_HT_CHAIN_ON_BUS0 || !is_sblink)
 			max++;
 
 		/* One node can have 8 link and segn is the same. */
-		if ((CONFIG_SB_HT_CHAIN_ON_BUS0 > 1) && !is_sblink)
+		if (CONFIG_HT_CHAIN_DISTRIBUTE && !is_sblink)
 			max = ALIGN_UP(max, 8);
 
 		link->secondary = max;
diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig
index cc0cc66b12..b293ce3343 100644
--- a/src/northbridge/amd/amdk8/Kconfig
+++ b/src/northbridge/amd/amdk8/Kconfig
@@ -65,8 +65,10 @@ config SB_HT_CHAIN_UNITID_OFFSET_ONLY
 	default n
 
 config SB_HT_CHAIN_ON_BUS0
-	int
-	default 0
+	def_bool y
+
+config HT_CHAIN_DISTRIBUTE
+	def_bool n
 
 config QRANK_DIMM_SUPPORT
 	bool
diff --git a/src/northbridge/amd/amdk8/northbridge.c b/src/northbridge/amd/amdk8/northbridge.c
index bdfe355490..3ac626d5c5 100644
--- a/src/northbridge/amd/amdk8/northbridge.c
+++ b/src/northbridge/amd/amdk8/northbridge.c
@@ -179,11 +179,11 @@ static u32 amdk8_scan_chain(device_t dev, u32 nodeid, struct bus *link, bool is_
 		 * so we set the subordinate bus number to 0xff for the moment.
 		 */
 
-		if ((CONFIG_SB_HT_CHAIN_ON_BUS0 == 0) || !is_sblink)
+		if (!CONFIG_SB_HT_CHAIN_ON_BUS0 || !is_sblink)
 			max++;
 
 		/* Second chain will be on 0x40, third 0x80, forth 0xc0. */
-		if ((CONFIG_SB_HT_CHAIN_ON_BUS0 > 1) && !is_sblink)
+		if (CONFIG_HT_CHAIN_DISTRIBUTE && !is_sblink)
 			max = ALIGN_UP(max, 0x40);
 
 		link->secondary = max;