[oe-commits] org.oe.dev ixp4xx-npe: Now builds NPE-C as well as NPE-B ethernet microcode.

[rwhitby commit]

ixp4xx-npe: Now builds NPE-C as well as NPE-B ethernet microcode.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: b25bbba02ddb4b23e57f722647bea8974b902b1e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b25bbba02ddb4b23e57f722647bea8974b902b1e
Files:
1
packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h
packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb
packages/ixp4xx/ixp4xx-npe_2.3.2.bb
Diffs:

#
# mt diff -rc4fbf61065d9d7e83f86e503659dfbdbce1bd539 -rb25bbba02ddb4b23e57f722647bea8974b902b1e
#
# 
# 
# patch "packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h"
#  from [15c8577df6dc6251306bcd9ff572530eaff73bfc]
#    to [fed099dff45f8ede7c01a82414c61991b7fb3918]
# 
# patch "packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb"
#  from [1a48057dbc3a9fcb7fa92f416961ed8baa393b5d]
#    to [c9dde74cca70ebe27b0fb0d8d7129d675cd1fa7b]
# 
# patch "packages/ixp4xx/ixp4xx-npe_2.3.2.bb"
#  from [55465679e61e65694d073e2a9d8591a9a4c5ccf3]
#    to [919cd093ac19788e178bc05921f065073ddff758]
# 
============================================================
--- packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h	15c8577df6dc6251306bcd9ff572530eaff73bfc
+++ packages/ixp4xx/ixp4xx-npe-native-2.3.2/IxNpeMicrocode.h	fed099dff45f8ede7c01a82414c61991b7fb3918
@@ -51,11 +51,11 @@
 // #define IX_NPEDL_NPEIMAGE_NPEC_DMA
 // #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_SPAN
 // #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_ETH_LEARN_FILTER_FIREWALL
-#define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_CCM_ETH
+// #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_AES_CCM_ETH
 // #define IX_NPEDL_NPEIMAGE_NPEC_CRYPTO_ETH_LEARN_FILTER_SPAN_FIREWALL
 // #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV
 // #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS
-// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL
+#define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_FIREWALL
 
 
 #include <stdio.h>
============================================================
--- packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb	1a48057dbc3a9fcb7fa92f416961ed8baa393b5d
+++ packages/ixp4xx/ixp4xx-npe-native_2.3.2.bb	c9dde74cca70ebe27b0fb0d8d7129d675cd1fa7b
@@ -1,6 +1,6 @@ LICENSE = "Intel Public Licence"
 DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
 LICENSE = "Intel Public Licence"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.3.2.bb-For-Instructions/IPL_ixp400NpeLibrary-2_3_2.zip"
 SRC_URI += "file://IxNpeMicrocode.h"
============================================================
--- packages/ixp4xx/ixp4xx-npe_2.3.2.bb	55465679e61e65694d073e2a9d8591a9a4c5ccf3
+++ packages/ixp4xx/ixp4xx-npe_2.3.2.bb	919cd093ac19788e178bc05921f065073ddff758
@@ -1,6 +1,6 @@ LICENSE = "Intel Public Licence"
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
 LICENSE = "Intel Public Licence"
-PR = "r0"
+PR = "r1"
 DEPENDS = "ixp4xx-npe-native"
 
 # You need to download the IPL_ixp400NpeLibrary-2_3_2.zip file (without crypto) from:
@@ -13,7 +13,7 @@ COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
 
 COMPATIBLE_MACHINE = "(nslu2|ixp4xx)"
 
-FILES_${PN} = "${base_libdir}/firmware/NPE-B"
+FILES_${PN} = "${base_libdir}/firmware/NPE-B ${base_libdir}/firmware/NPE-C"
 
 do_compile() {
 	${STAGING_BINDIR_NATIVE}/IxNpeMicrocode-${PV} -be
@@ -24,10 +24,14 @@ do_install() {
 	rm ${S}/NPE-B
 	mv ${S}/NPE-B.* ${S}/NPE-B
 	install ${S}/NPE-B ${D}/${base_libdir}/firmware/
+	rm ${S}/NPE-C
+	mv ${S}/NPE-C.* ${S}/NPE-C
+	install ${S}/NPE-C ${D}/${base_libdir}/firmware/
 }
 
 do_populate_staging() {
 	install -d ${STAGING_FIRMWARE_DIR}
 	install ${S}/NPE-B ${STAGING_FIRMWARE_DIR}/
+	install ${S}/NPE-C ${STAGING_FIRMWARE_DIR}/
 }