merge of '300063bb2f3d1abb7a7532b48c45894ec6098d31'

     and '60a1e8380dd7fc43fb994db1a4b4071e1a95b60b'

13 files changed, 324 insertions, 261 deletions

diff --git a/packages/ixp4xx/ixp4xx-npe-native-2.1/IxNpeMicrocode.h b/packages/ixp4xx/ixp4xx-npe-native-2.1/IxNpeMicrocode.h
new file mode 100644
index 0000000000..1c3d1ff473
--- /dev/null
+++ b/packages/ixp4xx/ixp4xx-npe-native-2.1/IxNpeMicrocode.h
@@ -0,0 +1,143 @@
+/*
+ * IxNpeMicrocode.h - Headerfile for compiling the Intel microcode C file
+ *
+ * Copyright (C) 2006 Christian Hohnstaedt <chohnstaedt@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;
+}
diff --git a/packages/ixp4xx/ixp4xx-npe-native-2.1/header.patch b/packages/ixp4xx/ixp4xx-npe-native-2.1/header.patch
deleted file mode 100644
index 6dfb464ea8..0000000000
--- a/packages/ixp4xx/ixp4xx-npe-native-2.1/header.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -Naur a/IxNpeMicrocode.h b/IxNpeMicrocode.h
---- a/IxNpeMicrocode.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/IxNpeMicrocode.h	2006-08-24 14:26:31.000000000 +0100
-@@ -0,0 +1,117 @@
-+/*
-+ * IxNpeMicrocode.h - Headerfile for compiling the Intel microcode C file
-+ *
-+ * Copyright (C) 2006 Christian Hohnstaedt <chohnstaedt@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 <netinet/in.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <errno.h>
-+
-+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" };
-+
-+	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 = ntohl(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 = ntohl(arrayptr[i]);
-+				write(fd, field, sizeof(field));
-+			}
-+			close(fd);
-+			unlink(slnk);
-+			symlink(filename, slnk);
-+		} else {
-+			perror(filename);
-+		}
-+		arrayptr += imgsiz;
-+	}
-+	close(fd);
-+	return 0;
-+}
diff --git a/packages/ixp4xx/ixp4xx-npe-native-2.3/IxNpeMicrocode.h b/packages/ixp4xx/ixp4xx-npe-native-2.3/IxNpeMicrocode.h
new file mode 100644
index 0000000000..1c3d1ff473
--- /dev/null
+++ b/packages/ixp4xx/ixp4xx-npe-native-2.3/IxNpeMicrocode.h
@@ -0,0 +1,143 @@
+/*
+ * IxNpeMicrocode.h - Headerfile for compiling the Intel microcode C file
+ *
+ * Copyright (C) 2006 Christian Hohnstaedt <chohnstaedt@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;
+}
diff --git a/packages/ixp4xx/ixp4xx-npe-native-2.3/header.patch b/packages/ixp4xx/ixp4xx-npe-native-2.3/header.patch
deleted file mode 100644
index 6dfb464ea8..0000000000
--- a/packages/ixp4xx/ixp4xx-npe-native-2.3/header.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -Naur a/IxNpeMicrocode.h b/IxNpeMicrocode.h
---- a/IxNpeMicrocode.h	1970-01-01 01:00:00.000000000 +0100
-+++ b/IxNpeMicrocode.h	2006-08-24 14:26:31.000000000 +0100
-@@ -0,0 +1,117 @@
-+/*
-+ * IxNpeMicrocode.h - Headerfile for compiling the Intel microcode C file
-+ *
-+ * Copyright (C) 2006 Christian Hohnstaedt <chohnstaedt@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 <netinet/in.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <errno.h>
-+
-+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" };
-+
-+	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 = ntohl(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 = ntohl(arrayptr[i]);
-+				write(fd, field, sizeof(field));
-+			}
-+			close(fd);
-+			unlink(slnk);
-+			symlink(filename, slnk);
-+		} else {
-+			perror(filename);
-+		}
-+		arrayptr += imgsiz;
-+	}
-+	close(fd);
-+	return 0;
-+}
diff --git a/packages/ixp4xx/ixp4xx-npe-native_2.1.bb b/packages/ixp4xx/ixp4xx-npe-native_2.1.bb
index fd4e9ea5ad..d9f2dd3b28 100644
--- a/packages/ixp4xx/ixp4xx-npe-native_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-npe-native_2.1.bb
@@ -1,18 +1,20 @@
 DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
 MAINTAINER = "Oyvind Repvik <nail@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}/
 }
diff --git a/packages/ixp4xx/ixp4xx-npe-native_2.3.bb b/packages/ixp4xx/ixp4xx-npe-native_2.3.bb
index ef1743ebff..b4c78f6c0f 100644
--- a/packages/ixp4xx/ixp4xx-npe-native_2.3.bb
+++ b/packages/ixp4xx/ixp4xx-npe-native_2.3.bb
@@ -1,18 +1,20 @@
 DESCRIPTION = "Firmware converter for the IXP4xx line of devices"
 MAINTAINER = "Oyvind Repvik <nail@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}/
 }
diff --git a/packages/ixp4xx/ixp4xx-npe_2.1.bb b/packages/ixp4xx/ixp4xx-npe_2.1.bb
index ca89248fbb..c06b4c28fb 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.1.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
 MAINTAINER = "Oyvind Repvik <nail@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 @@ S = ${WORKDIR}/ixp400_xscale_sw/src/npeDl
 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/
 }
 
diff --git a/packages/ixp4xx/ixp4xx-npe_2.3.bb b/packages/ixp4xx/ixp4xx-npe_2.3.bb
index 5cc710ab69..9e13c8766b 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.3.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.3.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
 MAINTAINER = "Oyvind Repvik <nail@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 @@ S = ${WORKDIR}/ixp400_xscale_sw/src/npeDl
 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/
 }
 
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index 5011b1e070..784b67efbb 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -88,7 +88,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
            ${RPSRC}/usb_add_epalloc-r1.patch;patch=1 \
            ${DOSRC}/kexec-arm-r2.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
-           file://hrw-pcmcia-ids-r4.patch;patch=1 \
+           file://hrw-pcmcia-ids-r5.patch;patch=1 \
            file://locomo-kbd-hotkeys.patch;patch=1 \
            file://locomo-sysrq+keyrepeat.patch;patch=1 \
            file://locomo-lcd-def-bightness.patch;patch=1 \
diff --git a/packages/linux/linux-openzaurus_2.6.17+git.bb b/packages/linux/linux-openzaurus_2.6.17+git.bb
index 97bb0234b2..e379aa1534 100644
--- a/packages/linux/linux-openzaurus_2.6.17+git.bb
+++ b/packages/linux/linux-openzaurus_2.6.17+git.bb
@@ -42,7 +42,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;
            ${RPSRC}/poodle_audio-r1.patch;patch=1 \
            ${RPSRC}/nand_sharpsl_fix-r0.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
-           file://hrw-pcmcia-ids-r4.patch;patch=1 \
+           file://hrw-pcmcia-ids-r5.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb
index d6ba2f70c3..58fbdb00d5 100644
--- a/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/packages/linux/linux-openzaurus_2.6.17.bb
@@ -49,7 +49,7 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.17.tar.bz2 \
            ${RPSRC}/poodle_audio-r4.patch;patch=1 \
            ${RPSRC}/pxa27x_overlay-r2.patch;patch=1 \
            file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
-           file://hrw-pcmcia-ids-r4.patch;patch=1 \
+           file://hrw-pcmcia-ids-r5.patch;patch=1 \
            ${RPSRC}/logo_oh-r0.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/logo_oz-r2.patch.bz2;patch=1;status=unmergable \
            ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
diff --git a/packages/mdev/mdev_1.2.1.bb b/packages/mdev/mdev_1.2.1.bb
index 2e424f3644..b2496f5852 100644
--- a/packages/mdev/mdev_1.2.1.bb
+++ b/packages/mdev/mdev_1.2.1.bb
@@ -4,7 +4,7 @@ busybox. This adds a very small extra overhead in rootfs size      \
 (approx 4kB) but allows greater flexibility."
 HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 S = ${WORKDIR}/busybox-${PV}
 
diff --git a/packages/opie-mediaplayer1/opie-mediaplayer1.inc b/packages/opie-mediaplayer1/opie-mediaplayer1.inc
index f54ab4ebc8..8a13486f5d 100644
--- a/packages/opie-mediaplayer1/opie-mediaplayer1.inc
+++ b/packages/opie-mediaplayer1/opie-mediaplayer1.inc
@@ -2,7 +2,6 @@ DESCRIPTION = "The classic Opie media player"
 SECTION = "opie/multimedia"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "opie-mediaplayer2-skin-default"
 RDEPENDS = "opie-mediaplayer2-skin-default"
 RRECOMMENDS = "opie-mediaplayer1-libmadplugin opie-mediaplayer1-libwavplugin \
 opie-mediaplayer1-libmodplugin opie-mediaplayer1-libtremorplugin"