summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packages/ixp4xx/ixp-osal-2.0/le.patch61
-rw-r--r--packages/ixp4xx/ixp-osal_2.0.bb2
-rw-r--r--packages/ixp4xx/ixp4xx-csr-2.0/le.patch25
-rw-r--r--packages/ixp4xx/ixp4xx-csr_2.0.bb2
4 files changed, 36 insertions, 54 deletions
diff --git a/packages/ixp4xx/ixp-osal-2.0/le.patch b/packages/ixp4xx/ixp-osal-2.0/le.patch
index 082de51707..ecb93d7d76 100644
--- a/packages/ixp4xx/ixp-osal-2.0/le.patch
+++ b/packages/ixp4xx/ixp-osal-2.0/le.patch
@@ -1,64 +1,39 @@
-diff -bBdurN hannes/ixp_osal/include/modules/ioMem/IxOsalMemAccess.h merged/ixp_osal/include/modules/ioMem/IxOsalMemAccess.h
---- ixp_osal/include/modules/ioMem/IxOsalMemAccess.h 2005-04-17 20:56:25.000000000 -0700
-+++ ixp_osal/include/modules/ioMem/IxOsalMemAccess.h 2005-10-07 15:08:43.115207734 -0700
-@@ -84,7 +84,12 @@
+diff -urp ixp_osal/.pc/le.patch/include/modules/ioMem/IxOsalMemAccess.h ixp_osal/include/modules/ioMem/IxOsalMemAccess.h
+--- ixp_osal/.pc/le.patch/include/modules/ioMem/IxOsalMemAccess.h 2005-04-17 20:56:25.000000000 -0700
++++ ixp_osal/include/modules/ioMem/IxOsalMemAccess.h 2005-11-19 16:44:33.414684841 -0800
+@@ -84,7 +84,7 @@
#elif defined (IX_OSAL_LINUX_LE)
-+#ifndef __ARMEB__
-+//#define IX_SDRAM_LE_DATA_COHERENT
+-#define IX_SDRAM_LE_DATA_COHERENT
+#define IX_SDRAM_LE_ADDRESS_COHERENT
-+#else /* __ARMEB__ */
- #define IX_SDRAM_LE_DATA_COHERENT
-+#endif /* __ARMEB__ */
#elif defined (IX_OSAL_WINCE_LE)
-diff -bBdurN hannes/ixp_osal/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h merged/ixp_osal/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h
---- ixp_osal/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h 2005-04-17 20:56:27.000000000 -0700
-+++ ixp_osal/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h 2005-10-07 15:08:43.147209748 -0700
-@@ -171,7 +171,12 @@
+diff -urp ixp_osal/.pc/le.patch/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h ixp_osal/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h
+--- ixp_osal/.pc/le.patch/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h 2005-04-17 20:56:27.000000000 -0700
++++ ixp_osal/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h 2005-11-19 16:45:35.298578949 -0800
+@@ -171,7 +171,7 @@
***************************/
#if (IX_COMPONENT_NAME == ix_qmgr)
-+#ifndef __ARMEB__
-+//#define IX_OSAL_LE_DC_MAPPING
+-#define IX_OSAL_LE_DC_MAPPING
+#define IX_OSAL_LE_AC_MAPPING
-+#else /* __ARMEB__ */
- #define IX_OSAL_LE_DC_MAPPING
-+#endif /* __ARMEB__ */
#endif /* qmgr */
-diff -bBdurN hannes/ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h merged/ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h
---- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 2005-10-07 09:29:02.392729725 -0700
-+++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 2005-10-07 15:08:43.143209496 -0700
-@@ -85,6 +85,17 @@
- * Queue Manager
- */
- {
-+#ifndef __ARMEB__
-+ IX_OSAL_DYNAMIC_MAP, /* type */
-+ IX_OSAL_IXP400_QMGR_PHYS_BASE, /* physicalAddress */
-+ IX_OSAL_IXP400_QMGR_MAP_SIZE, /* size */
-+ 0,
-+ ixOsalLinuxMemMap, /* mapFunction */
-+ ixOsalLinuxMemUnmap, /* unmapFunction */
-+ 0,
-+ IX_OSAL_BE | IX_OSAL_LE_AC, /* endianType */
-+ "qMgr" /* name */
-+#else /* __ARMEB__ */
- #ifdef IXP425_QMGR_BASE_VIRT
- IX_OSAL_STATIC_MAP, /* type */
- IX_OSAL_IXP400_QMGR_PHYS_BASE, /* physicalAddress */
-@@ -103,6 +114,7 @@
+diff -urp ixp_osal/.pc/le.patch/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h
+--- ixp_osal/.pc/le.patch/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 2005-11-19 15:53:11.808771607 -0800
++++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 2005-11-19 16:51:40.729574072 -0800
+@@ -101,7 +101,7 @@ IxOsalMemoryMap ixOsalGlobalMemoryMap[]
+ ixOsalLinuxMemUnmap, /* unmapFunction */
+ #endif
0, /* refCount */
- IX_OSAL_BE | IX_OSAL_LE_DC, /* endianType */
+- IX_OSAL_BE | IX_OSAL_LE_DC, /* endianType */
++ IX_OSAL_BE | IX_OSAL_LE_AC, /* endianType */
"qMgr" /* name */
-+#endif /* __ARMEB__ */
},
- /*
diff -bBdurN hannes/ixp_osal/include/modules/ioMem/IxOsalIoMem.h merged/ixp_osal/include/modules/ioMem/IxOsalIoMem.h
--- ixp_osal/include/modules/ioMem/IxOsalIoMem.h 2005-04-17 20:56:25.000000000 -0700
+++ ixp_osal/include/modules/ioMem/IxOsalIoMem.h 2005-10-07 16:20:27.786083595 -0700
diff --git a/packages/ixp4xx/ixp-osal_2.0.bb b/packages/ixp4xx/ixp-osal_2.0.bb
index a5c332b476..a0832c6eaa 100644
--- a/packages/ixp4xx/ixp-osal_2.0.bb
+++ b/packages/ixp4xx/ixp-osal_2.0.bb
@@ -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 = "r3"
+PR = "r4"
COMPATIBLE_HOST = "^arm.*-linux.*"
diff --git a/packages/ixp4xx/ixp4xx-csr-2.0/le.patch b/packages/ixp4xx/ixp4xx-csr-2.0/le.patch
index 5a36f38bd6..e32b795755 100644
--- a/packages/ixp4xx/ixp4xx-csr-2.0/le.patch
+++ b/packages/ixp4xx/ixp4xx-csr-2.0/le.patch
@@ -1,17 +1,24 @@
-diff -bBdurN hannes/ixp400_xscale_sw/src/include/IxQMgr.h merged/ixp400_xscale_sw/src/include/IxQMgr.h
---- ixp400_xscale_sw/src/include/IxQMgr.h 2005-04-17 20:55:31.000000000 -0700
-+++ ixp400_xscale_sw/src/include/IxQMgr.h 2005-10-07 15:08:42.723183066 -0700
-@@ -96,8 +96,13 @@
+--- ixp400_xscale_sw/.pc/le.patch/src/include/IxQMgr.h 2005-04-17 20:55:31.000000000 -0700
++++ ixp400_xscale_sw/src/include/IxQMgr.h 2005-11-19 16:01:52.817556623 -0800
+@@ -87,7 +87,9 @@
+ /*
+ * Define QMgr's IoMem macros, in DC mode if in LE
+ * regular if in BE. (Note: For Linux LSP gold release
+- * may need to adjust mode.
++ * may need to adjust mode. For standard Linux kernels
++ * data coherent access is not used, therefore address
++ * coherency must be set.
+ */
+ #if defined (__BIG_ENDIAN)
+
+@@ -96,8 +98,8 @@
#else
-+#ifndef __ARMEB__
+-#define IX_QMGR_INLINE_READ_LONG IX_OSAL_READ_LONG_LE_DC
+-#define IX_QMGR_INLINE_WRITE_LONG IX_OSAL_WRITE_LONG_LE_DC
+#define IX_QMGR_INLINE_READ_LONG IX_OSAL_READ_LONG_LE_AC
+#define IX_QMGR_INLINE_WRITE_LONG IX_OSAL_WRITE_LONG_LE_AC
-+#else /* __ARMEB__ */
- #define IX_QMGR_INLINE_READ_LONG IX_OSAL_READ_LONG_LE_DC
- #define IX_QMGR_INLINE_WRITE_LONG IX_OSAL_WRITE_LONG_LE_DC
-+#endif /* __ARMEB__ */
#endif
diff --git a/packages/ixp4xx/ixp4xx-csr_2.0.bb b/packages/ixp4xx/ixp4xx-csr_2.0.bb
index 3244bd39fc..a7a786c594 100644
--- a/packages/ixp4xx/ixp4xx-csr_2.0.bb
+++ b/packages/ixp4xx/ixp4xx-csr_2.0.bb
@@ -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 = "r4"
+PR = "r5"
COMPATIBLE_HOST = "^arm.*-linux.*"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 21:49:08 +0000