From 7f7b1c131fe495aafbd8cbd9c2dd7b52fff35019 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Sun, 26 Feb 2006 12:55:56 +0000 Subject: ixp4xx-kernel: Update to 2.6.16-rc4-git9, update defconfig to add CODA_FS=m, update ds101-setup.c kernel commandline --- packages/linux/ixp4xx-kernel/2.6.15/defconfig | 2 +- .../ixp4xx-kernel/2.6.16/97-ds101-setup.patch | 22 ++++++---- packages/linux/ixp4xx-kernel_2.6.16-rc4-git5.bb | 50 ---------------------- packages/linux/ixp4xx-kernel_2.6.16-rc4-git9.bb | 50 ++++++++++++++++++++++ 4 files changed, 65 insertions(+), 59 deletions(-) delete mode 100644 packages/linux/ixp4xx-kernel_2.6.16-rc4-git5.bb create mode 100644 packages/linux/ixp4xx-kernel_2.6.16-rc4-git9.bb (limited to 'packages') diff --git a/packages/linux/ixp4xx-kernel/2.6.15/defconfig b/packages/linux/ixp4xx-kernel/2.6.15/defconfig index 8279471c78..597d406940 100644 --- a/packages/linux/ixp4xx-kernel/2.6.15/defconfig +++ b/packages/linux/ixp4xx-kernel/2.6.15/defconfig @@ -1561,7 +1561,7 @@ CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y # CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set -# CONFIG_CODA_FS is not set +CONFIG_CODA_FS=m # CONFIG_AFS_FS is not set # CONFIG_9P_FS is not set diff --git a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch index af829b52d8..5c922d2934 100644 --- a/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch +++ b/packages/linux/ixp4xx-kernel/2.6.16/97-ds101-setup.patch @@ -9,8 +9,10 @@ Signed-off-by: OEyvind Repvik arch/arm/mach-ixp4xx/ds101-setup.c | 245 +++++++++++++++++++++++++++++++++++++ 3 files changed, 254 insertions(+), 1 deletion(-) +Index: linux-2.6.15/arch/arm/mach-ixp4xx/ds101-setup.c +=================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ linux-ixp4xx/arch/arm/mach-ixp4xx/ds101-setup.c 2006-02-23 18:08:40.000000000 +0100 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/ds101-setup.c 2006-02-24 12:37:01.000000000 +0100 @@ -0,0 +1,245 @@ +/* + * Synology DS101 board setup @@ -225,7 +227,7 @@ Signed-off-by: OEyvind Repvik + */ + +static char ds101_command_line[] __initdata = -+ "root=/dev/sda1 rootfstype=ext3 init=/sbin/init " ++ "root=/dev/sda2 rootfstype=ext3 init=/sbin/init " + "rtc-rs5c372.probe=0,0x32 " + CONFIG_CMDLINE; + @@ -257,9 +259,11 @@ Signed-off-by: OEyvind Repvik + .timer = &ixp4xx_timer, + .init_machine = ds101_init, +MACHINE_END ---- linux-ixp4xx.orig/arch/arm/mach-ixp4xx/Kconfig 2006-02-23 18:08:38.000000000 +0100 -+++ linux-ixp4xx/arch/arm/mach-ixp4xx/Kconfig 2006-02-23 18:08:40.000000000 +0100 -@@ -94,6 +94,14 @@ config MACH_DSMG600 +Index: linux-2.6.15/arch/arm/mach-ixp4xx/Kconfig +=================================================================== +--- linux-2.6.15.orig/arch/arm/mach-ixp4xx/Kconfig 2006-02-24 11:44:49.000000000 +0100 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/Kconfig 2006-02-24 11:44:49.000000000 +0100 +@@ -94,6 +94,14 @@ DSM-G600 device. For more information on this platform, see http://www.nslu2-linux.org/ @@ -274,9 +278,11 @@ Signed-off-by: OEyvind Repvik # # Avila and IXDP share the same source for now. Will change in future # ---- linux-ixp4xx.orig/arch/arm/mach-ixp4xx/Makefile 2006-02-23 18:08:38.000000000 +0100 -+++ linux-ixp4xx/arch/arm/mach-ixp4xx/Makefile 2006-02-23 18:09:09.000000000 +0100 -@@ -11,4 +11,4 @@ obj-$(CONFIG_MACH_GTWX5715) += gtwx5715- +Index: linux-2.6.15/arch/arm/mach-ixp4xx/Makefile +=================================================================== +--- linux-2.6.15.orig/arch/arm/mach-ixp4xx/Makefile 2006-02-24 11:44:48.000000000 +0100 ++++ linux-2.6.15/arch/arm/mach-ixp4xx/Makefile 2006-02-24 11:44:49.000000000 +0100 +@@ -11,4 +11,4 @@ obj-$(CONFIG_MACH_NSLU2) += nslu2-pci.o nslu2-setup.o nslu2-power.o obj-$(CONFIG_MACH_NAS100D) += nas100d-pci.o nas100d-setup.o nas100d-power.o obj-$(CONFIG_MACH_DSMG600) += dsmg600-pci.o dsmg600-setup.o diff --git a/packages/linux/ixp4xx-kernel_2.6.16-rc4-git5.bb b/packages/linux/ixp4xx-kernel_2.6.16-rc4-git5.bb deleted file mode 100644 index e47f20a7ab..0000000000 --- a/packages/linux/ixp4xx-kernel_2.6.16-rc4-git5.bb +++ /dev/null @@ -1,50 +0,0 @@ -# Kernel for IXP4xx -# -# Increment PR_CONFIG for changes to the ixp4xx-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 = "r0.${PR_CONFIG}" - -include ixp4xx-kernel.inc - -# RPSRC = "http://www.rpsys.net/openzaurus/patches" - -# IXP4XX_PATCHES - full list of patches to apply -IXP4XX_PATCHES = "" - -IXP4XX_PATCHES += "file://patch-2.6.16-rc4-ide2;patch=1" -IXP4XX_PATCHES += "file://leds-class.patch;patch=1" -IXP4XX_PATCHES += "file://06-remove-extraversion.patch;patch=1" -IXP4XX_PATCHES += "file://10-mtdpart-redboot-fis-byteswap.patch;patch=1" -IXP4XX_PATCHES += "file://11-mtdpart-redboot-config-byteswap.patch;patch=1" -IXP4XX_PATCHES += "file://15-jffs2-endian-config.patch;patch=1" -IXP4XX_PATCHES += "file://951-ixp4xx-leds-cpu-activity.patch;patch=1" -IXP4XX_PATCHES += "file://40-rtc-class.patch;patch=1" -IXP4XX_PATCHES += "file://45-eeprom-notifier.patch;patch=1" -IXP4XX_PATCHES += "file://48-setup-byteswap-cmdline.patch;patch=1" -IXP4XX_PATCHES += "file://50-i2c-bus-ixp4xx-hwmon.patch;patch=1" -IXP4XX_PATCHES += "file://50-hwmon-ad741x.patch;patch=1" -IXP4XX_PATCHES += "file://65-loft-config.patch;patch=1" -IXP4XX_PATCHES += "file://70-artop-latency.patch;patch=1" -IXP4XX_PATCHES += "file://75-dsmg600.patch;patch=1" -IXP4XX_PATCHES += "file://82-nas100d-power.patch;patch=1" -IXP4XX_PATCHES += "file://85-timer.patch;patch=1" -IXP4XX_PATCHES += "file://91-maclist.patch;patch=1" -IXP4XX_PATCHES += "file://92-nas100d-maclist.patch;patch=1" -IXP4XX_PATCHES += "file://92-nslu2-maclist.patch;patch=1" -IXP4XX_PATCHES += "file://94-nas100d-setup.patch;patch=1" -IXP4XX_PATCHES += "file://94-nslu2-setup.patch;patch=1" -IXP4XX_PATCHES += "file://94-loft-setup.patch;patch=1" -IXP4XX_PATCHES += "file://96-pata-ixp4xx.patch;patch=1" -IXP4XX_PATCHES += "file://96-nas100d-leds.patch;patch=1" -IXP4XX_PATCHES += "file://96-nslu2-leds.patch;patch=1" -IXP4XX_PATCHES += "file://97-ds101-setup.patch;patch=1" -IXP4XX_PATCHES += "file://97-ds101-includes.patch;patch=1" -IXP4XX_PATCHES += "file://97-ds101-pci.patch;patch=1" -IXP4XX_PATCHES += "file://97-ds101-buttons.patch;patch=1" -IXP4XX_PATCHES += "file://97-ds101-doc.patch;patch=1" diff --git a/packages/linux/ixp4xx-kernel_2.6.16-rc4-git9.bb b/packages/linux/ixp4xx-kernel_2.6.16-rc4-git9.bb new file mode 100644 index 0000000000..e47f20a7ab --- /dev/null +++ b/packages/linux/ixp4xx-kernel_2.6.16-rc4-git9.bb @@ -0,0 +1,50 @@ +# Kernel for IXP4xx +# +# Increment PR_CONFIG for changes to the ixp4xx-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 = "r0.${PR_CONFIG}" + +include ixp4xx-kernel.inc + +# RPSRC = "http://www.rpsys.net/openzaurus/patches" + +# IXP4XX_PATCHES - full list of patches to apply +IXP4XX_PATCHES = "" + +IXP4XX_PATCHES += "file://patch-2.6.16-rc4-ide2;patch=1" +IXP4XX_PATCHES += "file://leds-class.patch;patch=1" +IXP4XX_PATCHES += "file://06-remove-extraversion.patch;patch=1" +IXP4XX_PATCHES += "file://10-mtdpart-redboot-fis-byteswap.patch;patch=1" +IXP4XX_PATCHES += "file://11-mtdpart-redboot-config-byteswap.patch;patch=1" +IXP4XX_PATCHES += "file://15-jffs2-endian-config.patch;patch=1" +IXP4XX_PATCHES += "file://951-ixp4xx-leds-cpu-activity.patch;patch=1" +IXP4XX_PATCHES += "file://40-rtc-class.patch;patch=1" +IXP4XX_PATCHES += "file://45-eeprom-notifier.patch;patch=1" +IXP4XX_PATCHES += "file://48-setup-byteswap-cmdline.patch;patch=1" +IXP4XX_PATCHES += "file://50-i2c-bus-ixp4xx-hwmon.patch;patch=1" +IXP4XX_PATCHES += "file://50-hwmon-ad741x.patch;patch=1" +IXP4XX_PATCHES += "file://65-loft-config.patch;patch=1" +IXP4XX_PATCHES += "file://70-artop-latency.patch;patch=1" +IXP4XX_PATCHES += "file://75-dsmg600.patch;patch=1" +IXP4XX_PATCHES += "file://82-nas100d-power.patch;patch=1" +IXP4XX_PATCHES += "file://85-timer.patch;patch=1" +IXP4XX_PATCHES += "file://91-maclist.patch;patch=1" +IXP4XX_PATCHES += "file://92-nas100d-maclist.patch;patch=1" +IXP4XX_PATCHES += "file://92-nslu2-maclist.patch;patch=1" +IXP4XX_PATCHES += "file://94-nas100d-setup.patch;patch=1" +IXP4XX_PATCHES += "file://94-nslu2-setup.patch;patch=1" +IXP4XX_PATCHES += "file://94-loft-setup.patch;patch=1" +IXP4XX_PATCHES += "file://96-pata-ixp4xx.patch;patch=1" +IXP4XX_PATCHES += "file://96-nas100d-leds.patch;patch=1" +IXP4XX_PATCHES += "file://96-nslu2-leds.patch;patch=1" +IXP4XX_PATCHES += "file://97-ds101-setup.patch;patch=1" +IXP4XX_PATCHES += "file://97-ds101-includes.patch;patch=1" +IXP4XX_PATCHES += "file://97-ds101-pci.patch;patch=1" +IXP4XX_PATCHES += "file://97-ds101-buttons.patch;patch=1" +IXP4XX_PATCHES += "file://97-ds101-doc.patch;patch=1" -- cgit v1.2.3