core/kernel26 to 2.6.39.2-1

This commit is contained in:
Kevin Mihelich 2011-07-04 12:30:59 -04:00
parent 13423afacc
commit 00caece696
3 changed files with 33 additions and 37 deletions

View file

@ -1,7 +1,7 @@
# #
# Automatically generated make config: don't edit # Automatically generated make config: don't edit
# Linux/arm 2.6.39 Kernel Configuration # Linux/arm 2.6.39 Kernel Configuration
# Tue Jun 14 15:09:45 2011 # Sun Jul 3 15:36:41 2011
# #
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@ -442,7 +442,7 @@ CONFIG_IP_MULTICAST=y
CONFIG_IP_ADVANCED_ROUTER=y CONFIG_IP_ADVANCED_ROUTER=y
# CONFIG_IP_FIB_TRIE_STATS is not set # CONFIG_IP_FIB_TRIE_STATS is not set
CONFIG_IP_MULTIPLE_TABLES=y CONFIG_IP_MULTIPLE_TABLES=y
# CONFIG_IP_ROUTE_MULTIPATH is not set CONFIG_IP_ROUTE_MULTIPATH=y
# CONFIG_IP_ROUTE_VERBOSE is not set # CONFIG_IP_ROUTE_VERBOSE is not set
CONFIG_IP_ROUTE_CLASSID=y CONFIG_IP_ROUTE_CLASSID=y
CONFIG_IP_PNP=y CONFIG_IP_PNP=y
@ -1233,18 +1233,18 @@ CONFIG_SATA_PMP=y
# #
# Controllers with non-SFF native interface # Controllers with non-SFF native interface
# #
CONFIG_SATA_AHCI=m # CONFIG_SATA_AHCI is not set
# CONFIG_SATA_AHCI_PLATFORM is not set # CONFIG_SATA_AHCI_PLATFORM is not set
# CONFIG_SATA_INIC162X is not set # CONFIG_SATA_INIC162X is not set
# CONFIG_SATA_ACARD_AHCI is not set # CONFIG_SATA_ACARD_AHCI is not set
CONFIG_SATA_SIL24=m # CONFIG_SATA_SIL24 is not set
CONFIG_ATA_SFF=y CONFIG_ATA_SFF=y
# #
# SFF controllers with custom DMA interface # SFF controllers with custom DMA interface
# #
CONFIG_PDC_ADMA=m # CONFIG_PDC_ADMA is not set
CONFIG_SATA_QSTOR=m # CONFIG_SATA_QSTOR is not set
# CONFIG_SATA_SX4 is not set # CONFIG_SATA_SX4 is not set
CONFIG_ATA_BMDMA=y CONFIG_ATA_BMDMA=y
@ -1332,7 +1332,7 @@ CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
CONFIG_DM_MIRROR=m CONFIG_DM_MIRROR=m
# CONFIG_DM_RAID is not set CONFIG_DM_RAID=m
# CONFIG_DM_LOG_USERSPACE is not set # CONFIG_DM_LOG_USERSPACE is not set
CONFIG_DM_ZERO=m CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH=m
@ -2892,7 +2892,7 @@ CONFIG_DMA_ENGINE=y
# DMA Clients # DMA Clients
# #
# CONFIG_NET_DMA is not set # CONFIG_NET_DMA is not set
# CONFIG_ASYNC_TX_DMA is not set CONFIG_ASYNC_TX_DMA=y
# CONFIG_DMATEST is not set # CONFIG_DMATEST is not set
# CONFIG_AUXDISPLAY is not set # CONFIG_AUXDISPLAY is not set
# CONFIG_UIO is not set # CONFIG_UIO is not set

View file

@ -9,7 +9,7 @@ pkgbase="kernel26"
pkgname=('kernel26' 'kernel26-headers') pkgname=('kernel26' 'kernel26-headers')
_kernelname=${pkgname#kernel26} _kernelname=${pkgname#kernel26}
_basekernel=2.6.39 _basekernel=2.6.39
pkgver=${_basekernel}.1 pkgver=${_basekernel}.2
_pkgrel=1 _pkgrel=1
pkgrel=${_pkgrel} pkgrel=${_pkgrel}
#pkgrel=${_pkgrel}.${plugrel} #pkgrel=${_pkgrel}.${plugrel}
@ -28,11 +28,12 @@ source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
${_basekernel}.config ${_basekernel}.config
archlinuxarm.patch) archlinuxarm.patch)
md5sums=('1aab7a741abe08d42e8eccf20de61e05' md5sums=('1aab7a741abe08d42e8eccf20de61e05'
'195dc2d9a79d497d81c0ae187cb679fb' '3f03a326cf11b0e3d171dc0aa33652f7'
'b26c1dd5dc2e6ea72805d5135bdfb65a' '20d5df824c6462bfaf40cda6009430e5'
'e360de7dbee1a961370cc20b4689f454') '77e8e011485c2061616214d07356132e')
build() { build() {
echo $PATH
cd ${srcdir}/linux-$_basekernel cd ${srcdir}/linux-$_basekernel
# Add -ARCH patches # Add -ARCH patches
# See http://projects.archlinux.org/linux-2.6-ARCH.git/ # See http://projects.archlinux.org/linux-2.6-ARCH.git/

View file

@ -1,6 +1,6 @@
diff -urN a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c 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-05-18 22:06:34.000000000 -0600 --- a/arch/arm/mach-kirkwood/dockstar-setup.c 2011-05-18 22:06:34.000000000 -0600
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2011-06-14 14:53:22.000000000 -0600 +++ b/arch/arm/mach-kirkwood/dockstar-setup.c 2011-07-01 13:18:36.000000000 -0600
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
@ -54,8 +54,8 @@ 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 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 --- 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-06-14 14:54:25.000000000 -0600 +++ b/arch/arm/mach-kirkwood/goflexhome-setup.c 2011-07-01 13:25:34.000000000 -0600
@@ -0,0 +1,116 @@ @@ -0,0 +1,123 @@
+/* +/*
+ * arch/arm/mach-kirkwood/goflexhome-setup.c + * arch/arm/mach-kirkwood/goflexhome-setup.c
+ * + *
@ -116,6 +116,12 @@ diff -urN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
+ .default_trigger = "none", + .default_trigger = "none",
+ .gpio = 47, + .gpio = 47,
+ .active_low = 1, + .active_low = 1,
+ },
+ {
+ .name = "status:white:misc",
+ .default_trigger = "none",
+ .gpio = 40,
+ .active_low = 0,
+ } + }
+}; +};
+ +
@ -136,6 +142,7 @@ diff -urN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
+ MPP29_GPIO, /* USB Power Enable */ + MPP29_GPIO, /* USB Power Enable */
+ MPP47_GPIO, /* LED Orange */ + MPP47_GPIO, /* LED Orange */
+ MPP46_GPIO, /* LED Green */ + MPP46_GPIO, /* LED Green */
+ MPP40_GPIO, /* LED White */
+ 0 + 0
+}; +};
+ +
@ -167,14 +174,14 @@ diff -urN a/arch/arm/mach-kirkwood/goflexhome-setup.c b/arch/arm/mach-kirkwood/g
+ .boot_params = 0x00000100, + .boot_params = 0x00000100,
+ .init_machine = goflexhome_init, + .init_machine = goflexhome_init,
+ .map_io = kirkwood_map_io, + .map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early, + .init_early = kirkwood_init_early,
+ .init_irq = kirkwood_init_irq, + .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer, + .timer = &kirkwood_timer,
+MACHINE_END +MACHINE_END
+ +
diff -urN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/goflexnet-setup.c 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 --- 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-06-14 14:54:12.000000000 -0600 +++ b/arch/arm/mach-kirkwood/goflexnet-setup.c 2011-07-01 13:25:49.000000000 -0600
@@ -0,0 +1,176 @@ @@ -0,0 +1,176 @@
+/* +/*
+ * arch/arm/mach-kirkwood/goflexnet-setup.c + * arch/arm/mach-kirkwood/goflexnet-setup.c
@ -347,14 +354,14 @@ diff -urN a/arch/arm/mach-kirkwood/goflexnet-setup.c b/arch/arm/mach-kirkwood/go
+ .boot_params = 0x00000100, + .boot_params = 0x00000100,
+ .init_machine = goflexnet_init, + .init_machine = goflexnet_init,
+ .map_io = kirkwood_map_io, + .map_io = kirkwood_map_io,
+ .init_early = kirkwood_init_early, + .init_early = kirkwood_init_early,
+ .init_irq = kirkwood_init_irq, + .init_irq = kirkwood_init_irq,
+ .timer = &kirkwood_timer, + .timer = &kirkwood_timer,
+MACHINE_END +MACHINE_END
+ +
diff -urN a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c 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-05-18 22:06:34.000000000 -0600 --- a/arch/arm/mach-kirkwood/guruplug-setup.c 2011-05-18 22:06:34.000000000 -0600
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2011-06-14 14:53:22.000000000 -0600 +++ b/arch/arm/mach-kirkwood/guruplug-setup.c 2011-07-01 13:18:36.000000000 -0600
@@ -57,22 +57,24 @@ @@ -57,22 +57,24 @@
static struct gpio_led guruplug_led_pins[] = { static struct gpio_led guruplug_led_pins[] = {
@ -386,7 +393,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 diff -urN a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
--- a/arch/arm/mach-kirkwood/Kconfig 2011-05-18 22:06:34.000000000 -0600 --- a/arch/arm/mach-kirkwood/Kconfig 2011-05-18 22:06:34.000000000 -0600
+++ b/arch/arm/mach-kirkwood/Kconfig 2011-06-14 14:53:22.000000000 -0600 +++ b/arch/arm/mach-kirkwood/Kconfig 2011-07-01 13:18:36.000000000 -0600
@@ -64,6 +64,18 @@ @@ -64,6 +64,18 @@
Say 'Y' here if you want your kernel to support the Say 'Y' here if you want your kernel to support the
Seagate FreeAgent DockStar. Seagate FreeAgent DockStar.
@ -408,7 +415,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 diff -urN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
--- a/arch/arm/mach-kirkwood/Makefile 2011-05-18 22:06:34.000000000 -0600 --- a/arch/arm/mach-kirkwood/Makefile 2011-05-18 22:06:34.000000000 -0600
+++ b/arch/arm/mach-kirkwood/Makefile 2011-06-14 14:53:22.000000000 -0600 +++ b/arch/arm/mach-kirkwood/Makefile 2011-07-01 13:18:36.000000000 -0600
@@ -8,6 +8,8 @@ @@ -8,6 +8,8 @@
obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o
obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o
@ -420,24 +427,12 @@ diff -urN a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
obj-$(CONFIG_MACH_OPENRD) += openrd-setup.o 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 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-05-18 22:06:34.000000000 -0600 --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c 2011-05-18 22:06:34.000000000 -0600
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2011-06-14 14:53:22.000000000 -0600 +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c 2011-07-01 13:22:51.000000000 -0600
@@ -64,7 +64,25 @@ @@ -64,7 +64,13 @@
.active_low = 1, .active_low = 1,
}, },
{ {
- .name = "plug:green:health", - .name = "plug:green:health",
+ .name = "status:red:misc",
+ .default_trigger = "none",
+ .gpio = 46,
+ .active_low = 1,
+ },
+ {
+ .name = "status:red:misc",
+ .default_trigger = "none",
+ .gpio = 46,
+ .active_low = 1,
+ },
+ {
+ .name = "status:green:health", + .name = "status:green:health",
+ .default_trigger = "none", + .default_trigger = "none",
+ .gpio = 48, + .gpio = 48,
@ -448,7 +443,7 @@ diff -urN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s
.default_trigger = "default-on", .default_trigger = "default-on",
.gpio = 49, .gpio = 49,
.active_low = 1, .active_low = 1,
@@ -87,7 +105,8 @@ @@ -87,7 +93,8 @@
static unsigned int sheevaplug_mpp_config[] __initdata = { static unsigned int sheevaplug_mpp_config[] __initdata = {
MPP29_GPIO, /* USB Power Enable */ MPP29_GPIO, /* USB Power Enable */
MPP46_GPIO, /* LED Red */ MPP46_GPIO, /* LED Red */
@ -458,7 +453,7 @@ diff -urN a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/s
0 0
}; };
@@ -95,7 +114,9 @@ @@ -95,7 +102,9 @@
MPP29_GPIO, /* USB Power Enable */ MPP29_GPIO, /* USB Power Enable */
MPP44_GPIO, /* SD Write Protect */ MPP44_GPIO, /* SD Write Protect */
MPP47_GPIO, /* SD Card Detect */ MPP47_GPIO, /* SD Card Detect */