core/kernel26 to 2.6.38.6

2025-01-17 23:34:07 +00:00 · 2011-05-16 23:10:22 -04:00 · 2011-05-16 23:10:22 -04:00 · 41b21fc977
commit 41b21fc977
parent 1f3689d080
4 changed files with 127 additions and 95 deletions
--- a/core/kernel26/2.6.38.config
+++ b/core/kernel26/2.6.38.config
@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux/arm 2.6.38 Kernel Configuration
-# Thu Apr 21 10:24:19 2011
+# Mon May 16 19:47:07 2011
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -46,8 +46,10 @@ CONFIG_KERNEL_GZIP=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_SYSVIPC_SYSCTL=y
-# CONFIG_POSIX_MQUEUE is not set
-# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_BSD_PROCESS_ACCT=y
+# CONFIG_BSD_PROCESS_ACCT_V3 is not set
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
@ -80,14 +82,25 @@ CONFIG_RCU_FANOUT=32
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=19
-# CONFIG_CGROUPS is not set
+CONFIG_CGROUPS=y
+# CONFIG_CGROUP_DEBUG is not set
+# CONFIG_CGROUP_NS is not set
+# CONFIG_CGROUP_FREEZER is not set
+# CONFIG_CGROUP_DEVICE is not set
+# CONFIG_CPUSETS is not set
+# CONFIG_CGROUP_CPUACCT is not set
+# CONFIG_RESOURCE_COUNTERS is not set
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+# CONFIG_RT_GROUP_SCHED is not set
+# CONFIG_BLK_CGROUP is not set
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
 # CONFIG_IPC_NS is not set
 # CONFIG_USER_NS is not set
 # CONFIG_PID_NS is not set
 # CONFIG_NET_NS is not set
-# CONFIG_SCHED_AUTOGROUP is not set
+CONFIG_SCHED_AUTOGROUP=y
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
 CONFIG_BLK_DEV_INITRD=y
@ -234,11 +247,11 @@ CONFIG_MMU=y
 # CONFIG_ARCH_IXP2000 is not set
 # CONFIG_ARCH_IXP4XX is not set
 # CONFIG_ARCH_DOVE is not set
-CONFIG_ARCH_KIRKWOOD=y
+# CONFIG_ARCH_KIRKWOOD is not set
 # CONFIG_ARCH_LOKI is not set
 # CONFIG_ARCH_LPC32XX is not set
 # CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_ORION5X is not set
+CONFIG_ARCH_ORION5X=y
 # CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_KS8695 is not set
 # CONFIG_ARCH_NS9XXX is not set
@ -271,31 +284,31 @@ CONFIG_ARCH_KIRKWOOD=y
 # CONFIG_KEYBOARD_GPIO_POLLED is not set

 #
-# Marvell Kirkwood Implementations
+# Orion Implementations
 #
-CONFIG_MACH_DB88F6281_BP=y
-CONFIG_MACH_RD88F6192_NAS=y
-CONFIG_MACH_RD88F6281=y
-CONFIG_MACH_MV88F6281GTW_GE=y
-CONFIG_MACH_SHEEVAPLUG=y
-CONFIG_MACH_ESATA_SHEEVAPLUG=y
-CONFIG_MACH_GURUPLUG=y
-CONFIG_MACH_TS219=y
-CONFIG_MACH_TS41X=y
-CONFIG_MACH_DOCKSTAR=y
-CONFIG_MACH_GOFLEXNET=y
-CONFIG_MACH_GOFLEXHOME=y
-CONFIG_MACH_OPENRD=y
-CONFIG_MACH_OPENRD_BASE=y
-CONFIG_MACH_OPENRD_CLIENT=y
-CONFIG_MACH_OPENRD_ULTIMATE=y
-CONFIG_MACH_NETSPACE_V2=y
-CONFIG_MACH_INETSPACE_V2=y
-CONFIG_MACH_NETSPACE_MAX_V2=y
-CONFIG_MACH_D2NET_V2=y
-CONFIG_MACH_NET2BIG_V2=y
-CONFIG_MACH_NET5BIG_V2=y
-CONFIG_MACH_T5325=y
+CONFIG_MACH_DB88F5281=y
+CONFIG_MACH_RD88F5182=y
+CONFIG_MACH_KUROBOX_PRO=y
+CONFIG_MACH_DNS323=y
+CONFIG_MACH_TS209=y
+CONFIG_MACH_TERASTATION_PRO2=y
+CONFIG_MACH_LINKSTATION_PRO=y
+CONFIG_MACH_LINKSTATION_LSCHL=y
+CONFIG_MACH_LINKSTATION_MINI=y
+CONFIG_MACH_LINKSTATION_LS_HGL=y
+CONFIG_MACH_TS409=y
+CONFIG_MACH_WRT350N_V2=y
+CONFIG_MACH_TS78XX=y
+CONFIG_MACH_MV2120=y
+CONFIG_MACH_EDMINI_V2=y
+CONFIG_MACH_D2NET=y
+CONFIG_MACH_BIGDISK=y
+CONFIG_MACH_NET2BIG=y
+CONFIG_MACH_MSS2=y
+CONFIG_MACH_WNR854T=y
+CONFIG_MACH_RD88F5181L_GE=y
+CONFIG_MACH_RD88F5181L_FXO=y
+CONFIG_MACH_RD88F6183AP_GE=y

 #
 # System MMU
@ -323,9 +336,6 @@ CONFIG_CPU_USE_DOMAINS=y
 CONFIG_ARM_THUMB=y
 # CONFIG_CPU_ICACHE_DISABLE is not set
 # CONFIG_CPU_DCACHE_DISABLE is not set
-CONFIG_OUTER_CACHE=y
-CONFIG_CACHE_FEROCEON_L2=y
-# CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 CONFIG_ARM_L1_CACHE_SHIFT=5

 #
@ -374,6 +384,7 @@ CONFIG_KSM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_NEED_PER_CPU_KM=y
 CONFIG_FORCE_MAX_ZONEORDER=11
+# CONFIG_LEDS is not set
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_UACCESS_WITH_MEMCPY=y
 # CONFIG_SECCOMP is not set
@ -550,7 +561,7 @@ CONFIG_NETFILTER_XT_CONNMARK=m
 #
 CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_HL=m
@ -592,7 +603,7 @@ CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
 CONFIG_NETFILTER_XT_MATCH_OSF=m
 CONFIG_NETFILTER_XT_MATCH_OWNER=m
 CONFIG_NETFILTER_XT_MATCH_POLICY=m
-# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
 CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
 CONFIG_NETFILTER_XT_MATCH_QUOTA=m
 CONFIG_NETFILTER_XT_MATCH_RATEEST=m
@ -696,7 +707,13 @@ CONFIG_BRIDGE_EBT_LOG=m
 CONFIG_BRIDGE_EBT_ULOG=m
 CONFIG_BRIDGE_EBT_NFLOG=m
 # CONFIG_IP_DCCP is not set
-# CONFIG_IP_SCTP is not set
+CONFIG_IP_SCTP=m
+# CONFIG_NET_SCTPPROBE is not set
+# CONFIG_SCTP_DBG_MSG is not set
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_HMAC_NONE is not set
+# CONFIG_SCTP_HMAC_SHA1 is not set
+CONFIG_SCTP_HMAC_MD5=y
 # CONFIG_RDS is not set
 # CONFIG_TIPC is not set
 # CONFIG_ATM is not set
@ -767,6 +784,7 @@ CONFIG_CLS_U32_MARK=y
 CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_FLOW=m
+# CONFIG_NET_CLS_CGROUP is not set
 CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_STACK=32
 CONFIG_NET_EMATCH_CMP=m
@ -775,20 +793,22 @@ CONFIG_NET_EMATCH_U32=m
 CONFIG_NET_EMATCH_META=m
 CONFIG_NET_EMATCH_TEXT=m
 CONFIG_NET_CLS_ACT=y
-# CONFIG_NET_ACT_POLICE is not set
-# CONFIG_NET_ACT_GACT is not set
-# CONFIG_NET_ACT_MIRRED is not set
-# CONFIG_NET_ACT_IPT is not set
-# CONFIG_NET_ACT_NAT is not set
-# CONFIG_NET_ACT_PEDIT is not set
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+# CONFIG_GACT_PROB is not set
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
 # CONFIG_NET_ACT_SIMP is not set
-# CONFIG_NET_ACT_SKBEDIT is not set
-# CONFIG_NET_ACT_CSUM is not set
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
 # CONFIG_NET_CLS_IND is not set
 CONFIG_NET_SCH_FIFO=y
 # CONFIG_DCB is not set
 CONFIG_DNS_RESOLVER=y
-# CONFIG_BATMAN_ADV is not set
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_DEBUG is not set

 #
 # Network testing
@ -1503,7 +1523,7 @@ CONFIG_LIBERTAS_THINFIRM=m
 # CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
 CONFIG_LIBERTAS_THINFIRM_USB=m
 # CONFIG_ATMEL is not set
-# CONFIG_AT76C50X_USB is not set
+CONFIG_AT76C50X_USB=m
 # CONFIG_PRISM54 is not set
 CONFIG_USB_ZD1201=m
 CONFIG_USB_NET_RNDIS_WLAN=m
@ -1591,7 +1611,7 @@ CONFIG_RT2400PCI=m
 CONFIG_RT2500PCI=m
 CONFIG_RT61PCI=m
 CONFIG_RT2800PCI=m
-# CONFIG_RT2800PCI_RT33XX is not set
+CONFIG_RT2800PCI_RT33XX=y
 CONFIG_RT2800PCI_RT35XX=y
 CONFIG_RT2500USB=m
 CONFIG_RT73USB=m
@ -2802,8 +2822,6 @@ CONFIG_LEDS_GPIO_PLATFORM=y
 # CONFIG_LEDS_DAC124S085 is not set
 # CONFIG_LEDS_BD2802 is not set
 # CONFIG_LEDS_LT3593 is not set
-CONFIG_LEDS_NS2=y
-CONFIG_LEDS_NETXBIG=y
 CONFIG_LEDS_TRIGGERS=y

 #
@ -2889,7 +2907,6 @@ CONFIG_RTC_DRV_S35390A=y
 #
 # on-CPU RTC drivers
 #
-CONFIG_RTC_DRV_MV=y
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set

@ -2904,8 +2921,8 @@ CONFIG_DMA_ENGINE=y
 #
 # DMA Clients
 #
-# CONFIG_NET_DMA is not set
-# CONFIG_ASYNC_TX_DMA is not set
+CONFIG_NET_DMA=y
+CONFIG_ASYNC_TX_DMA=y
 # CONFIG_DMATEST is not set
 # CONFIG_AUXDISPLAY is not set
 # CONFIG_UIO is not set
@ -3319,6 +3336,7 @@ CONFIG_KPROBE_EVENT=y
 # CONFIG_SAMPLES is not set
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
+# CONFIG_TEST_KSTRTOX is not set
 # CONFIG_STRICT_DEVMEM is not set
 CONFIG_ARM_UNWIND=y
 CONFIG_DEBUG_USER=y
@ -3401,7 +3419,7 @@ CONFIG_CRYPTO_XTS=m
 #
 # Hash modes
 #
-CONFIG_CRYPTO_HMAC=m
+CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m

@ -3410,14 +3428,14 @@ CONFIG_CRYPTO_VMAC=m
 #
 CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD4=y
 CONFIG_CRYPTO_MD5=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_RMD128=m
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
+CONFIG_CRYPTO_SHA1=y
 CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_TGR192=m
@ -3454,10 +3472,11 @@ CONFIG_CRYPTO_LZO=y
 # Random Number Generation
 #
 CONFIG_CRYPTO_ANSI_CPRNG=m
-# CONFIG_CRYPTO_USER_API_HASH is not set
-# CONFIG_CRYPTO_USER_API_SKCIPHER is not set
+CONFIG_CRYPTO_USER_API=y
+CONFIG_CRYPTO_USER_API_HASH=y
+CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_MV_CESA=m
+CONFIG_CRYPTO_DEV_MV_CESA=y
 # CONFIG_CRYPTO_DEV_HIFN_795X is not set
 CONFIG_BINARY_PRINTF=y

--- a/core/kernel26/PKGBUILD
+++ b/core/kernel26/PKGBUILD
@ -9,8 +9,8 @@ pkgbase="kernel26"
 pkgname=('kernel26' 'kernel26-headers')
 _kernelname=${pkgname#kernel26}
 _basekernel=2.6.38
-pkgver=${_basekernel}.3
-_pkgrel=1
+pkgver=${_basekernel}.6
+_pkgrel=2
 #pkgrel=${_pkgrel}
 pkgrel=${_pkgrel}.${plugrel}
 makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'make')
@ -26,11 +26,11 @@ url="http://www.kernel.org"
 source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
        ftp://ftp.archlinux.org/other/kernel26/${_patchname}.bz2
        ${_basekernel}.config
-        plugapps.patch)
+        archlinuxarm.patch)
 md5sums=('7d471477bfa67546f902da62227fa976'
-         '5b14b6eb2cdcb074905d4974437c4df6'
-         '5177044b8a774f391da71488120c3b99'
-         '69f2db5a3e93e98f9ae7dd85c0e377c3')
+         '97b31ec7d377404aa6fe52a9b9682ea6'
+         '7b02230ffd1518ecf1bb0e4752a94e52'
+         '1dd962be5474de93040e249b7b6a428b')

 build() {
  cd ${srcdir}/linux-$_basekernel
@ -38,20 +38,16 @@ build() {
  # See http://projects.archlinux.org/linux-2.6-ARCH.git/
  patch -Np1 -i ${srcdir}/${_patchname}
 
-  # Add PlugApps patch
-  patch -Np1 -i ${srcdir}/plugapps.patch
+  # Add Arch Linux ARM patch for ARMv5te plug computers
+  patch -Np1 -i ${srcdir}/archlinuxarm.patch

  # Copy in our configuration
  cp ../${_basekernel}.config ./.config

-  if [ "${_kernelname}" != "" ]; then
-    sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
-  fi
-
  # Prepare sources
-  make prepare
+  #make prepare
  # Configure the kernel. Replace the line below with one of your choice.
-  #make menuconfig # CLI menu for configuration
+  make menuconfig # CLI menu for configuration
  #make nconfig # new CLI menu for configuration
  #make oldconfig # using old config from previous kernel version

--- a/core/kernel26/archlinuxarm.patch
+++ b/core/kernel26/archlinuxarm.patch
@ -1,6 +1,6 @@
 diff -urN a/arch/arm/configs/ubit_defconfig b/arch/arm/configs/ubit_defconfig
 --- a/arch/arm/configs/ubit_defconfig	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/configs/ubit_defconfig	2011-03-23 20:59:21.000000000 -0600
+++ b/arch/arm/configs/ubit_defconfig	2011-05-16 19:20:50.000000000 -0600
@@ -0,0 +1,650 @@
 +CONFIG_EXPERIMENTAL=y
 +CONFIG_LOCALVERSION="-ubit"
@ -654,7 +654,7 @@ diff -urN a/arch/arm/configs/ubit_defconfig b/arch/arm/configs/ubit_defconfig
 +CONFIG_LIBCRC32C=y
 diff -urN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
 --- a/arch/arm/mach-kirkwood/dockstar-setup.c	2011-03-14 19:20:32.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2011-03-23 20:59:21.000000000 -0600
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c	2011-05-16 19:20:50.000000000 -0600
@@ -19,7 +19,6 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@ -708,7 +708,7 @@ diff -urN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/doc
 
 diff -urN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/goflexhome-setup.c
 --- a/arch/arm/mach-kirkwood/goflexhome-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2011-03-23 20:59:33.000000000 -0600
+++ b/arch/arm/mach-kirkwood/goflexhome-setup.c	2011-05-16 19:20:50.000000000 -0600
@@ -0,0 +1,115 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexhome-setup.c
@ -827,7 +827,7 @@ diff -urN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
 +
 diff -urN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/goflexnet-setup.c
 --- a/arch/arm/mach-kirkwood/goflexnet-setup.c	1969-12-31 17:00:00.000000000 -0700
-+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2011-03-23 22:31:06.000000000 -0600
+++ b/arch/arm/mach-kirkwood/goflexnet-setup.c	2011-05-16 19:20:50.000000000 -0600
@@ -0,0 +1,175 @@
 +/*
 + * arch/arm/mach-kirkwood/goflexnet-setup.c
@ -1006,7 +1006,7 @@ diff -urN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go
 +
 diff -urN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
 --- a/arch/arm/mach-kirkwood/guruplug-setup.c	2011-03-14 19:20:32.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2011-03-23 20:59:21.000000000 -0600
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c	2011-05-16 19:20:50.000000000 -0600
@@ -57,12 +57,14 @@
 
 static struct gpio_led guruplug_led_pins[] = {
@ -1026,7 +1026,7 @@ diff -urN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/gur
 	},
 diff -urN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 --- a/arch/arm/mach-kirkwood/Kconfig	2011-03-14 19:20:32.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/Kconfig	2011-03-23 20:59:33.000000000 -0600
+++ b/arch/arm/mach-kirkwood/Kconfig	2011-05-16 19:20:50.000000000 -0600
@@ -64,6 +64,18 @@
 	  Say 'Y' here if you want your kernel to support the
 	  Seagate FreeAgent DockStar.
@ -1048,7 +1048,7 @@ diff -urN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
 
 diff -urN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
 --- a/arch/arm/mach-kirkwood/Makefile	2011-03-14 19:20:32.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/Makefile	2011-03-23 20:59:33.000000000 -0600
+++ b/arch/arm/mach-kirkwood/Makefile	2011-05-16 19:20:50.000000000 -0600
@@ -8,6 +8,8 @@
 obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)	+= sheevaplug-setup.o
 obj-$(CONFIG_MACH_GURUPLUG)		+= guruplug-setup.o
@ -1060,8 +1060,8 @@ diff -urN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
 obj-$(CONFIG_MACH_OPENRD)		+= openrd-setup.o
 diff -urN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
 --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c	2011-03-14 19:20:32.000000000 -0600
-+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2011-03-23 21:38:39.000000000 -0600
-@@ -58,7 +58,13 @@
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c	2011-05-16 19:25:33.000000000 -0600
+@@ -58,7 +58,25 @@
 
 static struct gpio_led sheevaplug_led_pins[] = {
 	{
@ -1072,23 +1072,47 @@ diff -urN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s
 +		.active_low		= 1,
 +	},
 +	{
-+		.name			= "status:green:health",
+		.name           	= "status:red:misc",
+		.default_trigger	= "none",
+		.gpio           	= 46,
+		.active_low     	= 1,
+	},
+	{
+		.name           	= "status:green:health",
+		.default_trigger    	= "none",
+		.gpio           	= 48,
+		.active_low     	= 1,
+	},
+	{
+		.name           	= "status:blue:health",
 		.default_trigger	= "default-on",
 		.gpio			= 49,
 		.active_low		= 1,
-@@ -80,7 +86,8 @@
+@@ -80,7 +98,9 @@
 
 static unsigned int sheevaplug_mpp_config[] __initdata = {
 	MPP29_GPIO,	/* USB Power Enable */
 -	MPP49_GPIO,	/* LED */
-+	MPP46_GPIO,	/* LED Red*/
-+	MPP49_GPIO,	/* LED Green*/
+	MPP46_GPIO,	/* LED Red */
+	MPP48_GPIO,	/* LED Green */
+	MPP49_GPIO,	/* LED Blue */
+ 	0
+ };
+ 
+@@ -88,7 +108,9 @@
+ 	MPP29_GPIO,	/* USB Power Enable */
+ 	MPP44_GPIO,	/* SD Write Protect */
+ 	MPP47_GPIO,	/* SD Card Detect */
+-	MPP49_GPIO,	/* LED Green */
+	MPP46_GPIO,	/* LED Red */
+	MPP48_GPIO,	/* LED Green */
+	MPP49_GPIO,	/* LED Blue */
 	0
 };
 
 diff -urN a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
 --- a/arch/arm/tools/mach-types	2011-03-14 19:20:32.000000000 -0600
-+++ b/arch/arm/tools/mach-types	2011-03-23 20:59:33.000000000 -0600
+++ b/arch/arm/tools/mach-types	2011-05-16 19:20:50.000000000 -0600
@@ -3219,6 +3219,7 @@
 pcm048			MACH_PCM048		PCM048			3236
 dds			MACH_DDS		DDS			3237
--- a/core/kernel26/kernel26.install
+++ b/core/kernel26/kernel26.install
@ -11,10 +11,7 @@ echo "after removing the old one."
 echo ""
 echo "If you boot from USB, you do not need to do anything."
 echo ""
-echo "This package is for all plugs, including the Dockstar."
-echo ""
-echo "Installing now..."
-# Just making sure kernel modules still work after we moved to .gz
+echo "This package is for all ARMv5te plug computers."
 /sbin/depmod ${KERNEL_VERSION}
 }

@ -22,10 +19,6 @@ post_upgrade() {
 	post_install
 }

-post_remove() {
-  KERNEL_VERSION=2.6.38
-}
-
 op=$1
 shift
 $op $*