openslug-kernel: version 2.6.14-rc5

9 files changed, 5 insertions, 53 deletions

diff --git a/conf/distro/openslug.conf b/conf/distro/openslug.conf
index 5755fa0cdb..de0a4f46fd 100644
--- a/conf/distro/openslug.conf
+++ b/conf/distro/openslug.conf
@@ -177,7 +177,7 @@ CVSDATE_diet-x11 ?= "20051005"
 # Select the correct versions of the kernel and modules
 PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-PREFERRED_VERSION_openslug-kernel ?= "2.6.14-rc4"
+PREFERRED_VERSION_openslug-kernel ?= "2.6.14-rc5"
 
 PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp425-eth"
 PREFERRED_VERSION_ixp4xx-csr ?= "1.4"
diff --git a/conf/distro/ucslugc.conf b/conf/distro/ucslugc.conf
index 730a6ae228..a8534aa05f 100644
--- a/conf/distro/ucslugc.conf
+++ b/conf/distro/ucslugc.conf
@@ -156,7 +156,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
 # Select the correct versions of the kernel and modules
 PREFERRED_PROVIDER_virtual/kernel ?= "openslug-kernel"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-PREFERRED_VERSION_openslug-kernel ?= "2.6.14-rc4"
+PREFERRED_VERSION_openslug-kernel ?= "2.6.14-rc5"
 
 PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp425-eth"
 PREFERRED_VERSION_ixp4xx-csr ?= "1.4"
diff --git a/packages/linux/nslu2-kernel.inc b/packages/linux/nslu2-kernel.inc
index 6b5167e66c..0128b6e532 100644
--- a/packages/linux/nslu2-kernel.inc
+++ b/packages/linux/nslu2-kernel.inc
@@ -280,10 +280,8 @@ redboot_fixup_arm() {
 		'wb 0xee110f10,4' \
 		'wb 0xe3c00080,4' \
 		'wb 0xee010f10,4' \
-		'A= $' \
-		'$( A3>; wb l,4; A= A4-; $) A3>' \
-		'$( A0>; !! 1; $) 0' || {
-		echo 'arch/${ARCH}/boot/${KERNEL_IMAGETYPE}: bad zImage length (not a multiple of 4)' >&2
+		'xp $,4' || {
+		echo 'ERROR: arch/${ARCH}/boot/${KERNEL_IMAGETYPE}: failed to byteswap zImage' >&2
 		return 1
 	}
 	mv "$1".new "$1"
diff --git a/packages/linux/nslu2-kernel_2.6.14-rc2.bb b/packages/linux/nslu2-kernel_2.6.14-rc2.bb
deleted file mode 100644
index e843fcfa29..0000000000
--- a/packages/linux/nslu2-kernel_2.6.14-rc2.bb
+++ /dev/null
@@ -1,46 +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 = "r6.${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-set-irq-type-return.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-beeper.patch;patch=1 \
-	file://50-nslu2-general.patch;patch=1 \
-	file://90-arm-le.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-rc4.bb b/packages/linux/nslu2-kernel_2.6.14-rc5.bb
index 5633f42e06..d6979446c0 100644
--- a/packages/linux/nslu2-kernel_2.6.14-rc4.bb
+++ b/packages/linux/nslu2-kernel_2.6.14-rc5.bb
@@ -8,7 +8,7 @@ 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 = "r1.${PR_CONFIG}"
+PR = "r0.${PR_CONFIG}"
 
 include nslu2-kernel.inc
 
diff --git a/packages/linux/openslug-kernel-2.6.14-rc4/.mtn2git_empty b/packages/linux/openslug-kernel-2.6.14-rc5/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/linux/openslug-kernel-2.6.14-rc4/.mtn2git_empty
+++ b/packages/linux/openslug-kernel-2.6.14-rc5/.mtn2git_empty
diff --git a/packages/linux/openslug-kernel-2.6.14-rc4/README b/packages/linux/openslug-kernel-2.6.14-rc5/README
index 45bc76579e..45bc76579e 100644
--- a/packages/linux/openslug-kernel-2.6.14-rc4/README
+++ b/packages/linux/openslug-kernel-2.6.14-rc5/README
diff --git a/packages/linux/openslug-kernel-2.6.14-rc4/defconfig b/packages/linux/openslug-kernel-2.6.14-rc5/defconfig
index 3a6c7777d3..3a6c7777d3 100644
--- a/packages/linux/openslug-kernel-2.6.14-rc4/defconfig
+++ b/packages/linux/openslug-kernel-2.6.14-rc5/defconfig
diff --git a/packages/linux/openslug-kernel_2.6.14-rc4.bb b/packages/linux/openslug-kernel_2.6.14-rc5.bb
index b30d767916..b30d767916 100644
--- a/packages/linux/openslug-kernel_2.6.14-rc4.bb
+++ b/packages/linux/openslug-kernel_2.6.14-rc5.bb