ixp4xx-npe: Add automatic byte-swapping for LE firmware load

mdev: Update loadmicrocode.sh

diff --git a/conf/distro/debianslug.conf b/conf/distro/debianslug.conf
index ed39440..f99edfe 100644 (file)
--- a/conf/distro/debianslug.conf
+++ b/conf/distro/debianslug.conf
@@ -86,7 +86,6 @@ kernel-module-reiserfs \
 kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
-
 # Add modules required for firmware loading
 DEBIANSLUG_STANDARD_RDEPENDS += "\
 kernel-module-firmware-class \

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 7c8039b..cf93560 100644 (file)
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -86,7 +86,6 @@ kernel-module-reiserfs \
 kernel-module-nls-cp437 \
 kernel-module-nls-utf8 \
 "
-
 # Add modules required for firmware loading
 OPENSLUG_STANDARD_RDEPENDS += "\
 kernel-module-firmware-class \

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 (file)
index 0000000..1c3d1ff
--- /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 (file)
index 6dfb464..0000000
--- 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 (file)
index 0000000..1c3d1ff
--- /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 (file)
index 6dfb464..0000000
--- 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 fd4e9ea..d9f2dd3 100644 (file)
--- 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 ef1743e..b4c78f6 100644 (file)
--- 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 ca89248..c06b4c2 100644 (file)
--- 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 5cc710a..9e13c87 100644 (file)
--- 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/mdev/mdev_1.2.1.bb b/packages/mdev/mdev_1.2.1.bb
index 2e424f3..b2496f5 100644 (file)
--- 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}