[oe-commits] org.oe.dev ixp4xx-npe: Add automatic byte-swapping for LE firmware load

blaster8 commit openembedded-commits at lists.openembedded.org
Tue Sep 26 13:02:50 UTC 2006


ixp4xx-npe: Add automatic byte-swapping for LE firmware load
mdev: Update loadmicrocode.sh

Author: blaster8 at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 60a1e8380dd7fc43fb994db1a4b4071e1a95b60b
ViewMTN: http://monotone.openembedded.org/revision.psp?id=60a1e8380dd7fc43fb994db1a4b4071e1a95b60b
Files:
1
packages/ixp4xx/ixp4xx-npe-native-2.1/header.patch
packages/ixp4xx/ixp4xx-npe-native-2.3
packages/ixp4xx/ixp4xx-npe-native-2.3/header.patch
packages/ixp4xx/ixp4xx-npe-native-2.1/IxNpeMicrocode.h
packages/ixp4xx/ixp4xx-npe-native-2.3/IxNpeMicrocode.h
conf/distro/debianslug.conf
conf/distro/openslug.conf
packages/ixp4xx/ixp4xx-npe-native_2.1.bb
packages/ixp4xx/ixp4xx-npe-native_2.3.bb
packages/ixp4xx/ixp4xx-npe_2.1.bb
packages/ixp4xx/ixp4xx-npe_2.3.bb
packages/mdev/mdev_1.2.1.bb
Diffs:

#
# mt diff -r8e21cbd2f118478c79dfdf3edc93eeca70660ee1 -r60a1e8380dd7fc43fb994db1a4b4071e1a95b60b
#
# 
# 
# delete "packages/ixp4xx/ixp4xx-npe-native-2.1/header.patch"
# 
# delete "packages/ixp4xx/ixp4xx-npe-native-2.3"
# 
# delete "packages/ixp4xx/ixp4xx-npe-native-2.3/header.patch"
# 
# add_dir "packages/ixp4xx/ixp4xx-npe-native-2.3"
# 
# add_file "packages/ixp4xx/ixp4xx-npe-native-2.1/IxNpeMicrocode.h"
#  content [15c8577df6dc6251306bcd9ff572530eaff73bfc]
# 
# add_file "packages/ixp4xx/ixp4xx-npe-native-2.3/IxNpeMicrocode.h"
#  content [15c8577df6dc6251306bcd9ff572530eaff73bfc]
# 
# patch "conf/distro/debianslug.conf"
#  from [5806671d11022c15fca22084f1721d9000dce847]
#    to [1ffb869451827f32b05695218e7f265f1c3900a7]
# 
# patch "conf/distro/openslug.conf"
#  from [63eaf538622f582e8f4bf4748a8818fb62b1e5af]
#    to [1ddcfc7142c3103e2f3f51d494d12774a299d99e]
# 
# patch "packages/ixp4xx/ixp4xx-npe-native_2.1.bb"
#  from [b9e4c09a2b4c72de8190caffff4b49f608c3bce3]
#    to [9badb190591f4577480c84e1a2ea844ce9fa7a61]
# 
# patch "packages/ixp4xx/ixp4xx-npe-native_2.3.bb"
#  from [609cfe3bfc3b4791f9a570f65a869366ccfc86f8]
#    to [1b6bb39b7c264e9e1b72318c168edc1148da12f9]
# 
# patch "packages/ixp4xx/ixp4xx-npe_2.1.bb"
#  from [8774f408bdc6667217580e2024ec74c9ccfa9e90]
#    to [67c677a5f8b0b766bf4c268f1bfd33169e9bda56]
# 
# patch "packages/ixp4xx/ixp4xx-npe_2.3.bb"
#  from [8ee563283617458a827aa8eb0ddd3b59ee07d6d7]
#    to [44e9449c132c6c1b1400b067809c15104f90e7a4]
# 
# patch "packages/mdev/mdev_1.2.1.bb"
#  from [74df40f958234a255525656cf4b9471056bdbc02]
#    to [31c8a6f5e5d8a7bbca05865742352c1024961150]
# 
============================================================
--- packages/ixp4xx/ixp4xx-npe-native-2.1/IxNpeMicrocode.h	15c8577df6dc6251306bcd9ff572530eaff73bfc
+++ packages/ixp4xx/ixp4xx-npe-native-2.1/IxNpeMicrocode.h	15c8577df6dc6251306bcd9ff572530eaff73bfc
@@ -0,0 +1,143 @@
+/*
+ * IxNpeMicrocode.h - Headerfile for compiling the Intel microcode C file
+ *
+ * Copyright (C) 2006 Christian Hohnstaedt <chohnstaedt at innominate.com>
+ *
+ * This file is released under the GPLv2
+ *
+ *
+ * compile with
+ *
+ * gcc -Wall IxNpeMicrocode.c -o IxNpeMicrocode
+ *
+ * Executing the resulting binary on your build-host creates the
+ * "NPE-[ABC].xxxxxxxx" files containing the selected microcode
+ *
+ * fetch the IxNpeMicrocode.c from the Intel Access Library.
+ * It will include this header.
+ *
+ * select Images for every NPE from the following
+ * (used C++ comments for easy uncommenting ....)
+ */
+
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS_TSLOT_SWITCH
+// #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_DMA
+// #define IX_NPEDL_NPEIMAGE_NPEA_ATM_MPHY_12_PORT
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0_ATM_MPHY_1_PORT
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0_ATM_SPHY_1_PORT
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0
+// #define IX_NPEDL_NPEIMAGE_NPEA_WEP
+
+
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEB_DMA
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS
+#define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_FIREWALL
+
+
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB
+// #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_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
+
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <endian.h>
+#include <byteswap.h>
+#include <string.h>
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define to_le32(x) (x)
+#define to_be32(x) bswap_32(x)
+#else
+#define to_be32(x) (x)
+#define to_le32(x) bswap_32(x)
+#endif
+
+struct dl_image {
+	unsigned magic;
+	unsigned id;
+	unsigned size;
+	unsigned data[0];
+};
+
+const unsigned IxNpeMicrocode_array[];
+
+int main(int argc, char *argv[])
+{
+	struct dl_image *image = (struct dl_image *)IxNpeMicrocode_array;
+	int imgsiz, i, fd, cnt;
+	const unsigned *arrayptr = IxNpeMicrocode_array;
+	const char *names[] = { "IXP425", "IXP465", "unknown" };
+	int bigendian = 1;
+
+	if (argc > 1) {
+		if (!strcmp(argv[1], "-le"))
+			bigendian = 0;
+		else if (!strcmp(argv[1], "-be"))
+			bigendian = 1;
+		else {
+			printf("Usage: %s <-le|-be>\n", argv[0]);
+			return EXIT_FAILURE;
+		}
+	}
+
+	for (image = (struct dl_image *)arrayptr, cnt=0;
+		(image->id != 0xfeedf00d) && (image->magic == 0xfeedf00d);
+		image = (struct dl_image *)(arrayptr), cnt++)
+	{
+		unsigned char field[4];
+		imgsiz = image->size + 3;
+		*(unsigned*)field = to_be32(image->id);
+		char filename[40], slnk[10];
+
+		sprintf(filename, "NPE-%c.%08x", (field[0] & 0xf) + 'A',
+			image->id);
+		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',
+			field[1], field[2], field[3], imgsiz*4, filename);
+		fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, 0644);
+		if (fd >= 0) {
+			for (i=0; i<imgsiz; i++) {
+				*(unsigned*)field = bigendian ?
+					to_be32(arrayptr[i]) :
+					to_le32(arrayptr[i]);
+				write(fd, field, sizeof(field));
+			}
+			close(fd);
+			unlink(slnk);
+			symlink(filename, slnk);
+		} else {
+			perror(filename);
+		}
+		arrayptr += imgsiz;
+	}
+	close(fd);
+	return 0;
+}
============================================================
--- packages/ixp4xx/ixp4xx-npe-native-2.3/IxNpeMicrocode.h	15c8577df6dc6251306bcd9ff572530eaff73bfc
+++ packages/ixp4xx/ixp4xx-npe-native-2.3/IxNpeMicrocode.h	15c8577df6dc6251306bcd9ff572530eaff73bfc
@@ -0,0 +1,143 @@
+/*
+ * IxNpeMicrocode.h - Headerfile for compiling the Intel microcode C file
+ *
+ * Copyright (C) 2006 Christian Hohnstaedt <chohnstaedt at innominate.com>
+ *
+ * This file is released under the GPLv2
+ *
+ *
+ * compile with
+ *
+ * gcc -Wall IxNpeMicrocode.c -o IxNpeMicrocode
+ *
+ * Executing the resulting binary on your build-host creates the
+ * "NPE-[ABC].xxxxxxxx" files containing the selected microcode
+ *
+ * fetch the IxNpeMicrocode.c from the Intel Access Library.
+ * It will include this header.
+ *
+ * select Images for every NPE from the following
+ * (used C++ comments for easy uncommenting ....)
+ */
+
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEA_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS_TSLOT_SWITCH
+// #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_DMA
+// #define IX_NPEDL_NPEIMAGE_NPEA_ATM_MPHY_12_PORT
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0_ATM_MPHY_1_PORT
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0_ATM_SPHY_1_PORT
+// #define IX_NPEDL_NPEIMAGE_NPEA_HSS0
+// #define IX_NPEDL_NPEIMAGE_NPEA_WEP
+
+
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEB_DMA
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_SPAN_FIREWALL_VLAN_QOS_HDR_CONV
+// #define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_FIREWALL_VLAN_QOS
+#define IX_NPEDL_NPEIMAGE_NPEB_ETH_LEARN_FILTER_SPAN_FIREWALL
+
+
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_MASK_FIREWALL_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_SPAN_VLAN_QOS_HDR_CONV_EXTMIB
+// #define IX_NPEDL_NPEIMAGE_NPEC_ETH_LEARN_FILTER_SPAN_MASK_FIREWALL_VLAN_QOS_EXTMIB
+// #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_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
+
+
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <endian.h>
+#include <byteswap.h>
+#include <string.h>
+
+#if __BYTE_ORDER == __LITTLE_ENDIAN
+#define to_le32(x) (x)
+#define to_be32(x) bswap_32(x)
+#else
+#define to_be32(x) (x)
+#define to_le32(x) bswap_32(x)
+#endif
+
+struct dl_image {
+	unsigned magic;
+	unsigned id;
+	unsigned size;
+	unsigned data[0];
+};
+
+const unsigned IxNpeMicrocode_array[];
+
+int main(int argc, char *argv[])
+{
+	struct dl_image *image = (struct dl_image *)IxNpeMicrocode_array;
+	int imgsiz, i, fd, cnt;
+	const unsigned *arrayptr = IxNpeMicrocode_array;
+	const char *names[] = { "IXP425", "IXP465", "unknown" };
+	int bigendian = 1;
+
+	if (argc > 1) {
+		if (!strcmp(argv[1], "-le"))
+			bigendian = 0;
+		else if (!strcmp(argv[1], "-be"))
+			bigendian = 1;
+		else {
+			printf("Usage: %s <-le|-be>\n", argv[0]);
+			return EXIT_FAILURE;
+		}
+	}
+
+	for (image = (struct dl_image *)arrayptr, cnt=0;
+		(image->id != 0xfeedf00d) && (image->magic == 0xfeedf00d);
+		image = (struct dl_image *)(arrayptr), cnt++)
+	{
+		unsigned char field[4];
+		imgsiz = image->size + 3;
+		*(unsigned*)field = to_be32(image->id);
+		char filename[40], slnk[10];
+
+		sprintf(filename, "NPE-%c.%08x", (field[0] & 0xf) + 'A',
+			image->id);
+		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',
+			field[1], field[2], field[3], imgsiz*4, filename);
+		fd = open(filename, O_CREAT | O_RDWR | O_TRUNC, 0644);
+		if (fd >= 0) {
+			for (i=0; i<imgsiz; i++) {
+				*(unsigned*)field = bigendian ?
+					to_be32(arrayptr[i]) :
+					to_le32(arrayptr[i]);
+				write(fd, field, sizeof(field));
+			}
+			close(fd);
+			unlink(slnk);
+			symlink(filename, slnk);
+		} else {
+			perror(filename);
+		}
+		arrayptr += imgsiz;
+	}
+	close(fd);
+	return 0;
+}
============================================================
--- conf/distro/debianslug.conf	5806671d11022c15fca22084f1721d9000dce847
+++ conf/distro/debianslug.conf	1ffb869451827f32b05695218e7f265f1c3900a7
@@ -86,7 +86,6 @@ kernel-module-nls-utf8 \
 kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
-
 # Add modules required for firmware loading
 DEBIANSLUG_STANDARD_RDEPENDS += "\
 kernel-module-firmware-class \
============================================================
--- conf/distro/openslug.conf	63eaf538622f582e8f4bf4748a8818fb62b1e5af
+++ conf/distro/openslug.conf	1ddcfc7142c3103e2f3f51d494d12774a299d99e
@@ -86,7 +86,6 @@ kernel-module-nls-utf8 \
 kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
-
 # Add modules required for firmware loading
 OPENSLUG_STANDARD_RDEPENDS += "\
 kernel-module-firmware-class \
============================================================
--- packages/ixp4xx/ixp4xx-npe-native_2.1.bb	b9e4c09a2b4c72de8190caffff4b49f608c3bce3
+++ packages/ixp4xx/ixp4xx-npe-native_2.1.bb	9badb190591f4577480c84e1a2ea844ce9fa7a61
@@ -1,18 +1,20 @@ LICENSE = "Intel Public Licence"
 DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
 MAINTAINER = "Oyvind Repvik <nail at nslu2-linux.org>"
 LICENSE = "Intel Public Licence"
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_1.zip"
-SRC_URI += "file://header.patch;patch=1"
+SRC_URI += "file://IxNpeMicrocode.h"
 inherit native
 S = ${WORKDIR}/ixp400_xscale_sw/src/npeDl
 
 do_compile() {
-	${CC} -Wall IxNpeMicrocode.c -o IxNpeMicrocode
+	mv ${WORKDIR}/IxNpeMicrocode.h ${S}/
+	gcc -Wall IxNpeMicrocode.c -o IxNpeMicrocode
 }
 
 do_stage() {
+	mv ${S}/IxNpeMicrocode ${S}/IxNpeMicrocode-${PV}
 	install -d ${STAGING_BINDIR}/
-	install -m 0755 IxNpeMicrocode ${STAGING_BINDIR}/IxNpeMicrocode
+	install -m 0755 ${S}/IxNpeMicrocode-${PV} ${STAGING_BINDIR}/
 }
============================================================
--- packages/ixp4xx/ixp4xx-npe-native_2.3.bb	609cfe3bfc3b4791f9a570f65a869366ccfc86f8
+++ packages/ixp4xx/ixp4xx-npe-native_2.3.bb	1b6bb39b7c264e9e1b72318c168edc1148da12f9
@@ -1,18 +1,20 @@ LICENSE = "Intel Public Licence"
 DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
 MAINTAINER = "Oyvind Repvik <nail at nslu2-linux.org>"
 LICENSE = "Intel Public Licence"
-PR = "r1"
+PR = "r3"
 
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_3.zip"
-SRC_URI += "file://header.patch;patch=1"
+SRC_URI += "file://IxNpeMicrocode.h"
 inherit native
 S = ${WORKDIR}/ixp400_xscale_sw/src/npeDl
 
 do_compile() {
-	${CC} -Wall IxNpeMicrocode.c -o IxNpeMicrocode
+	mv ${WORKDIR}/IxNpeMicrocode.h ${S}/
+	gcc -Wall IxNpeMicrocode.c -o IxNpeMicrocode
 }
 
 do_stage() {
+	mv ${S}/IxNpeMicrocode ${S}/IxNpeMicrocode-${PV}
 	install -d ${STAGING_BINDIR}/
-	install -m 0755 IxNpeMicrocode ${STAGING_BINDIR}/IxNpeMicrocode
+	install -m 0755 ${S}/IxNpeMicrocode-${PV} ${STAGING_BINDIR}/
 }
============================================================
--- packages/ixp4xx/ixp4xx-npe_2.1.bb	8774f408bdc6667217580e2024ec74c9ccfa9e90
+++ packages/ixp4xx/ixp4xx-npe_2.1.bb	67c677a5f8b0b766bf4c268f1bfd33169e9bda56
@@ -1,7 +1,7 @@ LICENSE = "Intel Public Licence"
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
 MAINTAINER = "Oyvind Repvik <nail at nslu2-linux.org>"
 LICENSE = "Intel Public Licence"
-PR = "r4"
+PR = "r5"
 DEPENDS = "ixp4xx-npe-native"
 
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_1.zip"
@@ -10,12 +10,20 @@ do_compile() {
 FILES_${PN} = "${base_libdir}/firmware/NPE-B"
 
 do_compile() {
-	${STAGING_BINDIR}/IxNpeMicrocode 
+        if test '${ARCH_BYTE_SEX}' = be
+        then
+		${STAGING_BINDIR}/IxNpeMicrocode-${PV} -be
+        fi
+        if test '${ARCH_BYTE_SEX}' = le
+        then
+                ${STAGING_BINDIR}/IxNpeMicrocode-${PV} -le
+        fi
 }
 
 do_install() {
 	install -d ${D}/${base_libdir}/firmware/
-        mv ${S}/NPE-B.010c0200 ${S}/NPE-B
+	rm ${S}/NPE-B
+	mv ${S}/NPE-B.* ${S}/NPE-B
 	install ${S}/NPE-B ${D}/${base_libdir}/firmware/
 }
 
============================================================
--- packages/ixp4xx/ixp4xx-npe_2.3.bb	8ee563283617458a827aa8eb0ddd3b59ee07d6d7
+++ packages/ixp4xx/ixp4xx-npe_2.3.bb	44e9449c132c6c1b1400b067809c15104f90e7a4
@@ -1,7 +1,7 @@ LICENSE = "Intel Public Licence"
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
 MAINTAINER = "Oyvind Repvik <nail at nslu2-linux.org>"
 LICENSE = "Intel Public Licence"
-PR = "r3"
+PR = "r5"
 DEPENDS = "ixp4xx-npe-native"
 
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_3.zip"
@@ -10,12 +10,20 @@ do_compile() {
 FILES_${PN} = "${base_libdir}/firmware/NPE-B"
 
 do_comp%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list