ixp4xx,ixp4225-eth: provide virtual/ixp-eth

Also on ixp4xx/ixp4xx-csr_2.0.bb (only) the ixp400.ko driver is now
installed in kernel/drivers, not drivers.  On all versions ixp-eth
now RDEPENDS on ixp4xx (this should happen automatically but probably
doesn't because the modules are done as independent module builds).

2 files changed, 15 insertions, 11 deletions

diff --git a/packages/ixp4xx/ixp-osal_2.0.bb b/packages/ixp4xx/ixp-osal_2.0.bb
index 7028b76b71..68ead18215 100644
--- a/packages/ixp4xx/ixp-osal_2.0.bb
+++ b/packages/ixp4xx/ixp-osal_2.0.bb
@@ -22,9 +22,9 @@ SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400AccessLibrary-
 SRC_URI += "file://Makefile.patch;patch=1"
 SRC_URI += "file://2.6.patch;patch=1"
 S = "${WORKDIR}/ixp_osal"
-PR = "r0"
+PR = "r1"
 
-COMPATIBLE_HOST = "^armeb-linux.*"
+COMPATIBLE_HOST = "^arm.*-linux.*"
 
 inherit module
 
@@ -34,17 +34,19 @@ inherit module
 KERNEL_CC += "${TARGET_CC_KERNEL_ARCH}"
 KERNEL_LD += "${TARGET_LD_KERNEL_ARCH}"
 
+IX_TARGET = "linux${NSLU2_ARCH_TYPE}e"
+
 EXTRA_OEMAKE = "'CC=${KERNEL_CC}' \
 		'LD=${KERNEL_LD}' \
 		'AR=${AR}' \
 		'IX_XSCALE_SW=${S}' \
-		'IX_TARGET=linuxbe' \
+		'IX_TARGET=${IX_TARGET}' \
 		'IX_DEVICE=ixp42X' \
 		'LINUX_SRC=${STAGING_KERNEL_DIR}' \
 		'LINUX_CROSS_COMPILE=${HOST_PREFIX}' \
 		"
 
-OSAL_PATH = "lib/ixp425/linux/linuxbe"
+OSAL_PATH = "lib/ixp425/linux/${IX_TARGET}"
 # This is a somewhat arbitrary choice:
 OSAL_DIR = "${STAGING_KERNEL_DIR}/ixp_osal"
 
diff --git a/packages/ixp4xx/ixp4xx-csr_2.0.bb b/packages/ixp4xx/ixp4xx-csr_2.0.bb
index 290bbeb897..ba0d9ff8e1 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.0.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.0.bb
@@ -26,9 +26,9 @@ SRC_URI += "file://2.6.patch;patch=1"
 SRC_URI += "file://2.6.14.patch;patch=1"
 DEPENDS = "ixp-osal"
 S = "${WORKDIR}/ixp400_xscale_sw"
-PR = "r0"
+PR = "r1"
 
-COMPATIBLE_HOST = "^armeb-linux.*"
+COMPATIBLE_HOST = "^arm.*-linux.*"
 
 inherit module
 
@@ -38,7 +38,9 @@ inherit module
 KERNEL_CC += "${TARGET_CC_KERNEL_ARCH}"
 KERNEL_LD += "${TARGET_LD_KERNEL_ARCH}"
 
-OSAL_PATH = "lib/ixp425/linux/linuxbe"
+IX_TARGET = "linux${NSLU2_ARCH_TYPE}e"
+
+OSAL_PATH = "lib/ixp425/linux/${IX_TARGET}"
 # This is a somewhat arbitrary choice:
 OSAL_DIR = "${STAGING_KERNEL_DIR}/ixp_osal"
 
@@ -49,7 +51,7 @@ EXTRA_OEMAKE = "'CC=${KERNEL_CC}' \
 		'LD=${KERNEL_LD}' \
 		'AR=${AR}' \
 		'IX_XSCALE_SW=${S}' \
-		'IX_TARGET=linuxbe' \
+		'IX_TARGET=${IX_TARGET}' \
 		'IX_DEVICE=ixp42X' \
 		'IX_MPHY=1' \
 		'IX_MPHYSINGLEPORT=1' \
@@ -64,7 +66,7 @@ EXTRA_OEMAKE = "'CC=${KERNEL_CC}' \
 do_compile () {
 	# The target makes the .ko as a side effect, as a result of the
 	# Makefile.patch
-	oe_runmake lib/linuxbe/ixp400.o
+	oe_runmake lib/${IX_TARGET}/ixp400.o
 }
 
 do_stage () {
@@ -73,6 +75,6 @@ do_stage () {
 }
 
 do_install () {
-	install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/ixp400
-	install -m 0644 lib/linuxbe/ixp400.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/ixp400/
+	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/
 }