- Bump MAX_LINKS to 4 I have actually found an i2c bridge that needs this

- Fix the hdama Config.lb to not longer use the link keywords oops,
  and instead to have it nest everything properly.
- Update config.g to not support the link keyword
- update config.g to not support northbridge/southbridge/cpu/pmc noise words
  we can just use chip now.
- Remove old link handling from the code
- Detect and handle duplicate paths so we generate one device with multiple links


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

2 files changed, 11 insertions, 10 deletions

diff --git a/src/include/device/device.h b/src/include/device/device.h
index d5d2e8d946..79402e2111 100644
--- a/src/include/device/device.h
+++ b/src/include/device/device.h
@@ -40,7 +40,7 @@ struct bus {
 };
 
 #define MAX_RESOURCES 12
-#define MAX_LINKS     3
+#define MAX_LINKS     4
 /*
  * There is one device structure for each slot-number/function-number
  * combination:
diff --git a/src/mainboard/arima/hdama/Config.lb b/src/mainboard/arima/hdama/Config.lb
index f1ee7c3334..e6cec8d8cc 100644
--- a/src/mainboard/arima/hdama/Config.lb
+++ b/src/mainboard/arima/hdama/Config.lb
@@ -181,37 +181,38 @@ chip northbridge/amd/amdk8
 				device pci 1.3 on 
 					chip drivers/generic/generic
 						#phillips pca9545 smbus mux
-						device i2c  70 on end
+						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 link 4 #dimm 0-0-0
+					chip drivers/generic/generic #dimm 0-0-0
 						device i2c 50 on end
 					end
-					chip drivers/generic/generic link 4 #dimm 0-0-1
+					chip drivers/generic/generic #dimm 0-0-1
 						device i2c 51 on end
 					end 
-					chip drivers/generic/generic link 4 #dimm 0-1-0
+					chip drivers/generic/generic #dimm 0-1-0
 						device i2c 52 on end
 					end 
-					chip drivers/generic/generic link 4 #dimm 0-1-1
+					chip drivers/generic/generic #dimm 0-1-1
 						device i2c 53 on end
 					end 
-					chip drivers/generic/generic link 4 #dimm 1-0-0
+					chip drivers/generic/generic #dimm 1-0-0
 						device i2c 54 on end 
 					end
-					chip drivers/generic/generic link 4 #dimm 1-0-1
+					chip drivers/generic/generic #dimm 1-0-1
 						device i2c 55 on end
 					end 
-					chip drivers/generic/generic link 4 #dimm 1-1-0
+					chip drivers/generic/generic #dimm 1-1-0
 						device i2c 56 on end
 					end 
-					chip drivers/generic/generic link 4 #dimm 1-1-1
+					chip drivers/generic/generic #dimm 1-1-1
 						device i2c 57 on end
 					end 
 				end