]> git.openpandora.org Git - openembedded.git/commitdiff
ixp4xx: fix ixp4xx NPE ethernet MAC for kernel 2.6.15-rc1 in all versions
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 18 Nov 2005 02:23:14 +0000 (02:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 18 Nov 2005 02:23:14 +0000 (02:23 +0000)
packages/ixp4xx/ixp-osal-1.5/2.6.patch
packages/ixp4xx/ixp-osal-2.0/2.6.patch
packages/ixp4xx/ixp-osal_1.5.bb
packages/ixp4xx/ixp-osal_2.0.bb
packages/ixp4xx/ixp4xx-csr_1.4.bb
packages/ixp4xx/ixp4xx-csr_1.5.bb
packages/ixp4xx/ixp4xx-csr_2.0.bb

index c762ddb9c7d1861842f15aaf32e3432a4b7154d4..3e47fe28def957c37fd867b7899df2944c749d77 100644 (file)
@@ -49,10 +49,10 @@ diff -Naur ixp_osal.orig/include/linux-2.6.h ixp_osal/include/linux-2.6.h
 +# define IXP425_EXP_BUS_BASE2_PHYS    IXP4XX_EXP_BUS_CS2_BASE_PHYS
 +#endif
 +#if !defined (IXP425_EthA_BASE_PHYS)
-+# define IXP425_EthA_BASE_PHYS                IXP4XX_EthA_BASE_PHYS
++# define IXP425_EthA_BASE_PHYS                (IXP4XX_PERIPHERAL_BASE_PHYS + 0x9000)
 +#endif
 +#if !defined (IXP425_EthB_BASE_PHYS)
-+# define IXP425_EthB_BASE_PHYS                IXP4XX_EthB_BASE_PHYS
++# define IXP425_EthB_BASE_PHYS                (IXP4XX_PERIPHERAL_BASE_PHYS + 0xA000)
 +#endif
 +#if !defined (IXP425_ICMR)
 +# define IXP425_ICMR                  IXP4XX_ICMR
index 8dc31d48df951b61a5df42bdbf6f5278eba6c1f5..6c143859a404dc7c29a05573152efd1300f3e61d 100644 (file)
@@ -37,10 +37,10 @@ diff -Naur ixp_osal.orig/include/linux-2.6.h ixp_osal/include/linux-2.6.h
 +# define IXP425_EXP_BUS_BASE2_PHYS    IXP4XX_EXP_BUS_CS2_BASE_PHYS
 +#endif
 +#if !defined (IXP425_EthA_BASE_PHYS)
-+# define IXP425_EthA_BASE_PHYS                IXP4XX_EthA_BASE_PHYS
++# define IXP425_EthA_BASE_PHYS                (IXP4XX_PERIPHERAL_BASE_PHYS + 0x9000)
 +#endif
 +#if !defined (IXP425_EthB_BASE_PHYS)
-+# define IXP425_EthB_BASE_PHYS                IXP4XX_EthB_BASE_PHYS
++# define IXP425_EthB_BASE_PHYS                (IXP4XX_PERIPHERAL_BASE_PHYS + 0xA000)
 +#endif
 +#if !defined (IXP425_ICMR)
 +# define IXP425_ICMR                  IXP4XX_ICMR
index 8de9983ddadbd991617591d9bb7a8bcb5d99bb51..c0e0cb930cce2548c1f6dc6d3f94224eadc76b2f 100644 (file)
@@ -21,7 +21,7 @@ LICENSE_HOMEPAGE = "http://www.intel.com/design/network/products/npfamily/ixp425
 SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/ixp400AccessLibrary-1_5.zip"
 SRC_URI += "file://2.6.patch;patch=1"
 S = "${WORKDIR}/ixp_osal"
-PR = "r0"
+PR = "r1"
 
 COMPATIBLE_HOST = "^armeb-linux.*"
 
index be72d9215b0d66839275c198cae371c03f171f1b..a5c332b476f27b493f7eec88006f25b08cbaba99 100644 (file)
@@ -23,7 +23,7 @@ SRC_URI += "file://Makefile.patch;patch=1"
 SRC_URI += "file://2.6.patch;patch=1"
 SRC_URI += "file://le.patch;patch=1"
 S = "${WORKDIR}/ixp_osal"
-PR = "r2"
+PR = "r3"
 
 COMPATIBLE_HOST = "^arm.*-linux.*"
 
index ca502ca4d99a4ed2413db97d00b49e83a44de046..788d303c678381d24bc872e26e927e0807978b19 100644 (file)
@@ -25,7 +25,7 @@ SRC_URI += "file://badpaths.patch;patch=1"
 SRC_URI += "file://build-timing-annoyance.patch;patch=1"
 
 S = "${WORKDIR}/ixp400_xscale_sw"
-PR = "r5"
+PR = "r6"
 
 COMPATIBLE_HOST = "^armeb-linux.*"
 
index d07e464f91651dafdccac81cdd4f3c6d6c476546..2feef7ea4a959193b1d1702ec1685e4baf128acc 100644 (file)
@@ -24,7 +24,7 @@ SRC_URI += "http://www.intel.com/Please-Read-The-BB-File/ixp400NpeLibrary-1_5.zi
 SRC_URI += "file://2.6.patch;patch=1"
 DEPENDS = "ixp-osal"
 S = "${WORKDIR}/ixp400_xscale_sw"
-PR = "r0"
+PR = "r1"
 
 COMPATIBLE_HOST = "^armeb-linux.*"
 
index 025a5ed49b5174421eba671770fba4cdfa00274c..3244bd39fce9a5bf715f1b275b0d6891f2e0c5f2 100644 (file)
@@ -27,7 +27,7 @@ SRC_URI += "file://2.6.14.patch;patch=1"
 SRC_URI += "file://le.patch;patch=1"
 DEPENDS = "ixp-osal"
 S = "${WORKDIR}/ixp400_xscale_sw"
-PR = "r3"
+PR = "r4"
 
 COMPATIBLE_HOST = "^arm.*-linux.*"