diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-10 11:43:50 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-10 11:43:50 +0000 |
commit | 3caf621121b5bafc61251cf659e15492e61897a7 (patch) | |
tree | 09074af10610aba10498049aea0e75ae629fc045 /package/ixp4xx-microcode/src | |
parent | 041cd34c5ad8a78ac3275539dcdcf673c814dfe3 (diff) | |
download | openwrt-3caf621121b5bafc61251cf659e15492e61897a7.tar.gz openwrt-3caf621121b5bafc61251cf659e15492e61897a7.zip |
ixp4xx, cns3xx: backport the latest round of fixes (as of r33684)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33685 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/ixp4xx-microcode/src')
-rw-r--r-- | package/ixp4xx-microcode/src/IxNpeMicrocode.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/package/ixp4xx-microcode/src/IxNpeMicrocode.h b/package/ixp4xx-microcode/src/IxNpeMicrocode.h index ffb22b200..4a843db10 100644 --- a/package/ixp4xx-microcode/src/IxNpeMicrocode.h +++ b/package/ixp4xx-microcode/src/IxNpeMicrocode.h @@ -27,7 +27,7 @@ #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV // #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS // #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_FIREWALL -// #define IX_NPEDL_NPEIMAGE_NPEA_HSS_2_PORT +#define IX_NPEDL_NPEIMAGE_NPEA_HSS_2_PORT // #define IX_NPEDL_NPEIMAGE_NPEA_DMA // #define IX_NPEDL_NPEIMAGE_NPEA_ATM_MPHY_12_PORT // #define IX_NPEDL_NPEIMAGE_NPEA_HSS0_ATM_MPHY_1_PORT @@ -118,7 +118,11 @@ int main(int argc, char *argv[]) sprintf(filename, "NPE-%c.%08x", (field[0] & 0xf) + 'A', image->id); - sprintf(slnk, "NPE-%c", (field[0] & 0xf) + 'A'); + if (image->id == 0x00090000) + sprintf(slnk, "NPE-%c-HSS", (field[0] & 0xf) + 'A'); + else + sprintf(slnk, "NPE-%c", (field[0] & 0xf) + 'A'); + printf("Writing image: %s.NPE_%c Func: %2x Rev: %02x.%02x " "Size: %5d to: '%s'\n", names[field[0] >> 4], (field[0] & 0xf) + 'A', |