From dae6ee2ec2e83177a3b407486ee3291770bcbfca Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Fri, 16 Jun 2006 10:22:10 +0000
Subject: ixp4xx-csr: Added patch to remove MODUE_USE_COUNT stuff

---
 .../ixp4xx/ixp4xx-csr-2.1.1/module-use-count.patch | 24 ++++++++++++++++++++++
 packages/ixp4xx/ixp4xx-csr_2.1.1.bb                |  6 ++++--
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 packages/ixp4xx/ixp4xx-csr-2.1.1/module-use-count.patch

(limited to 'packages/ixp4xx')

diff --git a/packages/ixp4xx/ixp4xx-csr-2.1.1/module-use-count.patch b/packages/ixp4xx/ixp4xx-csr-2.1.1/module-use-count.patch
new file mode 100644
index 0000000000..0fc2c5270e
--- /dev/null
+++ b/packages/ixp4xx/ixp4xx-csr-2.1.1/module-use-count.patch
@@ -0,0 +1,24 @@
+ src/oslinux/IxLinuxInit.c |    3 ---
+ 1 files changed, 3 deletions(-)
+
+Index: ixp400_xscale_sw/src/oslinux/IxLinuxInit.c
+===================================================================
+--- ixp400_xscale_sw.orig/src/oslinux/IxLinuxInit.c
++++ ixp400_xscale_sw/src/oslinux/IxLinuxInit.c
+@@ -164,7 +164,6 @@
+ 	return -EEXIST;
+     }
+ 
+-    MOD_INC_USE_COUNT;   /* Increment use count to prevent premature rmmod-ing */
+     ixNpeDlSegmentedListHead = NULL;  /* Reset linked list which keeps track of Microcode fragments */
+     ixNpeDlSegmentedListTail = NULL;
+     ixNpeDlTotalBytesReadIn = 0;
+@@ -229,8 +228,6 @@
+ 	kfree (temp);
+     }
+ 
+-    MOD_DEC_USE_COUNT;
+-
+     return 0;
+ }
+ 
diff --git a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb
index c97a54bb74..0a6cbaa06d 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.1.1.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.1.1.bb
@@ -41,10 +41,11 @@ SRC_URI += "file://gcc4.patch;patch=1"
 SRC_URI += "file://oe-makefile.patch;patch=1"
 SRC_URI += "file://livelock.patch;patch=1"
 SRC_URI += "file://module-param.patch;patch=1"
+SRC_URI += "file://module-use-count.patch;patch=1"
 
 DEPENDS = "ixp-osal"
 S = "${WORKDIR}/ixp400_xscale_sw"
-PR = "r0"
+PR = "r1"
 
 COMPATIBLE_HOST = "^arm.*-linux.*"
 
@@ -81,7 +82,7 @@ EXTRA_OEMAKE = "'AR=${AR}' \
 		'${IX_TARGET}_COMPONENTS=${COMPONENTS}' \
 		'${IX_TARGET}_CODELETS_COMPONENTS=${CODELETS_COMPONENTS}' \
 		'IX_DEVICE=ixp42X' \
-		'IX_INCLUDE_MICROCODE=1' \
+		'IX_BUILD_MICROCODE=1' \
 		'IX_UTOPIAMODE=0' \
 		'IX_MPHYSINGLEPORT=1' \
 		${IX_ENSURE} \
@@ -122,4 +123,5 @@ PACKAGES = "${PN}"
 do_install () {
 	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/ixp400
 	install -m 0644 lib/${IX_TARGET}/ixp400.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/ixp400/
+	install -m 0644 lib/${IX_TARGET}/IxNpeMicrocode.dat ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/ixp400/
 }
-- 
cgit 1.2.3-korg