From 3caf621121b5bafc61251cf659e15492e61897a7 Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 10 Oct 2012 11:43:50 +0000 Subject: 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 --- package/ixp4xx-microcode/Makefile | 1 + package/ixp4xx-microcode/src/IxNpeMicrocode.h | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'package/ixp4xx-microcode') diff --git a/package/ixp4xx-microcode/Makefile b/package/ixp4xx-microcode/Makefile index 9ed912758..52b44f35f 100644 --- a/package/ixp4xx-microcode/Makefile +++ b/package/ixp4xx-microcode/Makefile @@ -48,6 +48,7 @@ define Package/ixp4xx-microcode/install $(INSTALL_DIR) $(1)/lib/firmware $(INSTALL_DIR) $(1)/usr/share/doc $(INSTALL_BIN) $(PKG_BUILD_DIR)/NPE-A $(1)/lib/firmware/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/NPE-A-HSS $(1)/lib/firmware/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/NPE-B $(1)/lib/firmware/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/NPE-C $(1)/lib/firmware/ $(INSTALL_DATA) $(PKG_BUILD_DIR)/LICENSE.IPL $(1)/usr/share/doc/ 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', -- cgit v1.2.3