aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/orion
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2010-03-26 10:45:25 +0000
committerGabor Juhos <juhosg@openwrt.org>2010-03-26 10:45:25 +0000
commit8e67ddaccc3a73993df876497d9a55e8400b1306 (patch)
tree1ebdd84043c3a394d84a147696f72821da570290 /target/linux/orion
parent113e9261575859ec79851119cbc0b3b4c18e87e1 (diff)
downloadupstream-8e67ddaccc3a73993df876497d9a55e8400b1306.tar.gz
upstream-8e67ddaccc3a73993df876497d9a55e8400b1306.tar.bz2
upstream-8e67ddaccc3a73993df876497d9a55e8400b1306.zip
kernel: update to 2.6.32.10
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20444 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/orion')
-rw-r--r--target/linux/orion/Makefile2
-rw-r--r--target/linux/orion/patches/090-wrt350nv2_gpio_leds_buttons.patch6
-rw-r--r--target/linux/orion/patches/100-openwrt_partition_map.patch6
-rw-r--r--target/linux/orion/patches/101-wnr854t_partition_map.patch2
4 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile
index 196e93f844..ea7cee3a70 100644
--- a/target/linux/orion/Makefile
+++ b/target/linux/orion/Makefile
@@ -13,7 +13,7 @@ FEATURES:=squashfs
SUBTARGETS=generic harddisk
CFLAGS=-Os -pipe -march=armv5t -mtune=xscale -funit-at-a-time
-LINUX_VERSION:=2.6.32.9
+LINUX_VERSION:=2.6.32.10
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/orion/patches/090-wrt350nv2_gpio_leds_buttons.patch b/target/linux/orion/patches/090-wrt350nv2_gpio_leds_buttons.patch
index e185693284..30f75fc8af 100644
--- a/target/linux/orion/patches/090-wrt350nv2_gpio_leds_buttons.patch
+++ b/target/linux/orion/patches/090-wrt350nv2_gpio_leds_buttons.patch
@@ -1,5 +1,5 @@
---- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c 2009-12-08 02:39:46.000000000 +0100
-+++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c 2010-01-13 15:25:17.000000000 +0100
+--- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
++++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
@@ -15,6 +15,9 @@
#include <linux/mtd/physmap.h>
#include <linux/mv643xx_eth.h>
@@ -91,7 +91,7 @@
static struct orion5x_mpp_mode wrt350n_v2_mpp_modes[] __initdata = {
{ 0, MPP_GPIO }, /* Power LED green (0=on) */
{ 1, MPP_GPIO }, /* Security LED (0=on) */
-@@ -140,6 +217,8 @@
+@@ -140,6 +217,8 @@ static void __init wrt350n_v2_init(void)
orion5x_setup_dev_boot_win(WRT350N_V2_NOR_BOOT_BASE,
WRT350N_V2_NOR_BOOT_SIZE);
platform_device_register(&wrt350n_v2_nor_flash);
diff --git a/target/linux/orion/patches/100-openwrt_partition_map.patch b/target/linux/orion/patches/100-openwrt_partition_map.patch
index 79e1be7ee0..f179a053d6 100644
--- a/target/linux/orion/patches/100-openwrt_partition_map.patch
+++ b/target/linux/orion/patches/100-openwrt_partition_map.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
+++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
-@@ -135,11 +135,11 @@ static struct mtd_partition wrt350n_v2_nor_flash_partitions
+@@ -135,11 +135,11 @@ static struct mtd_partition wrt350n_v2_n
{
.name = "kernel",
.offset = 0x00000000,
@@ -9,13 +9,13 @@
}, {
.name = "rootfs",
- .offset = 0x001a0000,
-+ .offset = 0x00100000, // change to kernel mtd size here (2/3)
- .size = 0x005c0000,
++ .offset = 0x00100000, // change to kernel mtd size here (2/3)
+ .size = 0x00650000, // adopt to kernel mtd size here (3/3) = 0x00750000 - <kernel mtd size>
}, {
.name = "lang",
.offset = 0x00760000,
-@@ -152,6 +152,14 @@ static struct mtd_partition wrt350n_v2_nor_flash_partitions
+@@ -152,6 +152,14 @@ static struct mtd_partition wrt350n_v2_n
.name = "u-boot",
.offset = 0x007c0000,
.size = 0x00040000,
diff --git a/target/linux/orion/patches/101-wnr854t_partition_map.patch b/target/linux/orion/patches/101-wnr854t_partition_map.patch
index 4e96038ed7..c754106d28 100644
--- a/target/linux/orion/patches/101-wnr854t_partition_map.patch
+++ b/target/linux/orion/patches/101-wnr854t_partition_map.patch
@@ -1,6 +1,6 @@
--- a/arch/arm/mach-orion5x/wnr854t-setup.c
+++ b/arch/arm/mach-orion5x/wnr854t-setup.c
-@@ -67,6 +67,10 @@ static struct mtd_partition wnr854t_nor_flash_partitions
+@@ -67,6 +67,10 @@ static struct mtd_partition wnr854t_nor_
.name = "uboot",
.offset = 0x00760000,
.size = 0x00040000,