Index: src/northbridge/amd/amdht/h3finit.c
===================================================================
--- src/northbridge/amd/amdht/h3finit.c	(revision 4521)
+++ src/northbridge/amd/amdht/h3finit.c	(working copy)
@@ -1104,6 +1104,7 @@
 				AmdPCIRead(currentPtr, &temp);
 			} while (!IS_HT_SLAVE_CAPABILITY(temp));
 
+#if (CONFIG_HT_CHAIN_UNITID_BASE != 0)
 			AmdPCIReadBits(currentPtr, 25, 21, &unitIDcnt);
 			if ((unitIDcnt + currentBUID > 31) || ((secBus == 0) && (unitIDcnt + currentBUID > 24)))
 			{
@@ -1145,7 +1146,7 @@
 				STOP_HERE;
 				break;
 			}
-
+#endif
 			AmdPCIReadBits(currentPtr, 26, 26, &temp);
 			pDat->PortList[pDat->TotalLinks*2+1].Link = (u8)temp;
 			pDat->PortList[pDat->TotalLinks*2+1].Pointer = currentPtr;
@@ -1156,6 +1157,11 @@
 			depth++;
 			pDat->TotalLinks++;
 			currentBUID += unitIDcnt;
+#if CONFIG_HT_CHAIN_UNITID_BASE == 0
+			STOP_HERE;
+			break;
+#endif
+
 		}
 		if (pDat->HtBlock->AMD_CB_EventNotify)
 		{