- Modify all of the Opteron motherboards to have a separate logical

  chip for the amdk8/root_complex


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1750 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

16 files changed, 1079 insertions, 1060 deletions

diff --git a/src/mainboard/Iwill/DK8S2/Config.lb b/src/mainboard/Iwill/DK8S2/Config.lb
index c28b8d3ca7..661cadcdd2 100644
--- a/src/mainboard/Iwill/DK8S2/Config.lb
+++ b/src/mainboard/Iwill/DK8S2/Config.lb
@@ -130,75 +130,76 @@ dir /pc80
 config chip.h
 
 # config for arima/hdama
-chip northbridge/amd/amdk8
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on # LDT 0
-			chip southbridge/amd/amd8131
-				device pci 0.0 on end
-				device pci 0.1 on end
-				device pci 1.0 on end
-				device pci 1.1 on end
-			end
-			chip southbridge/amd/amd8111
-				# this "device pci 0.0" is the parent the next one
-				# PCI bridge
-				device pci 0.0 on
+		chip northbridge/amd/amdk8
+			device pci 18.0 on # LDT 0
+				chip southbridge/amd/amd8131
 					device pci 0.0 on end
 					device pci 0.1 on end
-					device pci 0.2 on end
-					device pci 1.0 off end
+					device pci 1.0 on end
+					device pci 1.1 on end
 				end
-				device pci 1.0 on
-					chip superio/winbond/w83627hf
-						device pnp  2e.0 on      # Floppy
-							 io 0x60 = 0x3f0
-							irq 0x70 = 6
-							drq 0x74 = 2
-						end
-						device pnp  2e.1 off     # Parallel Port
-							 io 0x60 = 0x378
-							irq 0x70 = 7
-						end
-						device pnp  2e.2 on      # Com1
-							 io 0x60 = 0x3f8
-							irq 0x70 = 4
-						end
-						device pnp  2e.3 off     # Com2
-							io 0x60 = 0x2f8
-							irq 0x70 = 3
-						end
-						device pnp  2e.5 on      # Keyboard
-							 io 0x60 = 0x60
-							 io 0x62 = 0x64
-						       irq 0x70 = 1
-							irq 0x72 = 12
-						end
-						device pnp  2e.6 off end # CIR
-						device pnp  2e.7 off end # GAME_MIDI_GIPO1
-						device pnp  2e.8 off end # GPIO2
-						device pnp  2e.9 off end # GPIO3
-						device pnp  2e.a off end # ACPI
-						device pnp  2e.b on      # HW Monitor
-							 io 0x60 = 0x290
+				chip southbridge/amd/amd8111
+					# this "device pci 0.0" is the parent the next one
+					# PCI bridge
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 on end
+						device pci 1.0 off end
+					end
+					device pci 1.0 on
+						chip superio/winbond/w83627hf
+							device pnp  2e.0 on      # Floppy
+								 io 0x60 = 0x3f0
+								irq 0x70 = 6
+								drq 0x74 = 2
+							end
+							device pnp  2e.1 off     # Parallel Port
+								 io 0x60 = 0x378
+								irq 0x70 = 7
+							end
+							device pnp  2e.2 on      # Com1
+								 io 0x60 = 0x3f8
+								irq 0x70 = 4
+							end
+							device pnp  2e.3 off     # Com2
+								io 0x60 = 0x2f8
+								irq 0x70 = 3
+							end
+							device pnp  2e.5 on      # Keyboard
+								 io 0x60 = 0x60
+								 io 0x62 = 0x64
+							       irq 0x70 = 1
+								irq 0x72 = 12
+							end
+							device pnp  2e.6 off end # CIR
+							device pnp  2e.7 off end # GAME_MIDI_GIPO1
+							device pnp  2e.8 off end # GPIO2
+							device pnp  2e.9 off end # GPIO3
+							device pnp  2e.a off end # ACPI
+							device pnp  2e.b on      # HW Monitor
+								 io 0x60 = 0x290
+							end
+							register "com1" = "{1}"
+						#	register "com1" = "{1, 0, 0x3f8, 4}"
+						#	register "lpt" = "{1}"
 						end
-						register "com1" = "{1}"
-					#	register "com1" = "{1, 0, 0x3f8, 4}"
-					#	register "lpt" = "{1}"
 					end
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on end 
+					device pci 1.5 off end
+					device pci 1.6 off end
 				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on end 
-				device pci 1.5 off end
-				device pci 1.6 off end
-			end
-		end # LDT0
-		device pci 18.0 on end # LDT1
-		device pci 18.0 on end # LDT2
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on end
-
+			end # LDT0
+			device pci 18.0 on end # LDT1
+			device pci 18.0 on end # LDT2
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
 		chip northbridge/amd/amdk8
 			device pci 19.0 on end
 			device pci 19.0 on end
diff --git a/src/mainboard/Iwill/DK8X/Config.lb b/src/mainboard/Iwill/DK8X/Config.lb
index 903f5c6c62..d8fc0cb5e0 100644
--- a/src/mainboard/Iwill/DK8X/Config.lb
+++ b/src/mainboard/Iwill/DK8X/Config.lb
@@ -126,54 +126,55 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
 dir /pc80
 config chip.h
 
-chip northbridge/amd/amdk8
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on #  northbridge 
-			#  devices on link 0, link 0 == LDT 0 
-			chip southbridge/amd/amd8131
-				# the on/off keyword is mandatory
-				device pci 0.0 on end
-				device pci 0.1 on end
-				device pci 1.0 on end
-				device pci 1.1 on end
-			end
-			chip southbridge/amd/amd8111
-				# this "device pci 0.0" is the parent the next one
-				# PCI bridge
-				device pci 0.0 on
+		chip northbridge/amd/amdk8
+			device pci 18.0 on #  northbridge 
+				#  devices on link 0, link 0 == LDT 0 
+				chip southbridge/amd/amd8131
+					# the on/off keyword is mandatory
 					device pci 0.0 on end
 					device pci 0.1 on end
-					device pci 0.2 on end
-					device pci 1.0 off end
+					device pci 1.0 on end
+					device pci 1.1 on end
 				end
-				device pci 1.0 on
-					chip superio/winbond/w83627thf
-						device pnp 2e.0 on end
-						device pnp 2e.1 on end
-						device pnp 2e.2 on end
-						device pnp 2e.3 on end
-						device pnp 2e.4 on end
-						device pnp 2e.5 on end
-						device pnp 2e.6 on end
-						device pnp 2e.7 on end 
-						device pnp 2e.8 on end 
-						device pnp 2e.9 on end 
-						device pnp 2e.a on end 
+				chip southbridge/amd/amd8111
+					# this "device pci 0.0" is the parent the next one
+					# PCI bridge
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 on end
+						device pci 1.0 off end
+					end
+					device pci 1.0 on
+						chip superio/winbond/w83627thf
+							device pnp 2e.0 on end
+							device pnp 2e.1 on end
+							device pnp 2e.2 on end
+							device pnp 2e.3 on end
+							device pnp 2e.4 on end
+							device pnp 2e.5 on end
+							device pnp 2e.6 on end
+							device pnp 2e.7 on end 
+							device pnp 2e.8 on end 
+							device pnp 2e.9 on end 
+							device pnp 2e.a on end 
+						end
 					end
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on end 
+					device pci 1.5 off end
+					device pci 1.6 off end
 				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on end 
-				device pci 1.5 off end
-				device pci 1.6 off end
-			end
-		end # LDT0
-		device pci 18.0 on end # LDT1
-		device pci 18.0 on end # LDT2
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on end
-
+			end # LDT0
+			device pci 18.0 on end # LDT1
+			device pci 18.0 on end # LDT2
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
 		chip northbridge/amd/amdk8
 			device pci 19.0 on end
 			device pci 19.0 on end
diff --git a/src/mainboard/amd/quartet/Config.lb b/src/mainboard/amd/quartet/Config.lb
index 9b003978b5..2d0ff10542 100644
--- a/src/mainboard/amd/quartet/Config.lb
+++ b/src/mainboard/amd/quartet/Config.lb
@@ -122,61 +122,62 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
 dir /pc80
 config chip.h
 
-chip northbridge/amd/amdk8 # mc0
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on end
-		device pci 18.0 on end
-		device pci 18.0 on 
-			chip southbridge/amd/amd8111
-				device pci 0.0 on
-					device pci 0.0 on end
-					device pci 0.1 on end
-					device pci 0.2 on end
-					device pci 1.0 on end
-				end
-				device pci 1.0 on 
-					chip superio/NSC/pc87360
-						device pnp 2e.0 off     # Floppy 
-							 io 0x60 = 0x3f0
-							irq 0x70 = 6
-							drq 0x74 = 2
-						end
-						device pnp 2e.1 off     # Parallel Port
-							 io 0x60 = 0x378
-							irq 0x70 = 7
-						end
-						device pnp 2e.2 off     # Com 2
-							 io 0x60 = 0x2f8
-							irq 0x70 = 3
-						end
-						device pnp 2e.3 on      # Com 1
-							 io 0x60 = 0x3f8
-							irq 0x70 = 4
-						end
-						device pnp 2e.4 off end # SWC
-						device pnp 2e.5 off end # Mouse
-						device pnp 2e.6 on      # Keyboard
-							 io 0x60 = 0x60
-							 io 0x62 = 0x64
-							irq 0x70 = 1
+		chip northbridge/amd/amdk8 # mc0
+			device pci 18.0 on end
+			device pci 18.0 on end
+			device pci 18.0 on 
+				chip southbridge/amd/amd8111
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 on end
+						device pci 1.0 on end
+					end
+					device pci 1.0 on 
+						chip superio/NSC/pc87360
+							device pnp 2e.0 off     # Floppy 
+								 io 0x60 = 0x3f0
+								irq 0x70 = 6
+								drq 0x74 = 2
+							end
+							device pnp 2e.1 off     # Parallel Port
+								 io 0x60 = 0x378
+								irq 0x70 = 7
+							end
+							device pnp 2e.2 off     # Com 2
+								 io 0x60 = 0x2f8
+								irq 0x70 = 3
+							end
+							device pnp 2e.3 on      # Com 1
+								 io 0x60 = 0x3f8
+								irq 0x70 = 4
+							end
+							device pnp 2e.4 off end # SWC
+							device pnp 2e.5 off end # Mouse
+							device pnp 2e.6 on      # Keyboard
+								 io 0x60 = 0x60
+								 io 0x62 = 0x64
+								irq 0x70 = 1
+							end
+							device pnp 2e.7 off end # GPIO
+							device pnp 2e.8 off end # ACB
+							device pnp 2e.9 off end # FSCM
+							device pnp 2e.a off end # WDT  
 						end
-						device pnp 2e.7 off end # GPIO
-						device pnp 2e.8 off end # ACB
-						device pnp 2e.9 off end # FSCM
-						device pnp 2e.a off end # WDT  
 					end
-				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on end
-				device pci 1.5 on end
-				device pci 1.6 on end
-			end # 8111
-		end # device pci 18.0
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on end
-	
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on end
+					device pci 1.5 on end
+					device pci 1.6 on end
+				end # 8111
+			end # device pci 18.0
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
 		chip northbridge/amd/amdk8 # mc1
 			device pci 19.0 on end
 			device pci 19.0 on 
diff --git a/src/mainboard/amd/serenade/Config.lb b/src/mainboard/amd/serenade/Config.lb
index 4fbf6310b0..c80297ddb2 100644
--- a/src/mainboard/amd/serenade/Config.lb
+++ b/src/mainboard/amd/serenade/Config.lb
@@ -122,74 +122,75 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
 dir /pc80
 config chip.h
 
-chip northbridge/amd/amdk8 # mc0
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on end # LDT 0 
-		device pci 18.0 on end # LDT1
-		device pci 18.0 on     # LDT2
-			chip southbridge/amd/amd8131
-				# the on/off keyword is mandatory
-				device pci 0.0 on end
-				device pci 0.1 on end
-				device pci 1.0 on end
-				device pci 1.1 on end
-			end
-			chip southbridge/amd/amd8111
-				# this "device pci 0.0" is the parent the next one
-				# PCI bridge
-				device pci 0.0 on
+		chip northbridge/amd/amdk8 # mc
+			device pci 18.0 on end # LDT 0 
+			device pci 18.0 on end # LDT1
+			device pci 18.0 on     # LDT2
+				chip southbridge/amd/amd8131
+					# the on/off keyword is mandatory
 					device pci 0.0 on end
 					device pci 0.1 on end
-					device pci 0.2 on end
-					device pci 1.0 off end
+					device pci 1.0 on end
+					device pci 1.1 on end
 				end
-				device pci 1.0 on
-					chip superio/winbond/w83627hf
-						device	pnp 2e.0 on  # Floppy 
-							 io 0x60 = 0x3f0
-							irq 0x70 = 6
-							drq 0x74 = 2
-						end
-						device pnp 2e.1 off  # Parallel Port
-							 io 0x60 = 0x378
-							irq 0x70 = 7
-						end
-						device pnp 2e.2 on # Com 1
-							 io 0x60 = 0x3f8
-							irq 0x70 = 4
-						end
-						device pnp 2e.3 off # Com 2
-							 io 0x60 = 0x2f8
-							irq 0x70 = 3
-						end
-						device pnp 2e.5 on  # Keyboard
-							 io 0x60 = 0x60
-							 io 0x62 = 0x64
-							irq 0x70 = 1
-							irq 0x72 = 12
+				chip southbridge/amd/amd8111
+					# this "device pci 0.0" is the parent the next one
+					# PCI bridge
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 on end
+						device pci 1.0 off end
+					end
+					device pci 1.0 on
+						chip superio/winbond/w83627hf
+							device	pnp 2e.0 on  # Floppy 
+								 io 0x60 = 0x3f0
+								irq 0x70 = 6
+								drq 0x74 = 2
+							end
+							device pnp 2e.1 off  # Parallel Port
+								 io 0x60 = 0x378
+								irq 0x70 = 7
+							end
+							device pnp 2e.2 on # Com 1
+								 io 0x60 = 0x3f8
+								irq 0x70 = 4
+							end
+							device pnp 2e.3 off # Com 2
+								 io 0x60 = 0x2f8
+								irq 0x70 = 3
+							end
+							device pnp 2e.5 on  # Keyboard
+								 io 0x60 = 0x60
+								 io 0x62 = 0x64
+								irq 0x70 = 1
+								irq 0x72 = 12
+							end
+							device pnp 2e.6 off end # CIR
+							device pnp 2e.7 off end # GAM_MIDI_GIPO1
+							device pnp 2e.8 off end # GPIO2
+							device pnp 2e.9 off end # GPIO3
+							device pnp 2e.a off end # ACPI
+							device pnp 2e.b on      # HW Monitor
+								 io 0x60 = 0x290
+							end 
 						end
-						device pnp 2e.6 off end # CIR
-						device pnp 2e.7 off end # GAM_MIDI_GIPO1
-						device pnp 2e.8 off end # GPIO2
-						device pnp 2e.9 off end # GPIO3
-						device pnp 2e.a off end # ACPI
-						device pnp 2e.b on      # HW Monitor
-							 io 0x60 = 0x290
-						end 
 					end
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on end
+					device pci 1.5 off end
+					device pci 1.6 off end
 				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on end
-				device pci 1.5 off end
-				device pci 1.6 off end
-			end
-		end # device pci 18.0 
-		
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on end
-
+			end # device pci 18.0 
+			
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
 		chip northbridge/amd/amdk8
 			device pci 19.0 on end
 			device pci 19.0 on end
diff --git a/src/mainboard/amd/solo/Config.lb b/src/mainboard/amd/solo/Config.lb
index 7f845725e3..b0ddba75de 100644
--- a/src/mainboard/amd/solo/Config.lb
+++ b/src/mainboard/amd/solo/Config.lb
@@ -124,88 +124,90 @@ dir /pc80
 config chip.h
 
 # sample config for arima/hdama
-chip northbridge/amd/amdk8
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on #  northbridge 
-			#  devices on link 0, link 0 == LDT 0 
-			chip southbridge/amd/amd8151
-				# the on/off keyword is mandatory
-				device pci 0.0 on end
-				device pci 1.0 on end
-			end
-			chip southbridge/amd/amd8111
-				# this "device pci 0.0" is the parent the next one
-				# PCI bridge
-				device pci 0.0 on
+		chip northbridge/amd/amdk8
+			device pci 18.0 on #  northbridge 
+				#  devices on link 0, link 0 == LDT 0 
+				chip southbridge/amd/amd8151
+					# the on/off keyword is mandatory
 					device pci 0.0 on end
-					device pci 0.1 on end
-					device pci 0.2 on end
-					device pci 1.0 off end
+					device pci 1.0 on end
 				end
-				device pci 1.0 on
-					chip superio/NSC/pc87360
-						device	pnp 2e.0 off  # Floppy 
-							 io 0x60 = 0x3f0
-							irq 0x70 = 6
-							drq 0x74 = 2
-						end
-						device pnp 2e.1 off  # Parallel Port
-							 io 0x60 = 0x378
-							irq 0x70 = 7
-						end
-						device pnp 2e.2 off # Com 2
-							 io 0x60 = 0x2f8
-							irq 0x70 = 3
-						end
-						device pnp 2e.3 on  # Com 1
-							 io 0x60 = 0x3f8
-							irq 0x70 = 4
-						end
-						device pnp 2e.4 off end # SWC
-						device pnp 2e.5 off end # Mouse
-						device pnp 2e.6 on  # Keyboard
-							 io 0x60 = 0x60
-							 io 0x62 = 0x64
-							irq 0x70 = 1
-						end
-						device pnp 2e.7 off end # GPIO
-						device pnp 2e.8 off end # ACB
-						device pnp 2e.9 off end # FSCM
-						device pnp 2e.a off end # WDT  
+				chip southbridge/amd/amd8111
+					# this "device pci 0.0" is the parent the next one
+					# PCI bridge
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 on end
+						device pci 1.0 off end
 					end
-				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on 
-					chip drivers/generic/generic
-						#phillips pca9545 smbus mux
-						device i2c 70 on 
-							# analog_devices adm1026	
-							chip drivers/generic/generic
-								device i2c 2c on end
+					device pci 1.0 on
+						chip superio/NSC/pc87360
+							device	pnp 2e.0 off  # Floppy 
+								 io 0x60 = 0x3f0
+								irq 0x70 = 6
+								drq 0x74 = 2
+							end
+							device pnp 2e.1 off  # Parallel Port
+								 io 0x60 = 0x378
+								irq 0x70 = 7
 							end
+							device pnp 2e.2 off # Com 2
+								 io 0x60 = 0x2f8
+								irq 0x70 = 3
+							end
+							device pnp 2e.3 on  # Com 1
+								 io 0x60 = 0x3f8
+								irq 0x70 = 4
+							end
+							device pnp 2e.4 off end # SWC
+							device pnp 2e.5 off end # Mouse
+							device pnp 2e.6 on  # Keyboard
+								 io 0x60 = 0x60
+								 io 0x62 = 0x64
+								irq 0x70 = 1
+							end
+							device pnp 2e.7 off end # GPIO
+							device pnp 2e.8 off end # ACB
+							device pnp 2e.9 off end # FSCM
+							device pnp 2e.a off end # WDT  
 						end
-						device i2c 70 on end
-						device i2c 70 on end
-						device i2c 70 on end
 					end
-					chip drivers/generic/generic #dimm 0-0-0
-						device i2c 50 on end
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on 
+						chip drivers/generic/generic
+							#phillips pca9545 smbus mux
+							device i2c 70 on 
+								# analog_devices adm1026	
+								chip drivers/generic/generic
+									device i2c 2c on end
+								end
+							end
+							device i2c 70 on end
+							device i2c 70 on end
+							device i2c 70 on end
+						end
+						chip drivers/generic/generic #dimm 0-0-0
+							device i2c 50 on end
+						end
+						chip drivers/generic/generic #dimm 0-0-1
+							device i2c 51 on end
+						end 
 					end
-					chip drivers/generic/generic #dimm 0-0-1
-						device i2c 51 on end
-					end 
+					device pci 1.5 off end
+					device pci 1.6 on end
 				end
-				device pci 1.5 off end
-				device pci 1.6 on end
-			end
-		end #  device pci 18.0 
-		
-		device pci 18.0 on end # LDT1
-		device pci 18.0 on end # LDT2
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on end
+			end #  device pci 18.0 
+			
+			device pci 18.0 on end # LDT1
+			device pci 18.0 on end # LDT2
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
 	end 
 	device apic_cluster 0 on
 		chip cpu/amd/socket_754
diff --git a/src/mainboard/arima/hdama/Config.lb b/src/mainboard/arima/hdama/Config.lb
index f812868f4a..5d065fa4cf 100644
--- a/src/mainboard/arima/hdama/Config.lb
+++ b/src/mainboard/arima/hdama/Config.lb
@@ -128,111 +128,112 @@ dir /pc80
 config chip.h
 
 # config for arima/hdama
-chip northbridge/amd/amdk8
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on #  northbridge 
-			#  devices on link 0, link 0 == LDT 0 
-			chip southbridge/amd/amd8131
-				# the on/off keyword is mandatory
-				device pci 0.0 on end
-				device pci 0.1 on end
-				device pci 1.0 on end
-				device pci 1.1 on end
-			end
-			chip southbridge/amd/amd8111
-				# this "device pci 0.0" is the parent the next one
-				# PCI bridge
-				device pci 0.0 on
+		chip northbridge/amd/amdk8
+			device pci 18.0 on #  northbridge 
+				#  devices on link 0, link 0 == LDT 0 
+				chip southbridge/amd/amd8131
+					# the on/off keyword is mandatory
 					device pci 0.0 on end
 					device pci 0.1 on end
-					device pci 0.2 off end
-					device pci 1.0 off end
+					device pci 1.0 on end
+					device pci 1.1 on end
 				end
-				device pci 1.0 on
-					chip superio/NSC/pc87360
-						device	pnp 2e.0 off  # Floppy 
-							 io 0x60 = 0x3f0
-							irq 0x70 = 6
-							drq 0x74 = 2
-						end
-						device pnp 2e.1 off  # Parallel Port
-							 io 0x60 = 0x378
-							irq 0x70 = 7
-						end
-						device pnp 2e.2 off # Com 2
-							 io 0x60 = 0x2f8
-							irq 0x70 = 3
-						end
-						device pnp 2e.3 on  # Com 1
-							 io 0x60 = 0x3f8
-							irq 0x70 = 4
-						end
-						device pnp 2e.4 off end # SWC
-						device pnp 2e.5 off end # Mouse
-						device pnp 2e.6 on  # Keyboard
-							 io 0x60 = 0x60
-							 io 0x62 = 0x64
-							irq 0x70 = 1
-						end
-						device pnp 2e.7 off end # GPIO
-						device pnp 2e.8 off end # ACB
-						device pnp 2e.9 off end # FSCM
-						device pnp 2e.a off end # WDT  
+				chip southbridge/amd/amd8111
+					# this "device pci 0.0" is the parent the next one
+					# PCI bridge
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 off end
+						device pci 1.0 off end
 					end
-				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on 
-					chip drivers/generic/generic
-						#phillips pca9545 smbus mux
-						device i2c 70 on 
-							# analog_devices adm1026	
-							chip drivers/generic/generic
-								device i2c 2c on end
+					device pci 1.0 on
+						chip superio/NSC/pc87360
+							device	pnp 2e.0 off  # Floppy 
+								 io 0x60 = 0x3f0
+								irq 0x70 = 6
+								drq 0x74 = 2
+							end
+							device pnp 2e.1 off  # Parallel Port
+								 io 0x60 = 0x378
+								irq 0x70 = 7
+							end
+							device pnp 2e.2 off # Com 2
+								 io 0x60 = 0x2f8
+								irq 0x70 = 3
 							end
+							device pnp 2e.3 on  # Com 1
+								 io 0x60 = 0x3f8
+								irq 0x70 = 4
+							end
+							device pnp 2e.4 off end # SWC
+							device pnp 2e.5 off end # Mouse
+							device pnp 2e.6 on  # Keyboard
+								 io 0x60 = 0x60
+								 io 0x62 = 0x64
+								irq 0x70 = 1
+							end
+							device pnp 2e.7 off end # GPIO
+							device pnp 2e.8 off end # ACB
+							device pnp 2e.9 off end # FSCM
+							device pnp 2e.a off end # WDT  
 						end
-						device i2c 70 on end
-						device i2c 70 on end
-						device i2c 70 on end
-					end
-					chip drivers/generic/generic #dimm 0-0-0
-						device i2c 50 on end
 					end
-					chip drivers/generic/generic #dimm 0-0-1
-						device i2c 51 on end
-					end 
-					chip drivers/generic/generic #dimm 0-1-0
-						device i2c 52 on end
-					end 
-					chip drivers/generic/generic #dimm 0-1-1
-						device i2c 53 on end
-					end 
-					chip drivers/generic/generic #dimm 1-0-0
-						device i2c 54 on end 
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on 
+						chip drivers/generic/generic
+							#phillips pca9545 smbus mux
+							device i2c 70 on 
+								# analog_devices adm1026	
+								chip drivers/generic/generic
+									device i2c 2c on end
+								end
+							end
+							device i2c 70 on end
+							device i2c 70 on end
+							device i2c 70 on end
+						end
+						chip drivers/generic/generic #dimm 0-0-0
+							device i2c 50 on end
+						end
+						chip drivers/generic/generic #dimm 0-0-1
+							device i2c 51 on end
+						end 
+						chip drivers/generic/generic #dimm 0-1-0
+							device i2c 52 on end
+						end 
+						chip drivers/generic/generic #dimm 0-1-1
+							device i2c 53 on end
+						end 
+						chip drivers/generic/generic #dimm 1-0-0
+							device i2c 54 on end 
+						end
+						chip drivers/generic/generic #dimm 1-0-1
+							device i2c 55 on end
+						end 
+						chip drivers/generic/generic #dimm 1-1-0
+							device i2c 56 on end
+						end 
+						chip drivers/generic/generic #dimm 1-1-1
+							device i2c 57 on end
+						end 
 					end
-					chip drivers/generic/generic #dimm 1-0-1
-						device i2c 55 on end
-					end 
-					chip drivers/generic/generic #dimm 1-1-0
-						device i2c 56 on end
-					end 
-					chip drivers/generic/generic #dimm 1-1-1
-						device i2c 57 on end
-					end 
+					device pci 1.5 off end
+					device pci 1.6 on end
+					register "ide0_enable" = "1"
+					register "ide1_enable" = "1"
 				end
-				device pci 1.5 off end
-				device pci 1.6 on end
-				register "ide0_enable" = "1"
-				register "ide1_enable" = "1"
-			end
-		end #  device pci 18.0 
-		
-		device pci 18.0 on end # LDT1
-		device pci 18.0 on end # LDT2
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on end
-
+			end #  device pci 18.0 
+			
+			device pci 18.0 on end # LDT1
+			device pci 18.0 on end # LDT2
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
 		chip northbridge/amd/amdk8
 			device pci 19.0 on end
 			device pci 19.0 on end
diff --git a/src/mainboard/ibm/e325/Config.lb b/src/mainboard/ibm/e325/Config.lb
index c1514000fd..604a82d46d 100644
--- a/src/mainboard/ibm/e325/Config.lb
+++ b/src/mainboard/ibm/e325/Config.lb
@@ -127,67 +127,68 @@ dir /pc80
 config chip.h
 
 
-chip northbridge/amd/amdk8
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on end # LDT 0
-		device pci 18.0 on     # LDT 1
-			chip southbridge/amd/amd8131
-				device pci 0.0 on end
-				device pci 0.1 on end
-				device pci 1.0 on end
-				device pci 1.1 on end
-			end
-			chip southbridge/amd/amd8111
-				device pci 0.0 on
+		chip northbridge/amd/amdk8
+			device pci 18.0 on end # LDT 0
+			device pci 18.0 on     # LDT 1
+				chip southbridge/amd/amd8131
 					device pci 0.0 on end
 					device pci 0.1 on end
-					device pci 0.2 on end
-					device pci 1.0 off end
+					device pci 1.0 on end
+					device pci 1.1 on end
 				end
-				device pci 1.0 on
-					chip superio/NSC/pc87366
-						device	pnp 2e.0 off  # Floppy 
-							 io 0x60 = 0x3f0
-							irq 0x70 = 6
-							drq 0x74 = 2
-						end
-						device pnp 2e.1 off  # Parallel Port
-							 io 0x60 = 0x378
-							irq 0x70 = 7
-						end
-						device pnp 2e.2 off # Com 2
-							 io 0x60 = 0x2f8
-							irq 0x70 = 3
-						end
-						device pnp 2e.3 on  # Com 1
-							 io 0x60 = 0x3f8
-							irq 0x70 = 4
-						end
-						device pnp 2e.4 off end # SWC
-						device pnp 2e.5 off end # Mouse
-						device pnp 2e.6 on  # Keyboard
-							 io 0x60 = 0x60
-							 io 0x62 = 0x64
-							irq 0x70 = 1
+				chip southbridge/amd/amd8111
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 on end
+						device pci 1.0 off end
+					end
+					device pci 1.0 on
+						chip superio/NSC/pc87366
+							device	pnp 2e.0 off  # Floppy 
+								 io 0x60 = 0x3f0
+								irq 0x70 = 6
+								drq 0x74 = 2
+							end
+							device pnp 2e.1 off  # Parallel Port
+								 io 0x60 = 0x378
+								irq 0x70 = 7
+							end
+							device pnp 2e.2 off # Com 2
+								 io 0x60 = 0x2f8
+								irq 0x70 = 3
+							end
+							device pnp 2e.3 on  # Com 1
+								 io 0x60 = 0x3f8
+								irq 0x70 = 4
+							end
+							device pnp 2e.4 off end # SWC
+							device pnp 2e.5 off end # Mouse
+							device pnp 2e.6 on  # Keyboard
+								 io 0x60 = 0x60
+								 io 0x62 = 0x64
+								irq 0x70 = 1
+							end
+							device pnp 2e.7 off end # GPIO
+							device pnp 2e.8 off end # ACB
+							device pnp 2e.9 off end # FSCM
+							device pnp 2e.a off end # WDT  
 						end
-						device pnp 2e.7 off end # GPIO
-						device pnp 2e.8 off end # ACB
-						device pnp 2e.9 off end # FSCM
-						device pnp 2e.a off end # WDT  
 					end
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on end
+					device pci 1.5 off end
+					device pci 1.6 off end
 				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on end
-				device pci 1.5 off end
-				device pci 1.6 off end
-			end
-		end #  device pci 18.0 
-		device pci 18.0 on end # LDT2
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on end
-
+			end #  device pci 18.0 
+			device pci 18.0 on end # LDT2
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
 		chip northbridge/amd/amdk8
 			device pci 19.0 on end
 			device pci 19.0 on end
diff --git a/src/mainboard/newisys/khepri/Config.lb b/src/mainboard/newisys/khepri/Config.lb
index 77e1ec8d05..947180d53e 100644
--- a/src/mainboard/newisys/khepri/Config.lb
+++ b/src/mainboard/newisys/khepri/Config.lb
@@ -128,68 +128,69 @@ mainboardinit cpu/x86/mmx/disable_mmx.inc
 dir /pc80
 config chip.h
 
-chip northbridge/amd/amdk8
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on end # LDT 0 
-		device pci 18.0 on     # LDT 1
-			chip southbridge/amd/amd8131
-				device pci 0.0 on end
-				device pci 0.1 on end
-				device pci 1.0 on end
-				device pci 1.1 on end
-			end
-			chip southbridge/amd/amd8111
-				device pci 0.0 on
+		chip northbridge/amd/amdk8
+			device pci 18.0 on end # LDT 0 
+			device pci 18.0 on     # LDT 1
+				chip southbridge/amd/amd8131
 					device pci 0.0 on end
 					device pci 0.1 on end
-					device pci 0.2 on end
 					device pci 1.0 on end
+					device pci 1.1 on end
 				end
-				device pci 1.0 on
-					chip superio/NSC/pc87360
-						device pnp 2e.0 off    # Floppy 
-							 io 0x60 = 0x3f0
-							irq 0x70 = 6
-							drq 0x74 = 2
-						end
-						device pnp 2e.1 off     # Parallel Port
-							 io 0x60 = 0x378
-							irq 0x70 = 7
-						end
-						device pnp 2e.2 off     # Com 2
-							 io 0x60 = 0x2f8
-							irq 0x70 = 3
-						end
-						device pnp 2e.3 on      # Com 1
-							 io 0x60 = 0x3f8
-							irq 0x70 = 4
-						end
-						device pnp 2e.4 off end # SWC
-						device pnp 2e.5 off end # Mouse
-						device pnp 2e.6 on      # Keyboard
-							 io 0x60 = 0x60
-							 io 0x62 = 0x64
-							irq 0x70 = 1
+				chip southbridge/amd/amd8111
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 on end
+						device pci 1.0 on end
+					end
+					device pci 1.0 on
+						chip superio/NSC/pc87360
+							device pnp 2e.0 off    # Floppy 
+								 io 0x60 = 0x3f0
+								irq 0x70 = 6
+								drq 0x74 = 2
+							end
+							device pnp 2e.1 off     # Parallel Port
+								 io 0x60 = 0x378
+								irq 0x70 = 7
+							end
+							device pnp 2e.2 off     # Com 2
+								 io 0x60 = 0x2f8
+								irq 0x70 = 3
+							end
+							device pnp 2e.3 on      # Com 1
+								 io 0x60 = 0x3f8
+								irq 0x70 = 4
+							end
+							device pnp 2e.4 off end # SWC
+							device pnp 2e.5 off end # Mouse
+							device pnp 2e.6 on      # Keyboard
+								 io 0x60 = 0x60
+								 io 0x62 = 0x64
+								irq 0x70 = 1
+							end
+							device pnp 2e.7 off end # GPIO
+							device pnp 2e.8 off end # ACB
+							device pnp 2e.9 off end # FSCM
+							device pnp 2e.a off end # WDT  
+			
 						end
-						device pnp 2e.7 off end # GPIO
-						device pnp 2e.8 off end # ACB
-						device pnp 2e.9 off end # FSCM
-						device pnp 2e.a off end # WDT  
-
 					end
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on end 
+					device pci 1.5 on end
+					device pci 1.6 on end
 				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on end 
-				device pci 1.5 on end
-				device pci 1.6 on end
-			end
-		end # LDT1
-		device pci 18.0 on end # LDT2
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on end
-
+			end # LDT1
+			device pci 18.0 on end # LDT2
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
 		chip northbridge/amd/amdk8
 			device pci 19.0 on end
 			device pci 19.0 on end
diff --git a/src/mainboard/tyan/s2850/Config.lb b/src/mainboard/tyan/s2850/Config.lb
index 061dd26ad6..761a55477c 100644
--- a/src/mainboard/tyan/s2850/Config.lb
+++ b/src/mainboard/tyan/s2850/Config.lb
@@ -124,76 +124,76 @@ dir /pc80
 config chip.h
 
 # sample config for tyan/s2850
-chip northbridge/amd/amdk8
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on # LDT0
-			#  devices on link 2, link 2 == LDT 2
-			chip southbridge/amd/amd8111
-				# this "device pci 0.0" is the parent the next one
-				# PCI bridge
-				device pci 0.0 on
-					device pci 0.0 on end
-					device pci 0.1 on end
-					device pci 0.2 off end
-					device pci 1.0 off end
-				end
-				device pci 1.0 on
-					chip superio/winbond/w83627hf
-						device pnp 2e.0 on #  Floppy
-                                 			io 0x60 = 0x3f0
-                                			irq 0x70 = 6
-                                			drq 0x74 = 2
-						end
-                        			device pnp 2e.1 off #  Parallel Port
-                                 			io 0x60 = 0x378
-                                			irq 0x70 = 7
-						end
-                        			device pnp 2e.2 on #  Com1
-                                 			io 0x60 = 0x3f8
-                                			irq 0x70 = 4
-						end
-                        			device pnp 2e.3 off #  Com2
-                                 			io 0x60 = 0x2f8
-                                			irq 0x70 = 3
-						end
-                        			device pnp 2e.5 on #  Keyboard
-                                 			io 0x60 = 0x60
-                                 			io 0x62 = 0x64
-                                			irq 0x70 = 1
-							irq 0x72 = 12
+		chip northbridge/amd/amdk8
+			device pci 18.0 on # LDT0
+				#  devices on link 2, link 2 == LDT 2
+				chip southbridge/amd/amd8111
+					# this "device pci 0.0" is the parent the next one
+					# PCI bridge
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 off end
+						device pci 1.0 off end
+					end
+					device pci 1.0 on
+						chip superio/winbond/w83627hf
+							device pnp 2e.0 on #  Floppy
+                	                 			io 0x60 = 0x3f0
+                	                			irq 0x70 = 6
+                	                			drq 0x74 = 2
+							end
+                	        			device pnp 2e.1 off #  Parallel Port
+                	                 			io 0x60 = 0x378
+                	                			irq 0x70 = 7
+							end
+                	        			device pnp 2e.2 on #  Com1
+                	                 			io 0x60 = 0x3f8
+                	                			irq 0x70 = 4
+							end
+                	        			device pnp 2e.3 off #  Com2
+                	                 			io 0x60 = 0x2f8
+                	                			irq 0x70 = 3
+							end
+                	        			device pnp 2e.5 on #  Keyboard
+                	                 			io 0x60 = 0x60
+                	                 			io 0x62 = 0x64
+                	                			irq 0x70 = 1
+								irq 0x72 = 12
+							end
+                	                               device pnp 2e.6 off #  CIR
+                	                                        io 0x60 = 0x100
+                	                                end
+                	                                device pnp 2e.7 off #  GAME_MIDI_GIPO1
+                	                                        io 0x60 = 0x201
+                	                                        io 0x62 = 0x330
+                	                                        irq 0x70 = 9
+                	                                end  
+                	                                device pnp 2e.8 off end #  GPIO2
+                	                                device pnp 2e.9 off end #  GPIO3
+                	                                device pnp 2e.a off end #  ACPI
+                	                                device pnp 2e.b on #  HW Monitor
+                	                                        io 0x60 = 0x290
+                	                                        irq 0x70 = 5
+                	                                end
 						end
-                                               device pnp 2e.6 off #  CIR
-                                                        io 0x60 = 0x100
-                                                end
-                                                device pnp 2e.7 off #  GAME_MIDI_GIPO1
-                                                        io 0x60 = 0x201
-                                                        io 0x62 = 0x330
-                                                        irq 0x70 = 9
-                                                end  
-                                                device pnp 2e.8 off end #  GPIO2
-                                                device pnp 2e.9 off end #  GPIO3
-                                                device pnp 2e.a off end #  ACPI
-                                                device pnp 2e.b on #  HW Monitor
-                                                        io 0x60 = 0x290
-                                                        irq 0x70 = 5
-                                                end
 					end
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on end
+					device pci 1.5 on end
+					device pci 1.6 off end
 				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on end
-				device pci 1.5 on end
-				device pci 1.6 off end
-			end
-		end #  device pci 18.0 
-
-                device pci 18.0 on end
-                device pci 18.0 on end
-		
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on end
-
+			end #  device pci 18.0 
+                	device pci 18.0 on end
+                	device pci 18.0 on end
+			
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
 	end 
 	device apic_cluster 0 on
 		chip cpu/amd/socket_940
diff --git a/src/mainboard/tyan/s2875/Config.lb b/src/mainboard/tyan/s2875/Config.lb
index 97a06492bc..ffc90a4d6c 100644
--- a/src/mainboard/tyan/s2875/Config.lb
+++ b/src/mainboard/tyan/s2875/Config.lb
@@ -125,81 +125,82 @@ dir /pc80
 config chip.h
 
 # sample config for tyan/s2875
-chip northbridge/amd/amdk8
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on #  northbridge 
-			#  devices on link 0, link 0 == LDT 0
-                        chip southbridge/amd/amd8151
-                                # the on/off keyword is mandatory
-                                device pci 0.0 on end
-                                device pci 1.0 on end
-                        end
-			chip southbridge/amd/amd8111
-				# this "device pci 0.0" is the parent the next one
-				# PCI bridge
-				device pci 0.0 on
+		chip northbridge/amd/amdk8
+			device pci 18.0 on #  northbridge 
+				#  devices on link 0, link 0 == LDT 0
+				chip southbridge/amd/amd8151
+					# the on/off keyword is mandatory
 					device pci 0.0 on end
-					device pci 0.1 on end
-					device pci 0.2 off end
-					device pci 1.0 off end
+					device pci 1.0 on end
 				end
-				device pci 1.0 on
-					chip superio/winbond/w83627hf
-						device pnp 2e.0 on #  Floppy
-                                 			io 0x60 = 0x3f0
-                                			irq 0x70 = 6
-                                			drq 0x74 = 2
-						end
-                        			device pnp 2e.1 off #  Parallel Port
-                                 			io 0x60 = 0x378
-                                			irq 0x70 = 7
-						end
-                        			device pnp 2e.2 on #  Com1
-                                 			io 0x60 = 0x3f8
-                                			irq 0x70 = 4
-						end
-                        			device pnp 2e.3 off #  Com2
-                                 			io 0x60 = 0x2f8
-                                			irq 0x70 = 3
-						end
-                        			device pnp 2e.5 on #  Keyboard
-                                 			io 0x60 = 0x60
-                                 			io 0x62 = 0x64
-                                			irq 0x70 = 1
-							irq 0x72 = 12
+				chip southbridge/amd/amd8111
+					# this "device pci 0.0" is the parent the next one
+					# PCI bridge
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 off end
+						device pci 1.0 off end
+					end
+					device pci 1.0 on
+						chip superio/winbond/w83627hf
+							device pnp 2e.0 on #  Floppy
+								io 0x60 = 0x3f0
+								irq 0x70 = 6
+								drq 0x74 = 2
+							end
+							device pnp 2e.1 off #  Parallel Port
+								io 0x60 = 0x378
+								irq 0x70 = 7
+							end
+							device pnp 2e.2 on #  Com1
+								io 0x60 = 0x3f8
+								irq 0x70 = 4
+							end
+							device pnp 2e.3 off #  Com2
+								io 0x60 = 0x2f8
+								irq 0x70 = 3
+							end
+							device pnp 2e.5 on #  Keyboard
+								io 0x60 = 0x60
+								io 0x62 = 0x64
+								irq 0x70 = 1
+								irq 0x72 = 12
+							end
+							device pnp 2e.6 off #  CIR
+								io 0x60 = 0x100
+							end
+							device pnp 2e.7 off #  GAME_MIDI_GIPO1
+								io 0x60 = 0x201
+								io 0x62 = 0x330
+								irq 0x70 = 9
+							end  
+							device pnp 2e.8 off end #  GPIO2
+							device pnp 2e.9 off end #  GPIO3
+							device pnp 2e.a off end #  ACPI
+							device pnp 2e.b on #  HW Monitor
+								io 0x60 = 0x290
+								irq 0x70 = 5
+							end
 						end
-                                                device pnp 2e.6 off #  CIR
-                                                        io 0x60 = 0x100
-                                                end
-                                                device pnp 2e.7 off #  GAME_MIDI_GIPO1
-                                                        io 0x60 = 0x201
-                                                        io 0x62 = 0x330
-                                                        irq 0x70 = 9
-                                                end  
-                                                device pnp 2e.8 off end #  GPIO2
-                                                device pnp 2e.9 off end #  GPIO3
-                                                device pnp 2e.a off end #  ACPI
-                                                device pnp 2e.b on #  HW Monitor
-                                                        io 0x60 = 0x290
-                                                        irq 0x70 = 5
-                                                end
 					end
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on end
+					device pci 1.5 on end
+					device pci 1.6 off end
 				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on end
-				device pci 1.5 on end
-				device pci 1.6 off end
-			end
-		end #  device pci 18.0 
-		
-                device pci 18.0 on end
-                device pci 18.0 on end
-		
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on end
-
+			end #  device pci 18.0 
+			
+			device pci 18.0 on end
+			device pci 18.0 on end
+			
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
 		chip northbridge/amd/amdk8
 			device pci 19.0 on end
 			device pci 19.0 on end
diff --git a/src/mainboard/tyan/s2880/Config.lb b/src/mainboard/tyan/s2880/Config.lb
index e6c4de9953..315e3b5e16 100644
--- a/src/mainboard/tyan/s2880/Config.lb
+++ b/src/mainboard/tyan/s2880/Config.lb
@@ -125,83 +125,84 @@ dir /pc80
 config chip.h
 
 # sample config for tyan/s2880
-chip northbridge/amd/amdk8
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on #  northbridge 
-			#  devices on link 0, link 0 == LDT 0
-			chip southbridge/amd/amd8131
-				# the on/off keyword is mandatory
-				device pci 0.0 on end
-				device pci 0.1 on end
-				device pci 1.0 on end
-				device pci 1.1 on end
-			end
-			chip southbridge/amd/amd8111
-				# this "device pci 0.0" is the parent the next one
-				# PCI bridge
-				device pci 0.0 on
+		chip northbridge/amd/amdk8
+			device pci 18.0 on #  northbridge 
+				#  devices on link 0, link 0 == LDT 0
+				chip southbridge/amd/amd8131
+					# the on/off keyword is mandatory
 					device pci 0.0 on end
 					device pci 0.1 on end
-					device pci 0.2 off end
-					device pci 1.0 off end
+					device pci 1.0 on end
+					device pci 1.1 on end
 				end
-				device pci 1.0 on
-					chip superio/winbond/w83627hf
-						device pnp 2e.0 on #  Floppy
-                                 			io 0x60 = 0x3f0
-                                			irq 0x70 = 6
-                                			drq 0x74 = 2
-						end
-                        			device pnp 2e.1 off #  Parallel Port
-                                 			io 0x60 = 0x378
-                                			irq 0x70 = 7
-						end
-                        			device pnp 2e.2 on #  Com1
-                                 			io 0x60 = 0x3f8
-                                			irq 0x70 = 4
-						end
-                        			device pnp 2e.3 off #  Com2
-                                 			io 0x60 = 0x2f8
-                                			irq 0x70 = 3
-						end
-                        			device pnp 2e.5 on #  Keyboard
-                                 			io 0x60 = 0x60
-                                 			io 0x62 = 0x64
-                                			irq 0x70 = 1
-							irq 0x72 = 12
+				chip southbridge/amd/amd8111
+					# this "device pci 0.0" is the parent the next one
+					# PCI bridge
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 off end
+						device pci 1.0 off end
+					end
+					device pci 1.0 on
+						chip superio/winbond/w83627hf
+							device pnp 2e.0 on #  Floppy
+                	                 			io 0x60 = 0x3f0
+                	                			irq 0x70 = 6
+                	                			drq 0x74 = 2
+							end
+                	        			device pnp 2e.1 off #  Parallel Port
+                	                 			io 0x60 = 0x378
+                	                			irq 0x70 = 7
+							end
+                	        			device pnp 2e.2 on #  Com1
+                	                 			io 0x60 = 0x3f8
+                	                			irq 0x70 = 4
+							end
+                	        			device pnp 2e.3 off #  Com2
+                	                 			io 0x60 = 0x2f8
+                	                			irq 0x70 = 3
+							end
+                	        			device pnp 2e.5 on #  Keyboard
+                	                 			io 0x60 = 0x60
+                	                 			io 0x62 = 0x64
+                	                			irq 0x70 = 1
+								irq 0x72 = 12
+							end
+                	                                device pnp 2e.6 off #  CIR
+                	                                        io 0x60 = 0x100
+                	                                end
+                	                                device pnp 2e.7 off #  GAME_MIDI_GIPO1
+                	                                        io 0x60 = 0x201
+                	                                        io 0x62 = 0x330
+                	                                        irq 0x70 = 9
+                	                                end  
+                	                                device pnp 2e.8 off end #  GPIO2
+                	                                device pnp 2e.9 off end #  GPIO3
+                	                                device pnp 2e.a off end #  ACPI
+                	                                device pnp 2e.b on #  HW Monitor
+                	                                        io 0x60 = 0x290
+                	                                        irq 0x70 = 5
+                	                                end
 						end
-                                                device pnp 2e.6 off #  CIR
-                                                        io 0x60 = 0x100
-                                                end
-                                                device pnp 2e.7 off #  GAME_MIDI_GIPO1
-                                                        io 0x60 = 0x201
-                                                        io 0x62 = 0x330
-                                                        irq 0x70 = 9
-                                                end  
-                                                device pnp 2e.8 off end #  GPIO2
-                                                device pnp 2e.9 off end #  GPIO3
-                                                device pnp 2e.a off end #  ACPI
-                                                device pnp 2e.b on #  HW Monitor
-                                                        io 0x60 = 0x290
-                                                        irq 0x70 = 5
-                                                end
 					end
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on end
+					device pci 1.5 off end
+					device pci 1.6 off end
 				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on end
-				device pci 1.5 off end
-				device pci 1.6 off end
-			end
-		end #  device pci 18.0 
-
-                device pci 18.0 on end
-                device pci 18.0 on end
-		
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on end
-
+			end #  device pci 18.0 
+			
+                	device pci 18.0 on end
+                	device pci 18.0 on end
+			
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
 		chip northbridge/amd/amdk8
 			device pci 19.0 on end
 			device pci 19.0 on end
diff --git a/src/mainboard/tyan/s2881/Config.lb b/src/mainboard/tyan/s2881/Config.lb
index fa563fb497..17dcc90fa4 100644
--- a/src/mainboard/tyan/s2881/Config.lb
+++ b/src/mainboard/tyan/s2881/Config.lb
@@ -125,82 +125,83 @@ dir /pc80
 config chip.h
 
 # sample config for tyan/s2881
-chip northbridge/amd/amdk8
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on end # LDT0
-		device pci 18.0 on end # LDT1
-		device pci 18.0 on #  northbridge 
-			#  devices on link 2, link 2 == LDT 2
-			chip southbridge/amd/amd8131
-				# the on/off keyword is mandatory
-				device pci 0.0 on end
-				device pci 0.1 on end
-				device pci 1.0 on end
-				device pci 1.1 on end
-			end
-			chip southbridge/amd/amd8111
-				# this "device pci 0.0" is the parent the next one
-				# PCI bridge
-				device pci 0.0 on
+		chip northbridge/amd/amdk8
+			device pci 18.0 on end # LDT0
+			device pci 18.0 on end # LDT1
+			device pci 18.0 on #  northbridge 
+				#  devices on link 2, link 2 == LDT 2
+				chip southbridge/amd/amd8131
+					# the on/off keyword is mandatory
 					device pci 0.0 on end
 					device pci 0.1 on end
-					device pci 0.2 off end
-					device pci 1.0 off end
+					device pci 1.0 on end
+					device pci 1.1 on end
 				end
-				device pci 1.0 on
-					chip superio/winbond/w83627hf
-						device pnp 2e.0 on #  Floppy
-                                 			io 0x60 = 0x3f0
-                                			irq 0x70 = 6
-                                			drq 0x74 = 2
-						end
-                        			device pnp 2e.1 off #  Parallel Port
-                                 			io 0x60 = 0x378
-                                			irq 0x70 = 7
-						end
-                        			device pnp 2e.2 on #  Com1
-                                 			io 0x60 = 0x3f8
-                                			irq 0x70 = 4
-						end
-                        			device pnp 2e.3 off #  Com2
-                                 			io 0x60 = 0x2f8
-                                			irq 0x70 = 3
-						end
-                        			device pnp 2e.5 on #  Keyboard
-                                 			io 0x60 = 0x60
-                                 			io 0x62 = 0x64
-                                			irq 0x70 = 1
-							irq 0x72 = 12
+				chip southbridge/amd/amd8111
+					# this "device pci 0.0" is the parent the next one
+					# PCI bridge
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 off end
+						device pci 1.0 off end
+					end
+					device pci 1.0 on
+						chip superio/winbond/w83627hf
+							device pnp 2e.0 on #  Floppy
+                	                 			io 0x60 = 0x3f0
+                	                			irq 0x70 = 6
+                	                			drq 0x74 = 2
+							end
+                	        			device pnp 2e.1 off #  Parallel Port
+                	                 			io 0x60 = 0x378
+                	                			irq 0x70 = 7
+							end
+                	        			device pnp 2e.2 on #  Com1
+                	                 			io 0x60 = 0x3f8
+                	                			irq 0x70 = 4
+							end
+                	        			device pnp 2e.3 off #  Com2
+                	                 			io 0x60 = 0x2f8
+                	                			irq 0x70 = 3
+							end
+                	        			device pnp 2e.5 on #  Keyboard
+                	                 			io 0x60 = 0x60
+                	                 			io 0x62 = 0x64
+                	                			irq 0x70 = 1
+								irq 0x72 = 12
+							end
+                	                                device pnp 2e.6 off #  CIR
+                	                                        io 0x60 = 0x100
+                	                                end
+                	                                device pnp 2e.7 off #  GAME_MIDI_GIPO1
+                	                                        io 0x60 = 0x201
+                	                                        io 0x62 = 0x330
+                	                                        irq 0x70 = 9
+                	                                end  
+                	                                device pnp 2e.8 off end #  GPIO2
+                	                                device pnp 2e.9 off end #  GPIO3
+                	                                device pnp 2e.a off end #  ACPI
+                	                                device pnp 2e.b on #  HW Monitor
+                	                                        io 0x60 = 0x290
+                	                                        irq 0x70 = 5
+                	                                end
 						end
-                                                device pnp 2e.6 off #  CIR
-                                                        io 0x60 = 0x100
-                                                end
-                                                device pnp 2e.7 off #  GAME_MIDI_GIPO1
-                                                        io 0x60 = 0x201
-                                                        io 0x62 = 0x330
-                                                        irq 0x70 = 9
-                                                end  
-                                                device pnp 2e.8 off end #  GPIO2
-                                                device pnp 2e.9 off end #  GPIO3
-                                                device pnp 2e.a off end #  ACPI
-                                                device pnp 2e.b on #  HW Monitor
-                                                        io 0x60 = 0x290
-                                                        irq 0x70 = 5
-                                                end
 					end
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on end
+					device pci 1.5 off end
+					device pci 1.6 off end
 				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on end
-				device pci 1.5 off end
-				device pci 1.6 off end
-			end
-		end #  device pci 18.0 
-		
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on end
-
+			end #  device pci 18.0 
+			
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
 		chip northbridge/amd/amdk8
 			device pci 19.0 on end
 			device pci 19.0 on end
diff --git a/src/mainboard/tyan/s2882/Config.lb b/src/mainboard/tyan/s2882/Config.lb
index 457b3d0ef0..7db07ad5e4 100644
--- a/src/mainboard/tyan/s2882/Config.lb
+++ b/src/mainboard/tyan/s2882/Config.lb
@@ -124,83 +124,84 @@ dir /pc80
 config chip.h
 
 # sample config for tyan/s2882
-chip northbridge/amd/amdk8
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on #  northbridge 
-			#  devices on link 0, link 0 == LDT 0
-			chip southbridge/amd/amd8131
-				# the on/off keyword is mandatory
-				device pci 0.0 on end
-				device pci 0.1 on end
-				device pci 1.0 on end
-				device pci 1.1 on end
-			end
-			chip southbridge/amd/amd8111
-				# this "device pci 0.0" is the parent the next one
-				# PCI bridge
-				device pci 0.0 on
+		chip northbridge/amd/amdk8
+			device pci 18.0 on #  northbridge 
+				#  devices on link 0, link 0 == LDT 0
+				chip southbridge/amd/amd8131
+					# the on/off keyword is mandatory
 					device pci 0.0 on end
 					device pci 0.1 on end
-					device pci 0.2 off end
-					device pci 1.0 off end
+					device pci 1.0 on end
+					device pci 1.1 on end
 				end
-				device pci 1.0 on
-					chip superio/winbond/w83627hf
-						device pnp 2e.0 on #  Floppy
-                                 			io 0x60 = 0x3f0
-                                			irq 0x70 = 6
-                                			drq 0x74 = 2
-						end
-                        			device pnp 2e.1 off #  Parallel Port
-                                 			io 0x60 = 0x378
-                                			irq 0x70 = 7
-						end
-                        			device pnp 2e.2 on #  Com1
-                                 			io 0x60 = 0x3f8
-                                			irq 0x70 = 4
-						end
-                        			device pnp 2e.3 off #  Com2
-                                 			io 0x60 = 0x2f8
-                                			irq 0x70 = 3
-						end
-                        			device pnp 2e.5 on #  Keyboard
-                                 			io 0x60 = 0x60
-                                 			io 0x62 = 0x64
-                                			irq 0x70 = 1
-							irq 0x72 = 12
+				chip southbridge/amd/amd8111
+					# this "device pci 0.0" is the parent the next one
+					# PCI bridge
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 off end
+						device pci 1.0 off end
+					end
+					device pci 1.0 on
+						chip superio/winbond/w83627hf
+							device pnp 2e.0 on #  Floppy
+                	                 			io 0x60 = 0x3f0
+                	                			irq 0x70 = 6
+                	                			drq 0x74 = 2
+							end
+                	        			device pnp 2e.1 off #  Parallel Port
+                	                 			io 0x60 = 0x378
+                	                			irq 0x70 = 7
+							end
+                	        			device pnp 2e.2 on #  Com1
+                	                 			io 0x60 = 0x3f8
+                	                			irq 0x70 = 4
+							end
+                	        			device pnp 2e.3 off #  Com2
+                	                 			io 0x60 = 0x2f8
+                	                			irq 0x70 = 3
+							end
+                	        			device pnp 2e.5 on #  Keyboard
+                	                 			io 0x60 = 0x60
+                	                 			io 0x62 = 0x64
+                	                			irq 0x70 = 1
+								irq 0x72 = 12
+							end
+                	                                device pnp 2e.6 off #  CIR
+                	                                        io 0x60 = 0x100
+                	                                end
+                	                                device pnp 2e.7 off #  GAME_MIDI_GIPO1
+                	                                        io 0x60 = 0x201
+                	                                        io 0x62 = 0x330
+                	                                        irq 0x70 = 9
+                	                                end  
+                	                                device pnp 2e.8 off end #  GPIO2
+                	                                device pnp 2e.9 off end #  GPIO3
+                	                                device pnp 2e.a off end #  ACPI
+                	                                device pnp 2e.b on #  HW Monitor
+                	                                        io 0x60 = 0x290
+                	                                        irq 0x70 = 5
+                	                                end
 						end
-                                                device pnp 2e.6 off #  CIR
-                                                        io 0x60 = 0x100
-                                                end
-                                                device pnp 2e.7 off #  GAME_MIDI_GIPO1
-                                                        io 0x60 = 0x201
-                                                        io 0x62 = 0x330
-                                                        irq 0x70 = 9
-                                                end  
-                                                device pnp 2e.8 off end #  GPIO2
-                                                device pnp 2e.9 off end #  GPIO3
-                                                device pnp 2e.a off end #  ACPI
-                                                device pnp 2e.b on #  HW Monitor
-                                                        io 0x60 = 0x290
-                                                        irq 0x70 = 5
-                                                end
 					end
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on end
+					device pci 1.5 off end
+					device pci 1.6 off end
 				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on end
-				device pci 1.5 off end
-				device pci 1.6 off end
-			end
-		end #  device pci 18.0 
-	
-                device pci 18.0 on end
-                device pci 18.0 on end
-	
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on end
-
+			end #  device pci 18.0 
+			
+                	device pci 18.0 on end
+                	device pci 18.0 on end
+			
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
 		chip northbridge/amd/amdk8
 			device pci 19.0 on end
 			device pci 19.0 on end
diff --git a/src/mainboard/tyan/s2885/Config.lb b/src/mainboard/tyan/s2885/Config.lb
index 3327b32e82..a07e068af5 100644
--- a/src/mainboard/tyan/s2885/Config.lb
+++ b/src/mainboard/tyan/s2885/Config.lb
@@ -128,101 +128,103 @@ dir /pc80
 config chip.h
 
 # sample config for tyan/s2885
-chip northbridge/amd/amdk8
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on # LDT0
-			chip southbridge/amd/amd8151
-				# the on/off keyword is mandatory
-				device pci 0.0 on end
-				device pci 1.0 on end
-			end
-		end
-		device pci 18.0 on end # LDT1
-		device pci 18.0 on #  northbridge 
-			#  devices on link 2, link 2 == LDT 2
-			chip southbridge/amd/amd8131
-				# the on/off keyword is mandatory
-				device pci 0.0 on end
-				device pci 0.1 on end
-				device pci 1.0 on end
-				device pci 1.1 on end
+		chip northbridge/amd/amdk8
+			device pci 18.0 on # LDT0
+				chip southbridge/amd/amd8151
+					# the on/off keyword is mandatory
+					device pci 0.0 on end
+					device pci 1.0 on end
+				end
 			end
-			chip southbridge/amd/amd8111
-				# this "device pci 0.0" is the parent the next one
-				# PCI bridge
-				device pci 0.0 on
+			device pci 18.0 on end # LDT1
+			device pci 18.0 on #  northbridge 
+				#  devices on link 2, link 2 == LDT 2
+				chip southbridge/amd/amd8131
+					# the on/off keyword is mandatory
 					device pci 0.0 on end
 					device pci 0.1 on end
-					device pci 0.2 off end
-					device pci 1.0 off end
+					device pci 1.0 on end
+					device pci 1.1 on end
 				end
-				device pci 1.0 on
-                                        chip drivers/generic/debug
-                                                device pnp 2.0 on end
-                                                device pnp 2.1 off end
-                                                device pnp 2.2 off end
-                                                device pnp 2.3 on end
-                                        end
-					chip superio/winbond/w83627hf
-						device pnp 2e.0 on #  Floppy
-                                 			io 0x60 = 0x3f0
-                                			irq 0x70 = 6
-                                			drq 0x74 = 2
-						end
-                        			device pnp 2e.1 off #  Parallel Port
-                                 			io 0x60 = 0x378
-                                			irq 0x70 = 7
-						end
-                        			device pnp 2e.2 on #  Com1
-                                 			io 0x60 = 0x3f8
-                                			irq 0x70 = 4
-						end
-                        			device pnp 2e.3 off #  Com2
-                                 			io 0x60 = 0x2f8
-                                			irq 0x70 = 3
-						end
-                        			device pnp 2e.5 on #  Keyboard
-                                 			io 0x60 = 0x60
-                                 			io 0x62 = 0x64
-                                			irq 0x70 = 1
-							irq 0x72 = 12
-						end
-                        			device pnp 2e.6 off #  CIR
-							io 0x60 = 0x100
+				chip southbridge/amd/amd8111
+					# this "device pci 0.0" is the parent the next one
+					# PCI bridge
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 off end
+						device pci 1.0 off end
+					end
+					device pci 1.0 on
+                	                        chip drivers/generic/debug
+                	                                device pnp 2.0 on end
+                	                                device pnp 2.1 off end
+                	                                device pnp 2.2 off end
+                	                                device pnp 2.3 on end
+                	                        end
+						chip superio/winbond/w83627hf
+							device pnp 2e.0 on #  Floppy
+                	                 			io 0x60 = 0x3f0
+                	                			irq 0x70 = 6
+                	                			drq 0x74 = 2
+							end
+                	        			device pnp 2e.1 off #  Parallel Port
+                	                 			io 0x60 = 0x378
+                	                			irq 0x70 = 7
+							end
+                	        			device pnp 2e.2 on #  Com1
+                	                 			io 0x60 = 0x3f8
+                	                			irq 0x70 = 4
+							end
+                	        			device pnp 2e.3 off #  Com2
+                	                 			io 0x60 = 0x2f8
+                	                			irq 0x70 = 3
+							end
+                	        			device pnp 2e.5 on #  Keyboard
+                	                 			io 0x60 = 0x60
+                	                 			io 0x62 = 0x64
+                	                			irq 0x70 = 1
+								irq 0x72 = 12
+							end
+                	        			device pnp 2e.6 off #  CIR
+								io 0x60 = 0x100
+							end
+                	        			device pnp 2e.7 off #  GAME_MIDI_GIPO1
+								io 0x60 = 0x201
+								io 0x62 = 0x330
+								irq 0x70 = 9
+							end						
+                	        			device pnp 2e.8 off end #  GPIO2
+                	        			device pnp 2e.9 off end #  GPIO3
+                	        			device pnp 2e.a off end #  ACPI
+                	        			device pnp 2e.b on #  HW Monitor
+ 					 			io 0x60 = 0x290
+								irq 0x70 = 5
+                					end
 						end
-                        			device pnp 2e.7 off #  GAME_MIDI_GIPO1
-							io 0x60 = 0x201
-							io 0x62 = 0x330
-							irq 0x70 = 9
-						end						
-                        			device pnp 2e.8 off end #  GPIO2
-                        			device pnp 2e.9 off end #  GPIO3
-                        			device pnp 2e.a off end #  ACPI
-                        			device pnp 2e.b on #  HW Monitor
- 				 			io 0x60 = 0x290
-							irq 0x70 = 5
-                				end
 					end
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on end
+					device pci 1.5 on end
+					device pci 1.6 off end
+                	                register "ide0_enable" = "1"
+                	                register "ide1_enable" = "1"
 				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on end
-				device pci 1.5 on end
-				device pci 1.6 off end
-                                register "ide0_enable" = "1"
-                                register "ide1_enable" = "1"
+			end #  device pci 18.0 
+			
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on 
+#               	         chip drivers/generic/debug
+#               	                 device pnp 1.0 on end
+#               	                 device pnp 1.1 off end
+#               	                 device pnp 1.2 off end
+#               	                 device pnp 1.3 on end
+#               	         end
 			end
-		end #  device pci 18.0 
-		
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on 
-#                        chip drivers/generic/debug
-#                                device pnp 1.0 on end
-#                                device pnp 1.1 off end
-#                                device pnp 1.2 off end
-#                                device pnp 1.3 on end
-#                        end
 		end
 
 		chip northbridge/amd/amdk8
diff --git a/src/mainboard/tyan/s4880/Config.lb b/src/mainboard/tyan/s4880/Config.lb
index e25b26c6e7..d867537cf5 100644
--- a/src/mainboard/tyan/s4880/Config.lb
+++ b/src/mainboard/tyan/s4880/Config.lb
@@ -124,81 +124,83 @@ dir /pc80
 config chip.h
 
 # sample config for tyan/s4880
-chip northbridge/amd/amdk8
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on end # LDT0
-		device pci 18.0 on end # LDT1
-		device pci 18.0 on #  northbridge 
-			#  devices on link 2, link 2 == LDT 2
-			chip southbridge/amd/amd8131
-				# the on/off keyword is mandatory
-				device pci 0.0 on end
-				device pci 0.1 on end
-				device pci 1.0 on end
-				device pci 1.1 on end
-			end
-			chip southbridge/amd/amd8111
-				# this "device pci 0.0" is the parent the next one
-				# PCI bridge
-				device pci 0.0 on
+		chip northbridge/amd/amdk8
+			device pci 18.0 on end # LDT0
+			device pci 18.0 on end # LDT1
+			device pci 18.0 on #  northbridge 
+				#  devices on link 2, link 2 == LDT 2
+				chip southbridge/amd/amd8131
+					# the on/off keyword is mandatory
 					device pci 0.0 on end
 					device pci 0.1 on end
-					device pci 0.2 off end
-					device pci 1.0 off end
+					device pci 1.0 on end
+					device pci 1.1 on end
 				end
-				device pci 1.0 on
-					chip superio/winbond/w83627hf
-						device pnp 2e.0 on #  Floppy
-                                 			io 0x60 = 0x3f0
-                                			irq 0x70 = 6
-                                			drq 0x74 = 2
-						end
-                        			device pnp 2e.1 off #  Parallel Port
-                                 			io 0x60 = 0x378
-                                			irq 0x70 = 7
-						end
-                        			device pnp 2e.2 on #  Com1
-                                 			io 0x60 = 0x3f8
-                                			irq 0x70 = 4
-						end
-                        			device pnp 2e.3 off #  Com2
-                                 			io 0x60 = 0x2f8
-                                			irq 0x70 = 3
-						end
-                        			device pnp 2e.5 on #  Keyboard
-                                 			io 0x60 = 0x60
-                                 			io 0x62 = 0x64
-                                			irq 0x70 = 1
-							irq 0x72 = 12
+				chip southbridge/amd/amd8111
+					# this "device pci 0.0" is the parent the next one
+					# PCI bridge
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 off end
+						device pci 1.0 off end
+					end
+					device pci 1.0 on
+						chip superio/winbond/w83627hf
+							device pnp 2e.0 on #  Floppy
+                	                 			io 0x60 = 0x3f0
+                	                			irq 0x70 = 6
+                	                			drq 0x74 = 2
+							end
+                	        			device pnp 2e.1 off #  Parallel Port
+                	                 			io 0x60 = 0x378
+                	                			irq 0x70 = 7
+							end
+                	        			device pnp 2e.2 on #  Com1
+                	                 			io 0x60 = 0x3f8
+                	                			irq 0x70 = 4
+							end
+                	        			device pnp 2e.3 off #  Com2
+                	                 			io 0x60 = 0x2f8
+                	                			irq 0x70 = 3
+							end
+                	        			device pnp 2e.5 on #  Keyboard
+                	                 			io 0x60 = 0x60
+                	                 			io 0x62 = 0x64
+                	                			irq 0x70 = 1
+								irq 0x72 = 12
+							end
+                	                                device pnp 2e.6 off #  CIR
+                	                                        io 0x60 = 0x100
+                	                                end
+                	                                device pnp 2e.7 off #  GAME_MIDI_GIPO1
+                	                                        io 0x60 = 0x201
+                	                                        io 0x62 = 0x330
+                	                                        irq 0x70 = 9
+                	                                end  
+                	                                device pnp 2e.8 off end #  GPIO2
+                	                                device pnp 2e.9 off end #  GPIO3
+                	                                device pnp 2e.a off end #  ACPI
+                	                                device pnp 2e.b on #  HW Monitor
+                	                                        io 0x60 = 0x290
+                	                                        irq 0x70 = 5
+                	                                end
 						end
-                                                device pnp 2e.6 off #  CIR
-                                                        io 0x60 = 0x100
-                                                end
-                                                device pnp 2e.7 off #  GAME_MIDI_GIPO1
-                                                        io 0x60 = 0x201
-                                                        io 0x62 = 0x330
-                                                        irq 0x70 = 9
-                                                end  
-                                                device pnp 2e.8 off end #  GPIO2
-                                                device pnp 2e.9 off end #  GPIO3
-                                                device pnp 2e.a off end #  ACPI
-                                                device pnp 2e.b on #  HW Monitor
-                                                        io 0x60 = 0x290
-                                                        irq 0x70 = 5
-                                                end
 					end
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on end
+					device pci 1.5 off end
+					device pci 1.6 off end
 				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on end
-				device pci 1.5 off end
-				device pci 1.6 off end
-			end
-		end #  device pci 18.0 
-		
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on end
+			end #  device pci 18.0 
+			
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
 
 		chip northbridge/amd/amdk8
 			device pci 19.0 on end
diff --git a/src/mainboard/tyan/s4882/Config.lb b/src/mainboard/tyan/s4882/Config.lb
index 198a3ac3ba..0c17843628 100644
--- a/src/mainboard/tyan/s4882/Config.lb
+++ b/src/mainboard/tyan/s4882/Config.lb
@@ -124,82 +124,84 @@ dir /pc80
 config chip.h
 
 # sample config for tyan/s4882
-chip northbridge/amd/amdk8
+chip northbridge/amd/amdk8/root_complex
 	device pci_domain 0 on
-		device pci 18.0 on end # LDT0
-		device pci 18.0 on #  northbridge 
-			#  devices on link 1, link 1 == LDT 1
-			chip southbridge/amd/amd8131
-				# the on/off keyword is mandatory
-				device pci 0.0 on end
-				device pci 0.1 on end
-				device pci 1.0 on end
-				device pci 1.1 on end
-			end
-			chip southbridge/amd/amd8111
-				# this "device pci 0.0" is the parent the next one
-				# PCI bridge
-				device pci 0.0 on
+		chip northbridge/amd/amdk8
+			device pci 18.0 on end # LDT0
+			device pci 18.0 on #  northbridge 
+				#  devices on link 1, link 1 == LDT 1
+				chip southbridge/amd/amd8131
+					# the on/off keyword is mandatory
 					device pci 0.0 on end
 					device pci 0.1 on end
-					device pci 0.2 off end
-					device pci 1.0 off end
+					device pci 1.0 on end
+					device pci 1.1 on end
 				end
-				device pci 1.0 on
-					chip superio/winbond/w83627hf
-						device pnp 2e.0 on #  Floppy
-                                 			io 0x60 = 0x3f0
-                                			irq 0x70 = 6
-                                			drq 0x74 = 2
-						end
-                        			device pnp 2e.1 off #  Parallel Port
-                                 			io 0x60 = 0x378
-                                			irq 0x70 = 7
-						end
-                        			device pnp 2e.2 on #  Com1
-                                 			io 0x60 = 0x3f8
-                                			irq 0x70 = 4
-						end
-                        			device pnp 2e.3 off #  Com2
-                                 			io 0x60 = 0x2f8
-                                			irq 0x70 = 3
-						end
-                        			device pnp 2e.5 on #  Keyboard
-                                 			io 0x60 = 0x60
-                                 			io 0x62 = 0x64
-                                			irq 0x70 = 1
-							irq 0x72 = 12
+				chip southbridge/amd/amd8111
+					# this "device pci 0.0" is the parent the next one
+					# PCI bridge
+					device pci 0.0 on
+						device pci 0.0 on end
+						device pci 0.1 on end
+						device pci 0.2 off end
+						device pci 1.0 off end
+					end
+					device pci 1.0 on
+						chip superio/winbond/w83627hf
+							device pnp 2e.0 on #  Floppy
+                	                 			io 0x60 = 0x3f0
+                	                			irq 0x70 = 6
+                	                			drq 0x74 = 2
+							end
+                	        			device pnp 2e.1 off #  Parallel Port
+                	                 			io 0x60 = 0x378
+                	                			irq 0x70 = 7
+							end
+                	        			device pnp 2e.2 on #  Com1
+                	                 			io 0x60 = 0x3f8
+                	                			irq 0x70 = 4
+							end
+                	        			device pnp 2e.3 off #  Com2
+                	                 			io 0x60 = 0x2f8
+                	                			irq 0x70 = 3
+							end
+                	        			device pnp 2e.5 on #  Keyboard
+                	                 			io 0x60 = 0x60
+                	                 			io 0x62 = 0x64
+                	                			irq 0x70 = 1
+								irq 0x72 = 12
+							end
+                	                                device pnp 2e.6 off #  CIR
+                	                                        io 0x60 = 0x100
+                	                                end
+                	                                device pnp 2e.7 off #  GAME_MIDI_GIPO1
+                	                                        io 0x60 = 0x201
+                	                                        io 0x62 = 0x330
+                	                                        irq 0x70 = 9
+                	                                end  
+                	                                device pnp 2e.8 off end #  GPIO2
+                	                                device pnp 2e.9 off end #  GPIO3
+                	                                device pnp 2e.a off end #  ACPI
+                	                                device pnp 2e.b on #  HW Monitor
+                	                                        io 0x60 = 0x290
+                	                                        irq 0x70 = 5
+                	                                end
 						end
-                                                device pnp 2e.6 off #  CIR
-                                                        io 0x60 = 0x100
-                                                end
-                                                device pnp 2e.7 off #  GAME_MIDI_GIPO1
-                                                        io 0x60 = 0x201
-                                                        io 0x62 = 0x330
-                                                        irq 0x70 = 9
-                                                end  
-                                                device pnp 2e.8 off end #  GPIO2
-                                                device pnp 2e.9 off end #  GPIO3
-                                                device pnp 2e.a off end #  ACPI
-                                                device pnp 2e.b on #  HW Monitor
-                                                        io 0x60 = 0x290
-                                                        irq 0x70 = 5
-                                                end
 					end
+					device pci 1.1 on end
+					device pci 1.2 on end
+					device pci 1.3 on end
+					device pci 1.5 off end
+					device pci 1.6 off end
 				end
-				device pci 1.1 on end
-				device pci 1.2 on end
-				device pci 1.3 on end
-				device pci 1.5 off end
-				device pci 1.6 off end
-			end
-		end #  device pci 18.0 
-		
-                device pci 18.0 on end
-
-		device pci 18.1 on end
-		device pci 18.2 on end
-		device pci 18.3 on end
+			end #  device pci 18.0 
+			
+                	device pci 18.0 on end
+			
+			device pci 18.1 on end
+			device pci 18.2 on end
+			device pci 18.3 on end
+		end
 
 		chip northbridge/amd/amdk8
 			device pci 19.0 on end