From: John Bowler <jbowler@nslu2-linux.org>
Date: Mon, 9 May 2005 18:42:37 +0000 (+0000)
Subject: Change ixp drivers to allow compilation on -mm patched
X-Git-Tag: Release-2010-05/1~14194
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d7350ba10148e7b55d62aacb3e940b22b33e397;p=openembedded.git

Change ixp drivers to allow compilation on -mm patched
kernels and to allow netconsole to work.

BKrev: 427faf1dyQUk9YAOBAN896ZvmvtMrA
---

diff --git a/packages/ixp425-eth/files/mm4.patch b/packages/ixp425-eth/files/mm4.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/ixp425-eth/files/pollcontroller.patch b/packages/ixp425-eth/files/pollcontroller.patch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb
index 6332aeaadb..40e7f19f54 100644
--- a/packages/ixp425-eth/ixp425-eth_1.1.bb
+++ b/packages/ixp425-eth/ixp425-eth_1.1.bb
@@ -4,8 +4,10 @@ MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
 SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPatch-1_1.zip \
 	   file://makefile.patch;patch=1 \
 	   file://ethhdr.patch;patch=1 \
-	   file://intdriven.patch;patch=1"
-PR = "r1"
+	   file://intdriven.patch;patch=1 \
+	   file://pollcontroller.patch;patch=1 \
+	   file://mm4.patch;patch=1"
+PR = "r3"
 
 S = "${WORKDIR}"
 
@@ -13,6 +15,12 @@ COMPATIBLE_HOST = "^armeb-linux.*"
 
 inherit module
 
+# Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as
+# required.  Notice that this has to be done for each separately built
+# module as well!
+KERNEL_CC += "${TARGET_CC_ARCH} -mno-thumb-interwork"
+# KERNEL_LD +=
+
 do_ixp425_c_patch_fetch () {
 	if test ! -e ${DL_DIR}/ixp425_eth.c.patch.md5; then
 		cd ${DL_DIR}
diff --git a/packages/ixp4xx/ixp4xx-csr_1.4.bb b/packages/ixp4xx/ixp4xx-csr_1.4.bb
index b9738a86fc..47e0c63ad2 100644
--- a/packages/ixp4xx/ixp4xx-csr_1.4.bb
+++ b/packages/ixp4xx/ixp4xx-csr_1.4.bb
@@ -7,12 +7,18 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400AccessLibrary-1_4.zip
 	   file://badpaths.patch;patch=1 \
 	   file://build-timing-annoyance.patch;patch=1"
 S = "${WORKDIR}/ixp400_xscale_sw"
-PR = "r1"
+PR = "r2"
 
 COMPATIBLE_HOST = "^armeb-linux.*"
 
 inherit module
 
+# Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as
+# required.  Notice that this has to be done for each separately built
+# module as well!
+KERNEL_CC += "${TARGET_CC_ARCH} -mno-thumb-interwork"
+# KERNEL_LD +=
+
 #LINUX_MACH_CFLAGS := -D__LINUX_ARM_ARCH__=5 -mcpu=xscale -mtune=xscale
 CFLAGS = "-fno-common -D__KERNEL__ -DMODULE -D__linux -DCPU=33 -DXSCALE=33 \
 	  -D__LINUX_ARM_ARCH__=5 \