diff options
Diffstat (limited to 'recipes/ixp4xx/ixp4xx-csr-2.0')
-rw-r--r-- | recipes/ixp4xx/ixp4xx-csr-2.0/2.6.14.patch | 20 | ||||
-rw-r--r-- | recipes/ixp4xx/ixp4xx-csr-2.0/2.6.patch | 148 | ||||
-rw-r--r-- | recipes/ixp4xx/ixp4xx-csr-2.0/Makefile.patch | 61 | ||||
-rw-r--r-- | recipes/ixp4xx/ixp4xx-csr-2.0/le.patch | 24 |
4 files changed, 0 insertions, 253 deletions
diff --git a/recipes/ixp4xx/ixp4xx-csr-2.0/2.6.14.patch b/recipes/ixp4xx/ixp4xx-csr-2.0/2.6.14.patch deleted file mode 100644 index 9630e6cd4a..0000000000 --- a/recipes/ixp4xx/ixp4xx-csr-2.0/2.6.14.patch +++ /dev/null @@ -1,20 +0,0 @@ -# Additional patches for v2.0 on 2.6.14 ---- ixp400_xscale_sw/src/oslinux/IxLinuxInit.c.orig 2005-10-01 18:21:34.731233399 -0700 -+++ ixp400_xscale_sw/src/oslinux/IxLinuxInit.c 2005-10-01 18:21:45.811930663 -0700 -@@ -160,7 +160,6 @@ - return -EEXIST; - } - -- MOD_INC_USE_COUNT; /* Increment use count to prevent premature rmmod-ing */ - ixNpeDlSegmentedListHead = NULL; /* Reset linked list which keeps track of Microcode fragments */ - ixNpeDlSegmentedListTail = NULL; - ixNpeDlTotalBytesReadIn = 0; -@@ -225,8 +224,6 @@ - kfree (temp); - } - -- MOD_DEC_USE_COUNT; -- - return 0; - } - diff --git a/recipes/ixp4xx/ixp4xx-csr-2.0/2.6.patch b/recipes/ixp4xx/ixp4xx-csr-2.0/2.6.patch deleted file mode 100644 index 37d390bf71..0000000000 --- a/recipes/ixp4xx/ixp4xx-csr-2.0/2.6.patch +++ /dev/null @@ -1,148 +0,0 @@ -diff -Naur ixp400_xscale_sw.orig/Readme-Kernel-2_6-Patch.txt ixp400_xscale_sw/Readme-Kernel-2_6-Patch.txt ---- ixp400_xscale_sw.orig/Readme-Kernel-2_6-Patch.txt 1970-01-01 01:00:00.000000000 +0100 -+++ ixp400_xscale_sw/Readme-Kernel-2_6-Patch.txt 2005-09-28 19:50:30.000000000 +0200 -@@ -0,0 +1,49 @@ -+This file describes a patch to use version 1.5 of the Intel Ixp4XX -+Access Library with Linux 2.6 kernels. -+ -+Authors/History -+--------------- -+ -+This patch consists of the changes made by Marc Singer for use of -+version 1.5 of the library with the APEX bootloader, and a patch made -+by Robin Farine and Tom Winkler for use of version 1.4 of the library -+with Linux-2.6 kernels. These changes were merged together by Hannes -+Reich. -+ -+Both patches are incorporated in their entirety, with the exception of -+some tweaks to sleep times in the ethAcc code and modifications to -+the code in src/codelets/usb/ from the Robin Farine / Tom Winkler -+patch. -+ -+Status -+------ -+ -+This code has been tested on a Linksys NSLU2. It works in big-endian -+mode, performance seems around 10% faster than 1.4. -+ -+The code does not work in little-endian mode. It appears as though the -+hardware is initialised correctly, but packet receive / transmit done -+callbacks are never called. -+ -+Licence Information -+------------------- -+ -+The patch is licenced under the same conditions as the original Access -+Library 1.5 (INTEL SOFTWARE LICENSE AGREEMENT). The full text of the -+licence can be downloaded from: -+http://www.intel.com/design/network/swsup/np_sla/ixp400.htm -+ -+The patch is free, unsupported and the authors make no warranties. -+Use it at your own risk, do with it as you see fit so long as you do -+not violate the original licence agreement. -+ -+The authors permit derivative works based upon the patch. -+ -+References -+---------- -+ -+The version 1.4 patch by Robin Farine and Tom Winkler is available from -+http://www.wnk.at/ixp400_accesslib_kernel26/data/patch_accesslib_kernel26_20040811.diff -+ -+The version 1.5 patch by Marc Singer is at -+http://wiki.buici.com/bin/view/Main/IXPAccessLibrary -diff -Naur ixp400_xscale_sw.orig/src/codelets/dmaAcc/IxDmaAccCodelet_p.h ixp400_xscale_sw/src/codelets/dmaAcc/IxDmaAccCodelet_p.h ---- ixp400_xscale_sw.orig/src/codelets/dmaAcc/IxDmaAccCodelet_p.h 2005-08-24 00:16:36.000000000 +0200 -+++ ixp400_xscale_sw/src/codelets/dmaAcc/IxDmaAccCodelet_p.h 2005-08-24 00:18:02.000000000 +0200 -@@ -113,7 +113,7 @@ - * @return IX_FAIL - Error initialising codelet - */ - IX_STATUS --ixDmaAccCodeletInit(IxDmaNpeId npeId); -+ixDmaAccCodeletInit(IxNpeDlNpeId npeId); - - /** - * @fn ixDmaAccCodeletTestPerform( UINT16 transferLength, -diff -Naur ixp400_xscale_sw.orig/src/ethDB/include/IxEthDB_p.h ixp400_xscale_sw/src/ethDB/include/IxEthDB_p.h ---- ixp400_xscale_sw.orig/src/ethDB/include/IxEthDB_p.h 2005-08-24 00:16:36.000000000 +0200 -+++ ixp400_xscale_sw/src/ethDB/include/IxEthDB_p.h 2005-08-24 00:18:02.000000000 +0200 -@@ -633,7 +633,7 @@ - IX_ETH_DB_PUBLIC UINT32 ixEthDBKeyXORHash(void *macAddress); - - /* Port updates */ --IX_ETH_DB_PUBLIC IxEthDBStatus ixEthDBNPEUpdateHandler(IxEthDBPortId portID, IxEthDBFeature type); -+IX_ETH_DB_PUBLIC IxEthDBStatus ixEthDBNPEUpdateHandler(IxEthDBPortId portID, IxEthDBRecordType type); - IX_ETH_DB_PUBLIC void ixEthDBUpdatePortLearningTrees(IxEthDBPortMap triggerPorts); - IX_ETH_DB_PUBLIC void ixEthDBNPEAccessRequest(IxEthDBPortId portID); - IX_ETH_DB_PUBLIC void ixEthDBUpdateLock(void); -diff -Naur ixp400_xscale_sw.orig/src/include/IxTypes.h ixp400_xscale_sw/src/include/IxTypes.h ---- ixp400_xscale_sw.orig/src/include/IxTypes.h 2005-08-24 00:16:36.000000000 +0200 -+++ ixp400_xscale_sw/src/include/IxTypes.h 2005-08-26 01:19:15.000000000 +0200 -@@ -79,6 +79,10 @@ - #endif - #endif - -+#ifndef BIT -+#define BIT(x) ((1)<<(x)) -+#endif -+ - #include "IxOsalBackward.h" - - #endif /* IxTypes_H */ -diff -Naur ixp400_xscale_sw.orig/src/usb/include/usbprivatetypes.h ixp400_xscale_sw/src/usb/include/usbprivatetypes.h ---- ixp400_xscale_sw.orig/src/usb/include/usbprivatetypes.h 2005-08-24 00:16:36.000000000 +0200 -+++ ixp400_xscale_sw/src/usb/include/usbprivatetypes.h 2005-08-24 00:18:02.000000000 +0200 -@@ -164,6 +164,53 @@ - } USBEventProcessor; - - /* UDC Registers */ -+ -+#undef UDCCR -+#undef UDCCS0 -+#undef UDCCS1 -+#undef UDCCS2 -+#undef UDCCS3 -+#undef UDCCS4 -+#undef UDCCS5 -+#undef UDCCS6 -+#undef UDCCS7 -+#undef UDCCS8 -+#undef UDCCS9 -+#undef UDCCS10 -+#undef UDCCS11 -+#undef UDCCS12 -+#undef UDCCS13 -+#undef UDCCS14 -+#undef UDCCS15 -+#undef UICR0 -+#undef UICR1 -+#undef USIR0 -+#undef USIR1 -+#undef UFNHR -+#undef UFNLR -+#undef UBCR2 -+#undef UBCR4 -+#undef UBCR7 -+#undef UBCR9 -+#undef UBCR12 -+#undef UBCR14 -+#undef UDDR0 -+#undef UDDR5 -+#undef UDDR10 -+#undef UDDR15 -+#undef UDDR1 -+#undef UDDR2 -+#undef UDDR3 -+#undef UDDR4 -+#undef UDDR6 -+#undef UDDR7 -+#undef UDDR8 -+#undef UDDR9 -+#undef UDDR11 -+#undef UDDR12 -+#undef UDDR13 -+#undef UDDR14 -+ - typedef struct /* UDCRegisters */ - { - volatile UINT32 UDCCR; diff --git a/recipes/ixp4xx/ixp4xx-csr-2.0/Makefile.patch b/recipes/ixp4xx/ixp4xx-csr-2.0/Makefile.patch deleted file mode 100644 index c5a907e1f1..0000000000 --- a/recipes/ixp4xx/ixp4xx-csr-2.0/Makefile.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -Naur ixp400_xscale_sw.orig/Makefile ixp400_xscale_sw/Makefile ---- ixp400_xscale_sw/.pc/Makefile.patch/Makefile 2005-04-17 20:54:58.000000000 -0700 -+++ ixp400_xscale_sw/Makefile 2005-10-01 18:15:08.422924549 -0700 -@@ -312,9 +312,9 @@ - else - # linux compiler flags - --LINUX_MACH_CFLAGS := -D__LINUX_ARM_ARCH__=5 -mcpu=xscale -mtune=xscale -+LINUX_MACH_CFLAGS := -D__LINUX_ARM_ARCH__=5 -mtune=xscale - --CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -Wall -Wno-trigraphs -fno-common -pipe -mapcs-32 -mshort-load-bytes -msoft-float -DMODULE -Isrc/include -D__linux -DCPU=33 -DXSCALE=33 $(LINUX_MACH_CFLAGS) -+CFLAGS := -D__KERNEL__ -I$(LINUX_SRC)/include -Wall -Wno-trigraphs -fno-common -pipe -mapcs-32 -msoft-float -DMODULE -Isrc/include -D__linux -DCPU=33 -DXSCALE=33 $(LINUX_MACH_CFLAGS) - ifndef IX_INCLUDE_MICROCODE - CFLAGS += -DIX_NPEDL_READ_MICROCODE_FROM_FILE - endif -@@ -806,9 +806,11 @@ - - ifeq ($(IX_HOST_OS),linux) - ifndef IX_INCLUDE_MICROCODE -+ifdef IX_BUILD_MICROCODE - Makefile: $(NPE_CONVERTER) $(NPE_DAT) - endif - endif -+endif - - ################################################################ - # Rules to check that macros are defined. -@@ -1253,10 +1255,18 @@ - - ifndef IX_INCLUDE_MICROCODE - $(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(OSAL_MODULE) -+ touch $(OBJ_DIR)/ixp400.c -+ cp Makefile.kmod26 $(OBJ_DIR)/Makefile -+ make -C $(OBJ_DIR) - $(LD) $(LDFLAGS) $^ -o $@ -+ make -C $(OBJ_DIR) - else - $(OBJ_DIR)/ixp400.o: $(COMPONENTS:%=$(OBJ_DIR)/ixp400_%.o) $(NPE_PRODUCTION_HEADER_OBJ) $(OSAL_MODULE) -+ touch $(OBJ_DIR)/ixp400.c -+ cp Makefile.kmod26 $(OBJ_DIR)/Makefile -+ make -C $(OBJ_DIR) - $(LD) $(LDFLAGS) $^ -o $@ -+ make -C $(OBJ_DIR) - endif - - -diff -Naur ixp400_xscale_sw.orig/Makefile.kmod26 ixp400_xscale_sw/Makefile.kmod26 ---- ixp400_xscale_sw.orig/Makefile.kmod26 1970-01-01 01:00:00.000000000 +0100 -+++ ixp400_xscale_sw/Makefile.kmod26 2005-08-24 22:33:12.000000000 +0200 -@@ -0,0 +1,11 @@ -+obj-m := ixp400.o -+ -+PWD := $(shell pwd) -+ -+LINUX_SRC := $($(IX_TARGET)_KERNEL_DIR) -+ -+default: -+ $(MAKE) ARCH=arm CROSS_COMPILE=$(LINUX_CROSS_COMPILE) V=1 -C $(LINUX_SRC) SUBDIRS=$(PWD) modules -+ -+clean: -+ rm -f ixp400.ko diff --git a/recipes/ixp4xx/ixp4xx-csr-2.0/le.patch b/recipes/ixp4xx/ixp4xx-csr-2.0/le.patch deleted file mode 100644 index e32b795755..0000000000 --- a/recipes/ixp4xx/ixp4xx-csr-2.0/le.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- 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 - --#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 - - #endif - |