orion: Update Orion in trunk to kernel 2.6.34.

Was flashed on WRT350Nv2, booted and is running for several days.
Closes #7405

Thank you maddes for your patch.

SVN-Revision: 21682

diff --git a/target/linux/orion/Makefile b/target/linux/orion/Makefile
index 8ab12cf62767fb5ee9913c791aa2547828249518..1eb372555d307100182b364e476ee470aa8d99b1 100644 (file)
--- 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.14
+LINUX_VERSION:=2.6.34
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/orion/patches-2.6.32/010-ignore_atag_cmdline.patch b/target/linux/orion/patches-2.6.32/010-ignore_atag_cmdline.patch
new file mode 100644 (file)
index 0000000..9df21f1
--- /dev/null
+++ b/target/linux/orion/patches-2.6.32/010-ignore_atag_cmdline.patch
@@ -0,0 +1,11 @@
+--- a/arch/arm/kernel/setup.c
++++ b/arch/arm/kernel/setup.c
+@@ -629,7 +629,7 @@ __tagtable(ATAG_REVISION, parse_tag_revi
+ 
+ static int __init parse_tag_cmdline(const struct tag *tag)
+ {
+-      strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
++//    strlcpy(default_command_line, tag->u.cmdline.cmdline, COMMAND_LINE_SIZE);
+       return 0;
+ }
+ 

diff --git a/target/linux/orion/patches-2.6.32/050-wrt350nv2_cfi_workaround.patch b/target/linux/orion/patches-2.6.32/050-wrt350nv2_cfi_workaround.patch
new file mode 100644 (file)
index 0000000..f10f89e
--- /dev/null
+++ b/target/linux/orion/patches-2.6.32/050-wrt350nv2_cfi_workaround.patch
@@ -0,0 +1,14 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -374,8 +374,9 @@ struct mtd_info *cfi_cmdset_0002(struct 
+ 
+               cfi_fixup_major_minor(cfi, extp);
+ 
+-              if (extp->MajorVersion < '0' || extp->MajorVersion > '3' ||
+-                  (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
++              if ((extp->MajorVersion != '0' && extp->MinorVersion != '0') &&
++                  (extp->MajorVersion < '0' || extp->MajorVersion > '3' ||
++                  (extp->MinorVersion < '0' || extp->MinorVersion > '4'))) {
+                       if (cfi->mfr == MANUFACTURER_SAMSUNG &&
+                           (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
+                           printk(KERN_NOTICE "  Newer Samsung flash detected, "

diff --git a/target/linux/orion/patches/090-wrt350nv2_gpio_leds_buttons.patch b/target/linux/orion/patches-2.6.32/090-wrt350nv2_gpio_leds_buttons.patch
similarity index 100%
rename from target/linux/orion/patches/090-wrt350nv2_gpio_leds_buttons.patch
rename to target/linux/orion/patches-2.6.32/090-wrt350nv2_gpio_leds_buttons.patch

diff --git a/target/linux/orion/patches-2.6.32/100-openwrt_partition_map.patch b/target/linux/orion/patches-2.6.32/100-openwrt_partition_map.patch
new file mode 100644 (file)
index 0000000..f179a05
--- /dev/null
+++ b/target/linux/orion/patches-2.6.32/100-openwrt_partition_map.patch
@@ -0,0 +1,32 @@
+--- 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_n
+       {
+               .name           = "kernel",
+               .offset         = 0x00000000,
+-              .size           = 0x00760000,
++              .size           = 0x00100000,   // change to kernel mtd size here (1/3)
+       }, {
+               .name           = "rootfs",
+-              .offset         = 0x001a0000,
+-              .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_n
+               .name           = "u-boot",
+               .offset         = 0x007c0000,
+               .size           = 0x00040000,
++      }, {
++              .name           = "eRcOmM_do_not_touch",
++              .offset         = 0x00750000,
++              .size           = 0x00010000,   // erasesize
++      }, {
++              .name           = "image",      // for sysupgrade
++              .offset         = 0x00000000,
++              .size           = 0x00750000,
+       },
+ };
+ 

diff --git a/target/linux/orion/patches-2.6.32/101-wnr854t_partition_map.patch b/target/linux/orion/patches-2.6.32/101-wnr854t_partition_map.patch
new file mode 100644 (file)
index 0000000..c754106
--- /dev/null
+++ b/target/linux/orion/patches-2.6.32/101-wnr854t_partition_map.patch
@@ -0,0 +1,13 @@
+--- 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_
+               .name           = "uboot",
+               .offset         = 0x00760000,
+               .size           = 0x00040000,
++      }, {
++              .name           = "image",      // for sysupgrade
++              .offset         = 0x00000000,
++              .size           = 0x00760000,
+       },
+ };
+ 

diff --git a/target/linux/orion/patches-2.6.32/200-dt2_board_support.patch b/target/linux/orion/patches-2.6.32/200-dt2_board_support.patch
new file mode 100644 (file)
index 0000000..2715472
--- /dev/null
+++ b/target/linux/orion/patches-2.6.32/200-dt2_board_support.patch
@@ -0,0 +1,23 @@
+--- a/arch/arm/mach-orion5x/Kconfig
++++ b/arch/arm/mach-orion5x/Kconfig
+@@ -16,6 +16,13 @@ config MACH_RD88F5182
+         Say 'Y' here if you want your kernel to support the
+         Marvell Orion-NAS (88F5182) RD2
+ 
++config MACH_DT2
++      bool "Freecom DataTank Gateway"
++      select I2C_BOARDINFO
++      help
++        Say 'Y' here if you want your kernel to support the
++        Freecom DataTank Gateway
++
+ config MACH_KUROBOX_PRO
+       bool "KuroBox Pro"
+       select I2C_BOARDINFO
+--- a/arch/arm/mach-orion5x/Makefile
++++ b/arch/arm/mach-orion5x/Makefile
+@@ -20,3 +20,4 @@ obj-$(CONFIG_MACH_WNR854T)   += wnr854t-se
+ obj-$(CONFIG_MACH_RD88F5181L_GE)      += rd88f5181l-ge-setup.o
+ obj-$(CONFIG_MACH_RD88F5181L_FXO)     += rd88f5181l-fxo-setup.o
+ obj-$(CONFIG_MACH_RD88F6183AP_GE)     += rd88f6183ap-ge-setup.o
++obj-$(CONFIG_MACH_DT2)                += dt2-setup.o

diff --git a/target/linux/orion/patches/300-skb_cb_align.patch b/target/linux/orion/patches-2.6.32/300-skb_cb_align.patch
similarity index 100%
rename from target/linux/orion/patches/300-skb_cb_align.patch
rename to target/linux/orion/patches-2.6.32/300-skb_cb_align.patch

diff --git a/target/linux/orion/patches/010-ignore_atag_cmdline.patch b/target/linux/orion/patches/010-ignore_atag_cmdline.patch
index 9df21f1eb56e53de8afaa58676d634f1a4459f9f..08a6b1fdac855145f453d83932d2f800f25463c8 100644 (file)
--- a/target/linux/orion/patches/010-ignore_atag_cmdline.patch
+++ b/target/linux/orion/patches/010-ignore_atag_cmdline.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/kernel/setup.c
 +++ b/arch/arm/kernel/setup.c
-@@ -629,7 +629,7 @@ __tagtable(ATAG_REVISION, parse_tag_revi
+@@ -595,7 +595,7 @@ __tagtable(ATAG_REVISION, parse_tag_revi
  
  static int __init parse_tag_cmdline(const struct tag *tag)
  {

diff --git a/target/linux/orion/patches/200-dt2_board_support.patch b/target/linux/orion/patches/200-dt2_board_support.patch
index 27154723e1b1055ff1cbe2a64df65ee6684845a7..aa645ea499c9827bd8cd4383b75150f9b08cb1d8 100644 (file)
--- a/target/linux/orion/patches/200-dt2_board_support.patch
+++ b/target/linux/orion/patches/200-dt2_board_support.patch
@@ -16,7 +16,7 @@
        select I2C_BOARDINFO
 --- a/arch/arm/mach-orion5x/Makefile
 +++ b/arch/arm/mach-orion5x/Makefile
-@@ -20,3 +20,4 @@ obj-$(CONFIG_MACH_WNR854T)   += wnr854t-se
+@@ -21,3 +21,4 @@ obj-$(CONFIG_MACH_WNR854T)   += wnr854t-se
  obj-$(CONFIG_MACH_RD88F5181L_GE)      += rd88f5181l-ge-setup.o
  obj-$(CONFIG_MACH_RD88F5181L_FXO)     += rd88f5181l-fxo-setup.o
  obj-$(CONFIG_MACH_RD88F6183AP_GE)     += rd88f6183ap-ge-setup.o