summaryrefslogtreecommitdiff
path: root/packages/ixp4xx
diff options
context:
space:
mode:
Diffstat (limited to 'packages/ixp4xx')
-rw-r--r--packages/ixp4xx/ixp-osal-2.1/2.6.patch36
-rw-r--r--packages/ixp4xx/ixp-osal-2.1/Makefile.patch21
-rw-r--r--packages/ixp4xx/ixp-osal-2.1/assert.patch12
-rw-r--r--packages/ixp4xx/ixp-osal-2.1/invalidate-cache.patch27
-rw-r--r--packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch16
-rw-r--r--packages/ixp4xx/ixp-osal-2.1/le.patch36
-rw-r--r--packages/ixp4xx/ixp-osal_2.1.bb2
7 files changed, 89 insertions, 61 deletions
diff --git a/packages/ixp4xx/ixp-osal-2.1/2.6.patch b/packages/ixp4xx/ixp-osal-2.1/2.6.patch
index 6bf1c2c32d..9725b447c8 100644
--- a/packages/ixp4xx/ixp-osal-2.1/2.6.patch
+++ b/packages/ixp4xx/ixp-osal-2.1/2.6.patch
@@ -1,5 +1,11 @@
---- ixp_osal/os/linux/src/core/IxOsalOsMsgQ.c 2005-08-24 00:16:37.000000000 +0200
-+++ ixp_osal/os/linux/src/core/IxOsalOsMsgQ.c 2005-08-24 00:18:02.000000000 +0200
+ os/linux/src/core/IxOsalOsMsgQ.c | 2 +-
+ os/linux/src/core/IxOsalOsSemaphore.c | 6 +++---
+ os/linux/src/core/IxOsalOsServices.c | 20 ++++++++++++++++----
+ os/linux/src/core/IxOsalOsThread.c | 7 +------
+ 4 files changed, 21 insertions(+), 14 deletions(-)
+
+--- ixp_osal/os/linux/src/core/IxOsalOsMsgQ.c 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/os/linux/src/core/IxOsalOsMsgQ.c 1970-01-01 00:00:00.000000000 +0000
@@ -45,9 +45,9 @@
* -- End Intel Copyright Notice --
*/
@@ -11,8 +17,8 @@
#include <linux/interrupt.h>
#include "IxOsal.h"
---- ixp_osal/os/linux/src/core/IxOsalOsSemaphore.c 2005-08-24 00:16:37.000000000 +0200
-+++ ixp_osal/os/linux/src/core/IxOsalOsSemaphore.c 2005-08-26 15:58:16.000000000 +0200
+--- ixp_osal/os/linux/src/core/IxOsalOsSemaphore.c 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/os/linux/src/core/IxOsalOsSemaphore.c 1970-01-01 00:00:00.000000000 +0000
@@ -46,7 +46,7 @@
*/
@@ -22,7 +28,7 @@
#include "IxOsal.h"
/* Define a large number */
-@@ -93,7 +93,7 @@
+@@ -93,7 +93,7 @@ ixOsalSemaphoreWait (IxOsalOsSemaphore *
{
IX_STATUS ixStatus = IX_SUCCESS;
@@ -40,8 +46,8 @@
if (in_irq ())
{
---- ixp_osal/os/linux/src/core/IxOsalOsServices.c 2005-04-17 20:56:28.000000000 -0700
-+++ ixp_osal/os/linux/src/core/IxOsalOsServices.c 2005-10-01 16:37:00.876444607 -0700
+--- ixp_osal/os/linux/src/core/IxOsalOsServices.c 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/os/linux/src/core/IxOsalOsServices.c 1970-01-01 00:00:00.000000000 +0000
@@ -54,6 +54,7 @@
#include <linux/time.h>
#include <linux/sched.h>
@@ -50,7 +56,7 @@
#include "IxOsal.h"
-@@ -89,7 +90,7 @@
+@@ -89,7 +90,7 @@ static IxOsalInfoType IxOsalInfo[NR_IRQS
/*
* General interrupt handler
*/
@@ -59,7 +65,7 @@
ixOsalOsIsrProxy (int irq, void *dev_id, struct pt_regs *regs)
{
IxOsalInfoType *isr_proxy_info = (IxOsalInfoType *) dev_id;
-@@ -98,6 +99,7 @@
+@@ -98,6 +99,7 @@ ixOsalOsIsrProxy (int irq, void *dev_id,
"ixOsalOsIsrProxy: Interrupt used before ixOsalIrqBind was invoked");
isr_proxy_info->routine (isr_proxy_info->parameter);
@@ -67,7 +73,7 @@
}
/*
-@@ -105,11 +107,12 @@
+@@ -105,11 +107,12 @@ ixOsalOsIsrProxy (int irq, void *dev_id,
* This handler saves the interrupted Program Counter (PC)
* into a global variable
*/
@@ -81,7 +87,7 @@
}
/**************************************
-@@ -191,10 +194,15 @@
+@@ -191,10 +194,15 @@ ixOsalIrqUnbind (UINT32 vector)
PUBLIC UINT32
ixOsalIrqLock ()
{
@@ -98,7 +104,7 @@
}
/* Enable interrupts and task scheduling,
-@@ -204,7 +212,11 @@
+@@ -204,7 +212,11 @@ ixOsalIrqLock ()
PUBLIC void
ixOsalIrqUnlock (UINT32 lockKey)
{
@@ -110,7 +116,7 @@
}
PUBLIC UINT32
-@@ -329,7 +341,7 @@
+@@ -329,7 +341,7 @@ ixOsalBusySleep (UINT32 microseconds)
PUBLIC void
ixOsalSleep (UINT32 milliseconds)
{
@@ -119,8 +125,8 @@
{
set_current_state(TASK_INTERRUPTIBLE);
schedule_timeout ((milliseconds * HZ) / 1000);
---- ixp_osal/os/linux/src/core/IxOsalOsThread.c 2005-11-20 00:59:09.734097888 -0800
-+++ ixp_osal/os/linux/src/core/IxOsalOsThread.c 2005-11-20 01:00:07.057705036 -0800
+--- ixp_osal/os/linux/src/core/IxOsalOsThread.c 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/os/linux/src/core/IxOsalOsThread.c 1970-01-01 00:00:00.000000000 +0000
@@ -65,12 +65,7 @@ thread_internal (void *unused)
void *arg = IxOsalOsThreadData.arg;
static int seq = 0;
diff --git a/packages/ixp4xx/ixp-osal-2.1/Makefile.patch b/packages/ixp4xx/ixp-osal-2.1/Makefile.patch
index f852ea2b26..d687ebc070 100644
--- a/packages/ixp4xx/ixp-osal-2.1/Makefile.patch
+++ b/packages/ixp4xx/ixp-osal-2.1/Makefile.patch
@@ -1,18 +1,21 @@
-diff -Naur ixp_osal.orig/Makefile ixp_osal/Makefile
---- ixp_osal.orig/Makefile 2005-08-24 00:16:37.000000000 +0200
-+++ ixp_osal/Makefile 2005-08-24 00:18:02.000000000 +0200
-@@ -172,7 +172,7 @@
+ Makefile | 2 +-
+ os/linux/make/macros.mk | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- ixp_osal/Makefile 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/Makefile 1970-01-01 00:00:00.000000000 +0000
+@@ -185,7 +185,7 @@ endif
+ INCLUDE_DIRS = include $(OSAL_DIRS:%=$(MAIN_INC_PREFIX)/%) $(OSAL_DIRS:%=$(OS_INC_PREFIX)/%)
- # TODO push this to linux make
ifeq ($(IX_OSAL_MK_HOST_OS), linux)
-INCLUDE_DIRS += $(LINUX_SRC)/include/asm-arm/arch-ixp425/
+INCLUDE_DIRS += $(LINUX_SRC)/include/asm-arm/arch-ixp4xx/
endif
- CFLAGS += $(INCLUDE_DIRS:%=-I%)
---- ixp_osal/os/linux/make/macros.mk.orig 2005-10-01 15:50:19.544167880 -0700
-+++ ixp_osal/os/linux/make/macros.mk 2005-10-01 15:50:43.053647239 -0700
-@@ -88,10 +88,10 @@
+ CFLAGS += $(INCLUDE_DIRS:%=-I%)
+--- ixp_osal/os/linux/make/macros.mk 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/os/linux/make/macros.mk 1970-01-01 00:00:00.000000000 +0000
+@@ -88,10 +88,10 @@ AR := $(LINUX_CROSS_COMPILE)ar
# Compiler & linker options
# Compiler flags
diff --git a/packages/ixp4xx/ixp-osal-2.1/assert.patch b/packages/ixp4xx/ixp-osal-2.1/assert.patch
index 1dfc84ed12..a03113dcc2 100644
--- a/packages/ixp4xx/ixp-osal-2.1/assert.patch
+++ b/packages/ixp4xx/ixp-osal-2.1/assert.patch
@@ -1,7 +1,11 @@
# Unnecessary patch - reduces the code size slightly, gives clearer
# messages if IX_OSAL_ENSURE_ON is set
---- ixp_osal/include/IxOsalAssert.h 2005-11-20 15:19:59.128189352 -0800
-+++ ixp_osal/include/IxOsalAssert.h 2005-11-20 15:20:46.099145048 -0800
+# include/IxOsalAssert.h | 4 ++--
+# os/linux/include/core/IxOsalOsAssert.h | 9 ++++++++-
+# 2 files changed, 10 insertions(+), 3 deletions(-)
+#
+--- ixp_osal/include/IxOsalAssert.h 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/include/IxOsalAssert.h 1970-01-01 00:00:00.000000000 +0000
@@ -72,8 +72,8 @@
*/
#ifdef IX_OSAL_ENSURE_ON
@@ -13,8 +17,8 @@
#else
#define IX_OSAL_ENSURE(c, str)
---- ixp_osal/os/linux/include/core/IxOsalOsAssert.h 2005-09-24 20:57:00.000000000 -0700
-+++ ixp_osal/os/linux/include/core/IxOsalOsAssert.h 2005-11-20 15:25:32.273152843 -0800
+--- ixp_osal/os/linux/include/core/IxOsalOsAssert.h 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/os/linux/include/core/IxOsalOsAssert.h 1970-01-01 00:00:00.000000000 +0000
@@ -47,11 +47,18 @@
#ifndef IxOsalOsAssert_H
diff --git a/packages/ixp4xx/ixp-osal-2.1/invalidate-cache.patch b/packages/ixp4xx/ixp-osal-2.1/invalidate-cache.patch
index c6ec6ed6a7..33c1d132db 100644
--- a/packages/ixp4xx/ixp-osal-2.1/invalidate-cache.patch
+++ b/packages/ixp4xx/ixp-osal-2.1/invalidate-cache.patch
@@ -1,5 +1,10 @@
---- ixp_osal/os/linux/include/core/IxOsalOs.h 2005-08-24 00:16:37.000000000 +0200
-+++ ixp_osal/os/linux/include/core/IxOsalOs.h 2005-08-26 01:56:22.000000000 +0200
+ os/linux/include/core/IxOsalOs.h | 17 ++++++++++
+ os/linux/src/core/IxOsalOsCacheMMU.c | 56 +++++++++++++++++++++++++++++++++++
+ os/linux/src/core/IxOsalOsSymbols.c | 4 ++
+ 3 files changed, 76 insertions(+), 1 deletion(-)
+
+--- ixp_osal/os/linux/include/core/IxOsalOs.h 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/os/linux/include/core/IxOsalOs.h 1970-01-01 00:00:00.000000000 +0000
@@ -56,6 +56,7 @@
#include <linux/cache.h>
#include <linux/mm.h>
@@ -27,15 +32,15 @@
+#else
+
-+#define IX_OSAL_OS_CACHE_INVALIDATE(addr, size) ( invalidate_dcache_range((__u32)addr, (__u32)addr + size ))
++#define IX_OSAL_OS_CACHE_INVALIDATE(addr, size) ( invalidate_dcache_range((__u32)addr, (__u32)addr + size ))
#define IX_OSAL_OS_CACHE_FLUSH(addr, size) ( clean_dcache_range((__u32)addr, (__u32)addr + size ))
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */
- #define printf printk /* For backword compatibility, needs to move to better location */
-
---- ixp_osal/os/linux/src/core/IxOsalOsCacheMMU.c 2005-08-24 00:16:37.000000000 +0200
-+++ ixp_osal/os/linux/src/core/IxOsalOsCacheMMU.c 2005-08-26 01:56:22.000000000 +0200
-@@ -210,3 +210,59 @@
+ /* Cache preload not available*/
+ #define IX_OSAL_OS_CACHE_PRELOAD(addr,size) {}
+--- ixp_osal/os/linux/src/core/IxOsalOsCacheMMU.c 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/os/linux/src/core/IxOsalOsCacheMMU.c 1970-01-01 00:00:00.000000000 +0000
+@@ -210,3 +210,59 @@ ixOsalCacheDmaFree (void *ptr)
free_pages ((unsigned int) memptr, order);
}
}
@@ -95,9 +100,9 @@
+#undef IX_CLM
+
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)) */
---- ixp_osal/os/linux/src/core/IxOsalOsSymbols.c 2005-08-24 00:16:37.000000000 +0200
-+++ ixp_osal/os/linux/src/core/IxOsalOsSymbols.c 2005-08-30 19:19:33.000000000 +0200
-@@ -64,6 +64,10 @@
+--- ixp_osal/os/linux/src/core/IxOsalOsSymbols.c 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/os/linux/src/core/IxOsalOsSymbols.c 1970-01-01 00:00:00.000000000 +0000
+@@ -64,6 +64,10 @@ EXPORT_SYMBOL (ixOsalMemSet);
EXPORT_SYMBOL (ixOsalCacheDmaMalloc);
EXPORT_SYMBOL (ixOsalCacheDmaFree);
diff --git a/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch b/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch
index 28bd3d362b..70eec5e728 100644
--- a/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch
+++ b/packages/ixp4xx/ixp-osal-2.1/ixp4xx-header.patch
@@ -1,5 +1,9 @@
---- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 2005-11-20 00:51:37.637649252 -0800
-+++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 2005-11-20 00:51:45.890168551 -0800
+ os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h | 72 ++++++++++
+ os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h | 10 -
+ 2 files changed, 78 insertions(+), 4 deletions(-)
+
+--- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 1970-01-01 00:00:00.000000000 +0000
@@ -53,6 +53,8 @@
#error "Error: IxOsalOsIxp425Sys.h cannot be included directly before IxOsalOsIxp400.h"
#endif
@@ -9,7 +13,7 @@
/* Memory Base Address */
#define IX_OSAL_IXP400_EXP_BUS_PHYS_BASE IXP425_EXP_BUS_BASE2_PHYS
#define IX_OSAL_IXP400_EXP_BUS_BOOT_PHYS_BASE IXP425_EXP_BUS_BASE1_PHYS
-@@ -98,14 +98,14 @@ IxOsalMemoryMap ixOsalGlobalMemoryMap[]
+@@ -98,12 +100,12 @@ IxOsalMemoryMap ixOsalGlobalMemoryMap[]
* Queue Manager
*/
{
@@ -26,10 +30,8 @@
0, /* refCount */
IX_OSAL_BE | IX_OSAL_LE_DC, /* endianType */
"qMgr" /* name */
- },
-
---- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h 2005-09-06 00:17:15.000000000 -0700
-+++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h 2005-11-20 08:25:18.402543995 -0800
+--- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Base.h 1970-01-01 00:00:00.000000000 +0000
@@ -0,0 +1,72 @@
+/*
+ * Glue for the current linux definitons of this stuff.
diff --git a/packages/ixp4xx/ixp-osal-2.1/le.patch b/packages/ixp4xx/ixp-osal-2.1/le.patch
index 3fc5ddf624..a6936ea33b 100644
--- a/packages/ixp4xx/ixp-osal-2.1/le.patch
+++ b/packages/ixp4xx/ixp-osal-2.1/le.patch
@@ -1,6 +1,13 @@
---- 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
-@@ -105,8 +105,8 @@
+ include/modules/ioMem/IxOsalIoMem.h | 4 ++--
+ include/modules/ioMem/IxOsalMemAccess.h | 2 +-
+ os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h | 2 +-
+ os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h | 2 +-
+ os/linux/src/modules/ioMem/IxOsalOsIoMem.c | 3 +++
+ 5 files changed, 8 insertions(+), 5 deletions(-)
+
+--- ixp_osal/include/modules/ioMem/IxOsalIoMem.h 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/include/modules/ioMem/IxOsalIoMem.h 1970-01-01 00:00:00.000000000 +0000
+@@ -117,8 +117,8 @@ ixOsalCoreWordSwap (UINT32 wordIn)
#endif /* ndef __wince */
#define IX_OSAL_SWAP_SHORT(sData) ((sData >> 8) | ((sData & 0xFF) << 8))
@@ -11,8 +18,8 @@
#define IX_OSAL_BE_XSTOBUSL(wData) (wData)
#define IX_OSAL_BE_XSTOBUSS(sData) (sData)
---- ixp_osal/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
+--- ixp_osal/include/modules/ioMem/IxOsalMemAccess.h 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/include/modules/ioMem/IxOsalMemAccess.h 1970-01-01 00:00:00.000000000 +0000
@@ -84,7 +84,7 @@
#elif defined (IX_OSAL_LINUX_LE)
@@ -22,8 +29,8 @@
#elif defined (IX_OSAL_WINCE_LE)
---- 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-11-19 16:45:35.298578949 -0800
+--- ixp_osal/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/os/linux/include/platforms/ixp400/IxOsalOsIxp400CustomizedMapping.h 1970-01-01 00:00:00.000000000 +0000
@@ -171,7 +171,7 @@
***************************/
#if (IX_COMPONENT_NAME == ix_qmgr)
@@ -33,18 +40,19 @@
#endif /* qmgr */
---- ixp_osal/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,6 +101,6 @@ IxOsalMemoryMap ixOsalGlobalMemoryMap[]
+--- ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/os/linux/include/platforms/ixp400/ixp425/IxOsalOsIxp425Sys.h 1970-01-01 00:00:00.000000000 +0000
+@@ -107,7 +107,7 @@ IxOsalMemoryMap ixOsalGlobalMemoryMap[]
+ ixOsalLinuxMemMap, /* mapFunction */
ixOsalLinuxMemUnmap, /* unmapFunction */
0, /* refCount */
- IX_OSAL_BE | IX_OSAL_LE_DC, /* endianType */
-+ IX_OSAL_BE | IX_OSAL_LE_AC, /* endianType */
++ IX_OSAL_BE | IX_OSAL_LE_AC, /* endianType */
"qMgr" /* name */
},
---- ixp_osal/os/linux/src/modules/ioMem/IxOsalOsIoMem.c 2005-09-24 20:57:03.000000000 -0700
-+++ ixp_osal/os/linux/src/modules/ioMem/IxOsalOsIoMem.c 2005-11-20 15:21:33.670138502 -0800
+--- ixp_osal/os/linux/src/modules/ioMem/IxOsalOsIoMem.c 1970-01-01 00:00:00.000000000 +0000
++++ ixp_osal/os/linux/src/modules/ioMem/IxOsalOsIoMem.c 1970-01-01 00:00:00.000000000 +0000
@@ -45,6 +45,7 @@
* -- End Intel Copyright Notice --
*/
@@ -53,7 +61,7 @@
#include <asm/io.h>
#include <linux/ioport.h>
-@@ -54,6 +54,8 @@
+@@ -54,6 +55,8 @@
PUBLIC void
ixOsalLinuxMemMap (IxOsalMemoryMap * map)
{
diff --git a/packages/ixp4xx/ixp-osal_2.1.bb b/packages/ixp4xx/ixp-osal_2.1.bb
index 7b5ec197ba..ce9acce4e7 100644
--- a/packages/ixp4xx/ixp-osal_2.1.bb
+++ b/packages/ixp4xx/ixp-osal_2.1.bb
@@ -31,7 +31,7 @@ SRC_URI += "file://le.patch;patch=1"
SRC_URI += "file://assert.patch;patch=1"
S = "${WORKDIR}/ixp_osal"
-PR = "r0"
+PR = "r1"
COMPATIBLE_HOST = "^arm.*-linux.*"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 21:47:23 +0000