6432451 PICL on Boston and Seattle needs to support Jalapeno processors

4 files changed, 25 insertions, 0 deletions

diff --git a/usr/src/cmd/picl/plugins/sun4u/boston/frudr/SB-tables.info b/usr/src/cmd/picl/plugins/sun4u/boston/frudr/SB-tables.info
index dfb8f5380e..7241e5621a 100644
--- a/usr/src/cmd/picl/plugins/sun4u/boston/frudr/SB-tables.info
+++ b/usr/src/cmd/picl/plugins/sun4u/boston/frudr/SB-tables.info
@@ -254,6 +254,7 @@ name:/frutree/chassis/MB/system-board/C0/cpu-module/P0/cpu
 	ROW
 	PROP Class string r 0 "cpu"
 	REFPROP _cpu_ name:/platform/SUNW,UltraSPARC-IIIi+@0,0
+	REFPROP _cpu_ name:/platform/SUNW,UltraSPARC-IIIi@0,0
 	ENDROW
 	ROW
 	PROP Class string r 0 "temperature-sensor"
@@ -266,6 +267,7 @@ name:/frutree/chassis/MB/system-board/C1/cpu-module/P0/cpu
 	ROW
 	PROP Class string r 0 "cpu"
 	REFPROP _cpu_ name:/platform/SUNW,UltraSPARC-IIIi+@1,0
+	REFPROP _cpu_ name:/platform/SUNW,UltraSPARC-IIIi@1,0
 	ENDROW
 	ROW
 	PROP Class string r 0 "temperature-sensor"
@@ -278,6 +280,7 @@ name:/frutree/chassis/MB/system-board/C2/cpu-module/P0/cpu
 	ROW
 	PROP Class string r 0 "cpu"
 	REFPROP _cpu_ name:/platform/SUNW,UltraSPARC-IIIi+@2,0
+	REFPROP _cpu_ name:/platform/SUNW,UltraSPARC-IIIi@2,0
 	ENDROW
 	ROW
 	PROP Class string r 0 "temperature-sensor"
@@ -290,6 +293,7 @@ name:/frutree/chassis/MB/system-board/C3/cpu-module/P0/cpu
 	ROW
 	PROP Class string r 0 "cpu"
 	REFPROP _cpu_ name:/platform/SUNW,UltraSPARC-IIIi+@3,0
+	REFPROP _cpu_ name:/platform/SUNW,UltraSPARC-IIIi@3,0
 	ENDROW
 	ROW
 	PROP Class string r 0 "temperature-sensor"
diff --git a/usr/src/cmd/picl/plugins/sun4u/boston/frutree/system-board.info b/usr/src/cmd/picl/plugins/sun4u/boston/frutree/system-board.info
index dc17240441..9c71f08096 100644
--- a/usr/src/cmd/picl/plugins/sun4u/boston/frutree/system-board.info
+++ b/usr/src/cmd/picl/plugins/sun4u/boston/frutree/system-board.info
@@ -160,9 +160,12 @@ name:/frutree/chassis/MB/system-board/C0/cpu-module/P0
 	PROP SlotType string r 0 "cpu"
 	PROP Label string r 0 "P0"
 	REFNODE cpu location WITH name:/platform/SUNW,UltraSPARC-IIIi+@0,0
+	REFNODE cpu location WITH name:/platform/SUNW,UltraSPARC-IIIi@0,0
 
 name:/platform/SUNW,UltraSPARC-IIIi+@0,0
 	REFPROP _location_parent name:/frutree/chassis/MB/system-board/C0/cpu-module/P0/cpu
+name:/platform/SUNW,UltraSPARC-IIIi@0,0
+	REFPROP _location_parent name:/frutree/chassis/MB/system-board/C0/cpu-module/P0/cpu
 
 name:/frutree/chassis/MB/system-board/C1/cpu-module
 	REFNODE P0 location WITH name:/frutree/chassis/MB/system-board/C1/cpu-module
@@ -170,9 +173,12 @@ name:/frutree/chassis/MB/system-board/C1/cpu-module/P0
 	PROP SlotType string r 0 "cpu"
 	PROP Label string r 0 "P0"
 	REFNODE cpu location WITH name:/platform/SUNW,UltraSPARC-IIIi+@1,0
+	REFNODE cpu location WITH name:/platform/SUNW,UltraSPARC-IIIi@1,0
 
 name:/platform/SUNW,UltraSPARC-IIIi+@1,0
 	REFPROP _location_parent name:/frutree/chassis/MB/system-board/C1/cpu-module/P0/cpu
+name:/platform/SUNW,UltraSPARC-IIIi@1,0
+	REFPROP _location_parent name:/frutree/chassis/MB/system-board/C1/cpu-module/P0/cpu
 
 name:/frutree/chassis/MB/system-board/C2/cpu-module
 	REFNODE P0 location WITH name:/frutree/chassis/MB/system-board/C2/cpu-module
@@ -180,9 +186,12 @@ name:/frutree/chassis/MB/system-board/C2/cpu-module/P0
 	PROP SlotType string r 0 "cpu"
 	PROP Label string r 0 "P0"
 	REFNODE cpu location WITH name:/platform/SUNW,UltraSPARC-IIIi+@2,0
+	REFNODE cpu location WITH name:/platform/SUNW,UltraSPARC-IIIi@2,0
 
 name:/platform/SUNW,UltraSPARC-IIIi+@2,0
 	REFPROP _location_parent name:/frutree/chassis/MB/system-board/C2/cpu-module/P0/cpu
+name:/platform/SUNW,UltraSPARC-IIIi@2,0
+	REFPROP _location_parent name:/frutree/chassis/MB/system-board/C2/cpu-module/P0/cpu
 
 name:/frutree/chassis/MB/system-board/C3/cpu-module
 	REFNODE P0 location WITH name:/frutree/chassis/MB/system-board/C3/cpu-module
@@ -190,9 +199,12 @@ name:/frutree/chassis/MB/system-board/C3/cpu-module/P0
 	PROP SlotType string r 0 "cpu"
 	PROP Label string r 0 "P0"
 	REFNODE cpu location WITH name:/platform/SUNW,UltraSPARC-IIIi+@3,0
+	REFNODE cpu location WITH name:/platform/SUNW,UltraSPARC-IIIi@3,0
 
 name:/platform/SUNW,UltraSPARC-IIIi+@3,0
 	REFPROP _location_parent name:/frutree/chassis/MB/system-board/C3/cpu-module/P0/cpu
+name:/platform/SUNW,UltraSPARC-IIIi@3,0
+	REFPROP _location_parent name:/frutree/chassis/MB/system-board/C3/cpu-module/P0/cpu
 
 
 /************************************
diff --git a/usr/src/cmd/picl/plugins/sun4u/seattle/frudr/SB-tables.info b/usr/src/cmd/picl/plugins/sun4u/seattle/frudr/SB-tables.info
index 9c68e00a40..3cae98fe80 100644
--- a/usr/src/cmd/picl/plugins/sun4u/seattle/frudr/SB-tables.info
+++ b/usr/src/cmd/picl/plugins/sun4u/seattle/frudr/SB-tables.info
@@ -293,6 +293,7 @@ name:/frutree/chassis/MB/system-board/P0/cpu
 	ROW
 	PROP Class string r 0 "cpu"
 	REFPROP _cpu_ name:/platform/SUNW,UltraSPARC-IIIi+@0,0
+	REFPROP _cpu_ name:/platform/SUNW,UltraSPARC-IIIi@0,0
 	ENDROW
 	ROW
 	PROP Class string r 0 "temperature-sensor"
@@ -314,6 +315,7 @@ name:/frutree/chassis/MB/system-board/P1/cpu
 	ROW
 	PROP Class string r 0 "cpu"
 	REFPROP _cpu_ name:/platform/SUNW,UltraSPARC-IIIi+@1,0
+	REFPROP _cpu_ name:/platform/SUNW,UltraSPARC-IIIi@1,0
 	ENDROW
 	ROW
 	PROP Class string r 0 "temperature-sensor"
diff --git a/usr/src/cmd/picl/plugins/sun4u/seattle/frutree/system-board.info b/usr/src/cmd/picl/plugins/sun4u/seattle/frutree/system-board.info
index 2b4d144c95..bc05412a65 100644
--- a/usr/src/cmd/picl/plugins/sun4u/seattle/frutree/system-board.info
+++ b/usr/src/cmd/picl/plugins/sun4u/seattle/frutree/system-board.info
@@ -108,6 +108,7 @@ name:/platform/i2c@1f,530000/motherboard-fru-prom@0,a2
  */
 name:/frutree/chassis/MB/system-board/P0
 	REFNODE cpu fru WITH name:/platform/SUNW,UltraSPARC-IIIi+@0,0
+	REFNODE cpu fru WITH name:/platform/SUNW,UltraSPARC-IIIi@0,0
 name:/frutree/chassis/MB/system-board/P0/cpu
         NODE B0 location
             PROP Label string r 0 "B0"
@@ -133,6 +134,7 @@ name:/frutree/chassis/MB/system-board/P0/cpu
  */
 name:/frutree/chassis/MB/system-board/P1
 	REFNODE cpu fru WITH name:/platform/SUNW,UltraSPARC-IIIi+@1,0
+	REFNODE cpu fru WITH name:/platform/SUNW,UltraSPARC-IIIi@1,0
 name:/frutree/chassis/MB/system-board/P1/cpu
         NODE B0 location
             PROP Label string r 0 "B0"
@@ -258,6 +260,11 @@ name:/platform/SUNW,UltraSPARC-IIIi+@0,0
 name:/platform/SUNW,UltraSPARC-IIIi+@1,0
 	REFPROP _fru_parent /frutree/chassis/MB/system-board/P1/cpu
 
+name:/platform/SUNW,UltraSPARC-IIIi@0,0
+	REFPROP _fru_parent /frutree/chassis/MB/system-board/P0/cpu
+
+name:/platform/SUNW,UltraSPARC-IIIi@1,0
+	REFPROP _fru_parent /frutree/chassis/MB/system-board/P1/cpu
 /*
  * DIMM parents
  */