nslu2-kernel: delete unused patches, add Debian config in 2.6.14

8 files changed, 11 insertions, 124 deletions

diff --git a/packages/linux/nslu2-kernel/2.6.14/10-ixp4xx-gpio.patch b/packages/linux/nslu2-kernel/2.6.14/10-ixp4xx-gpio.patch
deleted file mode 100644
index f3f1bc3129..0000000000
--- a/packages/linux/nslu2-kernel/2.6.14/10-ixp4xx-gpio.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- linux-2.6.14-rc2/include/asm-arm/arch-ixp4xx/platform.h	2005-09-24 13:17:24.000000000 +0200
-+++ test3/include/asm-arm/arch-ixp4xx/platform.h	2005-09-24 16:41:17.000000000 +0200
-@@ -93,7 +93,7 @@
- 
- static inline void gpio_line_config(u8 line, u32 direction)
- {
--	if (direction == IXP4XX_GPIO_OUT)
-+	if (direction == IXP4XX_GPIO_IN)
- 		*IXP4XX_GPIO_GPOER |= (1 << line);
- 	else
- 		*IXP4XX_GPIO_GPOER &= ~(1 << line);
diff --git a/packages/linux/nslu2-kernel/2.6.14/10-mtdpart-redboot-fis-byteswap.patch b/packages/linux/nslu2-kernel/2.6.14/10-mtdpart-redboot-fis-byteswap.patch
index bf115fd716..37d19bd1b0 100644
--- a/packages/linux/nslu2-kernel/2.6.14/10-mtdpart-redboot-fis-byteswap.patch
+++ b/packages/linux/nslu2-kernel/2.6.14/10-mtdpart-redboot-fis-byteswap.patch
@@ -1,3 +1,9 @@
+On IXP4XX systems the FIS directory is big endian even with a little
+endian kernel.  This patch recognises the FIS directory on such a
+system and byte swaps it to obtain a valid table based on the 'size'
+field of the FIS directory (the size field is know to always match the
+erase block size on such systems, and probably all systems.)
+
 --- linux-2.6.13/.pc/10-mtdpart-redboot-fis-byteswap.patch/drivers/mtd/redboot.c	2005-08-28 16:41:01.000000000 -0700
 +++ linux-2.6.13/drivers/mtd/redboot.c	2005-10-23 21:44:59.999694674 -0700
 @@ -89,8 +89,34 @@
diff --git a/packages/linux/nslu2-kernel/2.6.14/15-ixp4xx-set-irq-type-return.patch b/packages/linux/nslu2-kernel/2.6.14/15-ixp4xx-set-irq-type-return.patch
deleted file mode 100644
index a4130a3735..0000000000
--- a/packages/linux/nslu2-kernel/2.6.14/15-ixp4xx-set-irq-type-return.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-# The ixp4xx_set_irq_type API is missing return statements which causes
-# the result to be unusable and the error detection non existent.
-#
---- linux-2.6.13/arch/arm/mach-ixp4xx/orig/common.c	2005-09-25 09:52:57.658059680 -0700
-+++ linux-2.6.13/arch/arm/mach-ixp4xx/common.c	2005-09-25 09:53:02.354355199 -0700
-@@ -125,7 +125,8 @@
- 	} else if (type & IRQT_LOW) {
- 		int_style = IXP4XX_GPIO_STYLE_ACTIVE_LOW;
- 		irq_type = IXP4XX_IRQ_LEVEL;
--	}
-+	} else
-+		return -EINVAL;
- 
- 	ixp4xx_config_irq(irq, irq_type);
- 
-@@ -142,6 +143,8 @@
- 
- 	/* Set the new style */
- 	*int_reg |= (int_style << (line * IXP4XX_GPIO_STYLE_SIZE));
-+
-+	return 0;
- }
- 
- static void ixp4xx_irq_mask(unsigned int irq)
diff --git a/packages/linux/nslu2-kernel/2.6.14/90-arm-le.patch b/packages/linux/nslu2-kernel/2.6.14/90-arm-le.patch
deleted file mode 100644
index 7af75c736b..0000000000
--- a/packages/linux/nslu2-kernel/2.6.14/90-arm-le.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -urpN linux-2.6.11.12/arch/arm/boot/compressed/little-endian.S linux-2.6.11.12-le2/arch/arm/boot/compressed/little-endian.S
---- linux-2.6.11.12/arch/arm/boot/compressed/little-endian.S	1970-01-01 01:00:00.000000000 +0100
-+++ linux-2.6.11.12-le2/arch/arm/boot/compressed/little-endian.S	2005-07-17 12:13:55.000000000 +0200
-@@ -0,0 +1,13 @@
-+/*
-+ *  linux/arch/arm/boot/compressed/little-endian.S
-+ *
-+ *  Switch CPU into little endian mode.
-+ *  Author: Nicolas Pitre
-+ */
-+
-+	.section ".start", #alloc, #execinstr
-+
-+	mrc	p15, 0, r0, c1, c0, 0	@ read control reg
-+	bic	r0, r0, #(1 << 7)	@ enable little endian mode
-+	mcr	p15, 0, r0, c1, c0, 0	@ write control reg
-+
-diff -urpN linux-2.6.11.12/arch/arm/boot/compressed/Makefile linux-2.6.11.12-le2/arch/arm/boot/compressed/Makefile
---- linux-2.6.11.12/arch/arm/boot/compressed/Makefile	2005-06-12 04:45:37.000000000 +0200
-+++ linux-2.6.11.12-le2/arch/arm/boot/compressed/Makefile	2005-07-17 12:13:55.000000000 +0200
-@@ -56,6 +56,8 @@ endif
- 
- ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)
- OBJS		+= big-endian.o
-+else
-+OBJS		+= little-endian.o
- endif
- 
- #
diff --git a/packages/linux/nslu2-kernel/2.6.14/defconfig b/packages/linux/nslu2-kernel/2.6.14/defconfig
index e2704c2c97..5041d919c8 100644
--- a/packages/linux/nslu2-kernel/2.6.14/defconfig
+++ b/packages/linux/nslu2-kernel/2.6.14/defconfig
@@ -528,6 +528,7 @@ CONFIG_BLK_DEV_SD=y
 # CONFIG_CHR_DEV_ST is not set
 # CONFIG_CHR_DEV_OSST is not set
 CONFIG_BLK_DEV_SR=m
+# CONFIG_BLK_DEV_SR_VENDOR is not set
 CONFIG_CHR_DEV_SG=m
 # CONFIG_CHR_DEV_SCH is not set
 
@@ -573,13 +574,7 @@ CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_IPR is not set
 # CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_1280 is not set
-CONFIG_SCSI_QLA2XXX=y
-# CONFIG_SCSI_QLA21XX is not set
-# CONFIG_SCSI_QLA22XX is not set
-# CONFIG_SCSI_QLA2300 is not set
-# CONFIG_SCSI_QLA2322 is not set
-# CONFIG_SCSI_QLA6312 is not set
-# CONFIG_SCSI_QLA24XX is not set
+CONFIG_SCSI_QLA2XXX=n
 # CONFIG_SCSI_LPFC is not set
 # CONFIG_SCSI_DC395x is not set
 # CONFIG_SCSI_DC390T is not set
@@ -1124,6 +1119,7 @@ CONFIG_USB=y
 CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_SUSPEND is not set
 # CONFIG_USB_OTG is not set
 
 #
@@ -1372,6 +1368,7 @@ CONFIG_RAMFS=y
 #
 # CONFIG_ADFS_FS is not set
 # CONFIG_AFFS_FS is not set
+# CONFIG_ASFS_FS is not set
 # CONFIG_HFS_FS is not set
 # CONFIG_HFSPLUS_FS is not set
 # CONFIG_BEFS_FS is not set
diff --git a/packages/linux/nslu2-kernel_2.6.14-rc3.bb b/packages/linux/nslu2-kernel_2.6.14-rc3.bb
deleted file mode 100644
index 549128f064..0000000000
--- a/packages/linux/nslu2-kernel_2.6.14-rc3.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-# Kernel for NSLU2
-#
-# Increment PR_CONFIG for changes to the nslu2-kernel specific
-# defconfig (do *NOT* increment anything in here for changes
-# to other kernel configs!)
-PR_CONFIG = "0"
-#
-# Increment the number below (i.e. the digits after PR) when
-# making changes within this file or for changes to the patches
-# applied to the kernel.
-PR = "r3.${PR_CONFIG}"
-
-include nslu2-kernel.inc
-
-# N2K_EXTRA_PATCHES - list of patches to apply (can include
-#   patches to the files installed above)
-# N2K_PATCHES - full list of patches to apply, defaults to:
-#   file://nslu2_2.6.11.patch;patch=1
-#   file://usbnet.patch;patch=1
-#   file://ixp4xx_copy_from.patch;patch=1
-#   ${N2K_EXTRA_PATCHES}
-#
-# There are no added files no more.
-N2K_FILES = ""
-
-N2K_PATCHES = "\
-	file://10-ixp4xx-copy-from.patch;patch=1 \
-	file://10-ixp4xx-gpio.patch;patch=1 \
-	file://15-ixp4xx-writesb-l-w.patch;patch=1 \
-	file://20-timer.patch;patch=1 \
-	file://25-nslu2-arch-reset.patch;patch=1 \
-	file://30-i2c-x1205.patch;patch=1 \
-	file://50-nslu2-arch.patch;patch=1 \
-	file://50-nslu2-general.patch;patch=1 \
-	file://60-nslu2-beeper.patch;patch=1 \
-	file://90-ixp4xx-pci-le.patch;patch=1 \
-	file://anonymiser.patch;patch=1 \
-"
-
-# These options get added to the kernel command line, only put things
-# specific to the bootstrap of *this* kernel in here - DISTRO specfic
-# config must be in CMDLINE_ROOT (see the full definition of CMDLINE
-# in nslu2-kernel.inc)
-CMDLINE_KERNEL_OPTIONS = "x1205.hctosys=1"
diff --git a/packages/linux/nslu2-kernel_2.6.14-rc5.bb b/packages/linux/nslu2-kernel_2.6.14-rc5.bb
index 848650da28..5aa161732e 100644
--- a/packages/linux/nslu2-kernel_2.6.14-rc5.bb
+++ b/packages/linux/nslu2-kernel_2.6.14-rc5.bb
@@ -3,7 +3,7 @@
 # Increment PR_CONFIG for changes to the nslu2-kernel specific
 # defconfig (do *NOT* increment anything in here for changes
 # to other kernel configs!)
-PR_CONFIG = "1"
+PR_CONFIG = "2"
 #
 # Increment the number below (i.e. the digits after PR) when
 # making changes within this file or for changes to the patches
diff --git a/packages/linux/openslug-kernel_2.6.14-rc3.bb b/packages/linux/openslug-kernel_2.6.14-rc3.bb
deleted file mode 100644
index 36010dd40e..0000000000
--- a/packages/linux/openslug-kernel_2.6.14-rc3.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-# OpenSlug Kernel for NSLU2
-#
-# The only purpose to this is to allow the openslug kernel to
-# have an openslug specific defconfig - in openslug-kernel-${PV}
-include nslu2-kernel_${PV}.bb
-# Increment the following if the openslug-kernel defconfig is
-# changed.
-PR_CONFIG = "1"