summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorEvan Lojewski <github@meklort.com>2020-11-06 18:36:48 -0700
committerGitHub <noreply@github.com>2020-11-06 18:36:48 -0700
commit480d53103ecbf4369e5e8dadf653072af7e6fdd5 (patch)
tree42e4026e511e946e7246ba921c9533b3cec4768a /utils
parent06da02d0232b94be4be5246fbf4094ebf91d08c5 (diff)
downloadbcm5719-ortega-480d53103ecbf4369e5e8dadf653072af7e6fdd5.tar.gz
bcm5719-ortega-480d53103ecbf4369e5e8dadf653072af7e6fdd5.zip
bcmflash: Fix default vendor and device ids. (#161)
Diffstat (limited to 'utils')
-rw-r--r--utils/bcmflash/nvm_blackbird.c16
-rw-r--r--utils/bcmflash/nvm_kh08p.c16
-rw-r--r--utils/bcmflash/nvm_talos2.c16
3 files changed, 24 insertions, 24 deletions
diff --git a/utils/bcmflash/nvm_blackbird.c b/utils/bcmflash/nvm_blackbird.c
index 7207294..dcec68a 100644
--- a/utils/bcmflash/nvm_blackbird.c
+++ b/utils/bcmflash/nvm_blackbird.c
@@ -73,14 +73,14 @@ NVRAMInfo2_t gBlackbirdNVRAMInfo2 = {
.func3PXEVLAN = htobe16(0),
.func2PXEVLAN = htobe16(0),
- .pciSubsystemF0GPHY = htobe16(0x1981),
.pciSubsystemF1GPHY = htobe16(0x1981),
- .pciSubsystemF2GPHY = htobe16(0x1981),
+ .pciSubsystemF0GPHY = htobe16(0x1981),
.pciSubsystemF3GPHY = htobe16(0x1981),
- .pciSubsystemF0SERDES = htobe16(0x1657),
+ .pciSubsystemF2GPHY = htobe16(0x1981),
.pciSubsystemF1SERDES = htobe16(0x1657),
- .pciSubsystemF2SERDES = htobe16(0x1657),
+ .pciSubsystemF0SERDES = htobe16(0x1657),
.pciSubsystemF3SERDES = htobe16(0x1657),
+ .pciSubsystemF2SERDES = htobe16(0x1657),
.UNKNOWN7 = 0, // [23C] 0
.UNKNOWN8 = 0, // [240] 0
@@ -113,10 +113,10 @@ NVRAMInfo_t gBlackbirdNVRAMInfo = {
.mfrData = { 0 },
.func1PXEVLAN = 0,
.func0PXEVLAN = 0,
- .vendorID = htobe16(0x1657), /*< PCI Vendor ID. */
- .deviceID = htobe16(0x14E4), /*< PCI Device ID. */
- .subsystemVendorID = htobe16(0x1657), /*< PCI Subsystem Vendor ID. */
- .subsystemDeviceID = htobe16(0x14E4), /*< PCI Subsystem Device ID. */
+ .deviceID = htobe16(0x1657), /*< PCI Device ID. */
+ .vendorID = htobe16(0x14E4), /*< PCI Vendor ID. */
+ .subsystemDeviceID = htobe16(0x1657), /*< PCI Subsystem Device ID. */
+ .subsystemVendorID = htobe16(0x14E4), /*< PCI Subsystem Vendor ID. */
.cpuClock = htobe16(66), /*< 66MHz, Legacy */
diff --git a/utils/bcmflash/nvm_kh08p.c b/utils/bcmflash/nvm_kh08p.c
index 4721f79..3deb019 100644
--- a/utils/bcmflash/nvm_kh08p.c
+++ b/utils/bcmflash/nvm_kh08p.c
@@ -73,14 +73,14 @@ NVRAMInfo2_t gKH08PNVRAMInfo2 = {
.func3PXEVLAN = htobe16(1),
.func2PXEVLAN = htobe16(1),
- .pciSubsystemF0GPHY = htobe16(0x1904),
.pciSubsystemF1GPHY = htobe16(0x1904),
- .pciSubsystemF2GPHY = htobe16(0x1904),
+ .pciSubsystemF0GPHY = htobe16(0x1904),
.pciSubsystemF3GPHY = htobe16(0x1904),
- .pciSubsystemF0SERDES = htobe16(0x1657),
+ .pciSubsystemF2GPHY = htobe16(0x1904),
.pciSubsystemF1SERDES = htobe16(0x1657),
- .pciSubsystemF2SERDES = htobe16(0x1657),
+ .pciSubsystemF0SERDES = htobe16(0x1657),
.pciSubsystemF3SERDES = htobe16(0x1657),
+ .pciSubsystemF2SERDES = htobe16(0x1657),
.UNKNOWN7 = 0, // [23C] 0
.UNKNOWN8 = 0, // [240] 0
@@ -113,10 +113,10 @@ NVRAMInfo_t gKH08PNVRAMInfo = {
.mfrData = { 0 },
.func1PXEVLAN = htobe16(1),
.func0PXEVLAN = htobe16(1),
- .vendorID = htobe16(0x1657), /*< PCI Vendor ID. */
- .deviceID = htobe16(0x14E4), /*< PCI Device ID. */
- .subsystemVendorID = htobe16(0x1657), /*< PCI Subsystem Vendor ID. */
- .subsystemDeviceID = htobe16(0x14E4), /*< PCI Subsystem Device ID. */
+ .deviceID = htobe16(0x1657), /*< PCI Device ID. */
+ .vendorID = htobe16(0x14E4), /*< PCI Vendor ID. */
+ .subsystemDeviceID = htobe16(0x1657), /*< PCI Subsystem Device ID. */
+ .subsystemVendorID = htobe16(0x14E4), /*< PCI Subsystem Vendor ID. */
.cpuClock = htobe16(66), /*< 66MHz, Legacy */
diff --git a/utils/bcmflash/nvm_talos2.c b/utils/bcmflash/nvm_talos2.c
index 361f813..c47e391 100644
--- a/utils/bcmflash/nvm_talos2.c
+++ b/utils/bcmflash/nvm_talos2.c
@@ -73,14 +73,14 @@ NVRAMInfo2_t gTalosIINVRAMInfo2 = {
.func3PXEVLAN = htobe16(0),
.func2PXEVLAN = htobe16(0),
- .pciSubsystemF0GPHY = htobe16(0x1981),
.pciSubsystemF1GPHY = htobe16(0x1981),
- .pciSubsystemF2GPHY = htobe16(0x1981),
+ .pciSubsystemF0GPHY = htobe16(0x1981),
.pciSubsystemF3GPHY = htobe16(0x1981),
- .pciSubsystemF0SERDES = htobe16(0x1657),
+ .pciSubsystemF2GPHY = htobe16(0x1981),
.pciSubsystemF1SERDES = htobe16(0x1657),
- .pciSubsystemF2SERDES = htobe16(0x1657),
+ .pciSubsystemF0SERDES = htobe16(0x1657),
.pciSubsystemF3SERDES = htobe16(0x1657),
+ .pciSubsystemF2SERDES = htobe16(0x1657),
.UNKNOWN7 = 0, // [23C] 0
.UNKNOWN8 = 0, // [240] 0
@@ -113,10 +113,10 @@ NVRAMInfo_t gTalosIINVRAMInfo = {
.mfrData = { 0 },
.func1PXEVLAN = 0,
.func0PXEVLAN = 0,
- .vendorID = htobe16(0x1657), /*< PCI Vendor ID. */
- .deviceID = htobe16(0x14E4), /*< PCI Device ID. */
- .subsystemVendorID = htobe16(0x1657), /*< PCI Subsystem Vendor ID. */
- .subsystemDeviceID = htobe16(0x14E4), /*< PCI Subsystem Device ID. */
+ .deviceID = htobe16(0x1657), /*< PCI Device ID. */
+ .vendorID = htobe16(0x14E4), /*< PCI Vendor ID. */
+ .subsystemDeviceID = htobe16(0x1657), /*< PCI Subsystem Device ID. */
+ .subsystemVendorID = htobe16(0x14E4), /*< PCI Subsystem Vendor ID. */
.cpuClock = htobe16(66), /*< 66MHz, Legacy */
OpenPOWER on IntegriCloud