merge of '1b158f684870f3107f58126d4ca5ced24b2c8927'

     and '1ef7e13b3e401c51337c45e399b1788d0deb4286'

3 files changed, 9 insertions, 48 deletions

diff --git a/packages/ixp4xx/ixp4xx-npe_0.1.bb b/packages/ixp4xx/ixp4xx-npe_0.1.bb
deleted file mode 100644
index 4008c1af11..0000000000
--- a/packages/ixp4xx/ixp4xx-npe_0.1.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-DESCRIPTION = "Firmware for the IXP4xx line of devices"
-MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
-HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp420.htm"
-LICENSE = "http://www.intel.com/design/network/swsup/np_sla/ixp400.htm"
-LICENSE_HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp425swr1.htm"
-PR = "r1"
-
-# You must download the following software to your OpenEmbedded downloads
-# directory before using this package:
-#
-#       IPL_ixp400AccessLibrary-2_1.zip
-#       IPL_ixp400NpeLibrary-2_1.zip
-#
-# To do this go to the LICENSE_HOMEPAGE above, register/login (using a
-# web browser which is supported by the login page), this will give you
-# access to the web page from which you can download the software - you
-# need the: "Intel® IXP400 Software and RedBoot* Boot Loader" and, from
-# this the "Intel Hardware Access Software" and "NPE Microcode" (both
-# versions 2.1, encryption is not required.)
-#
-# Store the files with the names given below in your downloads directory
-# and store the 32 character md5sum of the file in a file of the same
-# name with the additional extension .md5:
-#
-#       IPL_ixp400AccessLibrary-2_1.zip.md5
-#       IPL_ixp400NpeLibrary-2_1.zip.md5
-#
-
-SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400AccessLibrary-2_1.zip"
-inherit native
-S = ${WORKDIR}/ixp400_xscale_sw/src/npeDl
-
-do_compile() {
-	${CC} -Wall IxNpeMicrocode.c -o IxNpeMicrocode
-	${S}/IxNpeMicrocode 
-}
-
-do_install() {
-	install -d ${D}/lib/firmware
-	install ${S}/NPE-B.010c0200 ${D}/lib/firmware/
-}
diff --git a/packages/ixp4xx/ixp4xx-npe_2.3.bb b/packages/ixp4xx/ixp4xx-npe_2.3.bb
index 0885aec81b..b0b27a6f99 100644
--- a/packages/ixp4xx/ixp4xx-npe_2.3.bb
+++ b/packages/ixp4xx/ixp4xx-npe_2.3.bb
@@ -1,20 +1,20 @@
 DESCRIPTION = "NPE firmware for the IXP4xx line of devices"
 MAINTAINER = "Oyvind Repvik <nail@nslu2-linux.org>"
 LICENSE = "Intel Public Licence"
-PR = "r1"
+PR = "r2"
 DEPENDS = "ixp4xx-npe-native"
 
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_3.zip"
 S = ${WORKDIR}/ixp400_xscale_sw/src/npeDl
 
-FILES_${PN} = "${base_libdir}/firmware/NPE-B/NPE-B.010c0200"
+FILES_${PN} = "${base_libdir}/firmware/NPE-B.010c0200"
 
 do_compile() {
 	${STAGING_BINDIR}/IxNpeMicrocode 
 }
 
 do_install() {
-	install -d ${D}/${base_libdir}/firmware/NPE-B
-	install ${S}/NPE-B.010c0200 ${D}/${base_libdir}/firmware/NPE-B/
+	install -d ${D}/${base_libdir}/firmware/
+	install ${S}/NPE-B.010c0200 ${D}/${base_libdir}/firmware/
 }
 
diff --git a/packages/linux/ixp4xx-kernel_2.6.18.bb b/packages/linux/ixp4xx-kernel_2.6.18.bb
index f5af772052..7bf2b51a9a 100644
--- a/packages/linux/ixp4xx-kernel_2.6.18.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.18.bb
@@ -19,7 +19,7 @@ IXP4XX_PATCHES  = ""
 
 SVN_SRC = "http://svn.nslu2-linux.org/svnroot/kernel/branches/ixp_npe/patches/2.6.18"
 
-IXP4XX_PATCHES += "${SVN_SRC}/00-squashfs3.1.patch;patch=1"
+# IXP4XX_PATCHES += "${SVN_SRC}/00-squashfs3.1.patch;patch=1"
 IXP4XX_PATCHES += "${SVN_SRC}/02-nas100d-mac-addr.patch;patch=1"
 IXP4XX_PATCHES += "${SVN_SRC}/04-nslu2-mac-addr.patch;patch=1"
 # IXP4XX_PATCHES += "${SVN_SRC}/05-timer-ixp4xx.patch;patch=1"
@@ -30,8 +30,10 @@ IXP4XX_PATCHES += "${SVN_SRC}/15-jffs2-endian-config.patch;patch=1"
 IXP4XX_PATCHES += "${SVN_SRC}/20-nas100d-cmdline-fixup.patch;patch=1"
 IXP4XX_PATCHES += "${SVN_SRC}/20-nslu2-cmdline-fixup.patch;patch=1"
 IXP4XX_PATCHES += "${SVN_SRC}/30-ixp4xx-0.1.0-driver.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/31-ixp4xx-0.1.0-localfixes.patch;patch=1"
-IXP4XX_PATCHES += "${SVN_SRC}/32-nslu-setup-mac.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/31-ixp4xx-0.1.0-fix-compiler-issues.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/32-ixp4xx-0.1.0-fix-MAC-address-setting.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/36-ixp4xx-0.1.0-localfixes.patch;patch=1"
+IXP4XX_PATCHES += "${SVN_SRC}/37-nslu-setup-mac.patch;patch=1"
 IXP4XX_PATCHES += "${SVN_SRC}/40-scsi-idle.patch;patch=1"
 IXP4XX_PATCHES += "${SVN_SRC}/50-leds-arm-cpu-activity.patch;patch=1"
 # IXP4XX_PATCHES += "${SVN_SRC}/75-dsmg600.patch;patch=1"