diff options
| -rw-r--r-- | packages/ixp425-eth/ixp400-eth_1.4.bb | 13 | ||||
| -rw-r--r-- | packages/ixp425-eth/ixp425-eth_1.1.bb | 6 | ||||
| -rw-r--r-- | packages/ixp425-eth/ixp425-eth_1.2.bb | 8 | ||||
| -rw-r--r-- | packages/ixp4xx/ixp-osal_2.0.bb | 10 | ||||
| -rw-r--r-- | packages/ixp4xx/ixp4xx-csr_2.0.bb | 16 |
5 files changed, 36 insertions, 17 deletions
diff --git a/packages/ixp425-eth/ixp400-eth_1.4.bb b/packages/ixp425-eth/ixp400-eth_1.4.bb index 18251b2ddf..dbcb3411d9 100644 --- a/packages/ixp425-eth/ixp400-eth_1.4.bb +++ b/packages/ixp425-eth/ixp400-eth_1.4.bb @@ -1,7 +1,6 @@ # This is the Intel GPL IXP4XX ethernet driver (Linux) plus patches # to make it work on 2.6 kernels. # -DEPENDS = "ixp4xx-csr" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" SRC_URI = "ftp://aiedownload.intel.com/df-support/8500/eng/GPL_ixp400LinuxEthernetDriverPatch-1_4.zip" @@ -9,11 +8,16 @@ SRC_URI += "file://ixp400-le-be.patch;patch=1" SRC_URI += "file://makefile.patch;patch=1" SRC_URI += "file://2.6.13.patch;patch=1" SRC_URI += "file://2.6.14.patch;patch=1" -PR = "r0" +PR = "r1" + +DEPENDS = "ixp4xx-csr" +RDEPENDS = "ixp4xx-csr" S = "${WORKDIR}" -COMPATIBLE_HOST = "^armeb-linux.*" +COMPATIBLE_HOST = "^arm.*-linux.*" + +PROVIDES = "virtual/ixp-eth" inherit module @@ -26,9 +30,12 @@ KERNEL_LD += "${TARGET_LD_KERNEL_ARCH}" # This is a somewhat arbitrary choice: OSAL_DIR = "${STAGING_KERNEL_DIR}/ixp_osal" +IX_TARGET = "linux${NSLU2_ARCH_TYPE}e" + EXTRA_OEMAKE = "'CC=${KERNEL_CC}' \ 'LD=${KERNEL_LD}' \ 'PWD=${S}' \ + 'IX_TARGET=${IX_TARGET}' \ 'IXP4XX_CSR_DIR=${STAGING_INCDIR}/linux/ixp4xx-csr' \ 'OSAL_DIR=${OSAL_DIR}' \ 'IX_CFLAGS=-DIX_UTOPIAMODE=0 -DIX_MPHYSINGLEPORT=1' \ diff --git a/packages/ixp425-eth/ixp425-eth_1.1.bb b/packages/ixp425-eth/ixp425-eth_1.1.bb index cbf7e106ce..79243fa1d3 100644 --- a/packages/ixp425-eth/ixp425-eth_1.1.bb +++ b/packages/ixp425-eth/ixp425-eth_1.1.bb @@ -10,12 +10,16 @@ SRC_URI = "http://www.intel.com/design/network/swsup/ixp400LinuxEthernetDriverPa file://mm4.patch;patch=1" SRC_URI += "file://2.6.13.patch;patch=1" SRC_URI += "file://2.6.14.patch;patch=1" -PR = "r10" +PR = "r11" + +RDEPENDS = "ixp4xx-csr" S = "${WORKDIR}" COMPATIBLE_HOST = "^armeb-linux.*" +PROVIDES = "virtual/ixp-eth" + inherit module # Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as diff --git a/packages/ixp425-eth/ixp425-eth_1.2.bb b/packages/ixp425-eth/ixp425-eth_1.2.bb index fbb8a2f27c..3459291541 100644 --- a/packages/ixp425-eth/ixp425-eth_1.2.bb +++ b/packages/ixp425-eth/ixp425-eth_1.2.bb @@ -1,7 +1,6 @@ # This is the Intel GPL IXP4XX ethernet driver (Linux) plus patches # to make it work on 2.6 kernels. # -DEPENDS = "ixp4xx-csr" LICENSE = "GPL" MAINTAINER = "Chris Larson <kergoth@handhelds.org>" SRC_URI = "ftp://download.intel.com/design/network/swsup/ixp400linuxethernetdriverpatch-1_2.zip" @@ -9,12 +8,17 @@ SRC_URI += "file://ixp400linuxethernetdriver-1_2-kernel26_hr_20050929.patch;patc SRC_URI += "file://makefile.patch;patch=1" SRC_URI += "file://2.6.13.patch;patch=1" SRC_URI += "file://2.6.14.patch;patch=1" -PR = "r0" +PR = "r1" + +DEPENDS = "ixp4xx-csr" +RDEPENDS = "ixp4xx-csr" S = "${WORKDIR}" COMPATIBLE_HOST = "^armeb-linux.*" +PROVIDES = "virtual/ixp-eth" + inherit module # Add the architecture compiler flags to KERNEL_CC and KERNEL_LD as 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/ } |