- 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

3 files changed, 190 insertions, 186 deletions

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