diff options
| author | myers <none@none> | 2007-10-26 13:48:20 -0700 |
|---|---|---|
| committer | myers <none@none> | 2007-10-26 13:48:20 -0700 |
| commit | 133e64dc1e1364a61b2182e682067321a0b4a128 (patch) | |
| tree | 2fa16b377d7e35ecd7aea02c58896857c7f12d50 /usr/src | |
| parent | 1af98250c8b03bdc43d8ac3aac6390221d75b92e (diff) | |
| download | illumos-joyent-133e64dc1e1364a61b2182e682067321a0b4a128.tar.gz | |
6620038 Thor PCI topology deleted unused PCIe bridges and broke disk monitor topology
6620040 Update Thor Product Name in topology file
--HG--
rename : usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4550/Makefile => usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Makefile
rename : usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4550/Sun-Fire-X4550-hc-topology.xmlgen => usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Sun-Fire-X4540-hc-topology.xmlgen
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/lib/fm/topo/maps/Makefile | 2 | ||||
| -rw-r--r-- | usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Makefile (renamed from usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4550/Makefile) | 6 | ||||
| -rw-r--r-- | usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Sun-Fire-X4540-hc-topology.xmlgen (renamed from usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4550/Sun-Fire-X4550-hc-topology.xmlgen) | 6 | ||||
| -rw-r--r-- | usr/src/pkgdefs/SUNWfmd/prototype_i386 | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/usr/src/lib/fm/topo/maps/Makefile b/usr/src/lib/fm/topo/maps/Makefile index fe31156cbb..9e268ba0c6 100644 --- a/usr/src/lib/fm/topo/maps/Makefile +++ b/usr/src/lib/fm/topo/maps/Makefile @@ -43,7 +43,7 @@ sparc_SUBDIRS = sun4u \ i386_SUBDIRS = i86pc \ i386 \ SUNW,Sun-Fire-X4500 \ - SUNW,Sun-Fire-X4550 + SUNW,Sun-Fire-X4540 SUBDIRS = $($(MACH)_SUBDIRS) diff --git a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4550/Makefile b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Makefile index 419422abe4..10f34a3db5 100644 --- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4550/Makefile +++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Makefile @@ -32,10 +32,10 @@ ARCH = i86pc CLASS = arch DTDFILE = -TOPOFILE = Sun-Fire-X4550-hc-topology.xml -SRCDIR = ../SUNW,Sun-Fire-X4550 +TOPOFILE = Sun-Fire-X4540-hc-topology.xml +SRCDIR = ../SUNW,Sun-Fire-X4540 -PLATFORM = Sun-Fire-X4550 +PLATFORM = Sun-Fire-X4540 TOPOBASE = ../i86pc/i86pc-hc-topology.xml include ../Makefile.map diff --git a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4550/Sun-Fire-X4550-hc-topology.xmlgen b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Sun-Fire-X4540-hc-topology.xmlgen index 0b14c3e2eb..b25986447b 100644 --- a/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4550/Sun-Fire-X4550-hc-topology.xmlgen +++ b/usr/src/lib/fm/topo/maps/SUNW,Sun-Fire-X4540/Sun-Fire-X4540-hc-topology.xmlgen @@ -29,7 +29,7 @@ use Getopt::Std; -my $sys_supported = {"name" => "Sun-Fire-X4550", +my $sys_supported = {"name" => "Sun-Fire-X4540", "prop_name" => "sfx4500", "num_bays" => "48"}; @@ -121,7 +121,7 @@ sub calc_sfx_prop sub calc_nodes { - my @pci0=(0, 0, 0, 39, 39, 39); + my @pci0=(0, 0, 0, 0x3c, 0x3c, 0x3c); my @pci1=(0x377, 0x375, 0x376, 0x377, 0x375, 0x376); my @pci2=(0xa, 0xb, 0xf, 0xa, 0xb, 0xf); @@ -131,7 +131,7 @@ sub calc_nodes $target = $bay % 8 ; $sid = 90 + $bay; - $physdev = "/pci\@" . $pci0[$controller] . + $physdev = "/pci\@" . sprintf("%x", $pci0[$controller]) . ",0/pci10de," . sprintf("%x", $pci1[$controller]) . "\@" . sprintf("%x", $pci2[$controller]) . "/pci1000,1000\@0"; diff --git a/usr/src/pkgdefs/SUNWfmd/prototype_i386 b/usr/src/pkgdefs/SUNWfmd/prototype_i386 index 7b69e66133..e4fb72787c 100644 --- a/usr/src/pkgdefs/SUNWfmd/prototype_i386 +++ b/usr/src/pkgdefs/SUNWfmd/prototype_i386 @@ -84,4 +84,4 @@ d none usr/platform/i86pc/lib/fm/topo/maps 755 root bin f none usr/platform/i86pc/lib/fm/topo/maps/chip-hc-topology.xml 444 root bin f none usr/platform/i86pc/lib/fm/topo/maps/i86pc-hc-topology.xml 444 root bin f none usr/platform/i86pc/lib/fm/topo/maps/Sun-Fire-X4500-hc-topology.xml 444 root bin -f none usr/platform/i86pc/lib/fm/topo/maps/Sun-Fire-X4550-hc-topology.xml 444 root bin +f none usr/platform/i86pc/lib/fm/topo/maps/Sun-Fire-X4540-hc-topology.xml 444 root bin |