Browse Source

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
Hauke Mehrtens 15 năm trước cách đây
mục cha
commit
35031a5daf

+ 1 - 1
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
 

+ 11 - 0
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;
+ }
+ 

+ 14 - 0
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, "

+ 0 - 0
target/linux/orion/patches/090-wrt350nv2_gpio_leds_buttons.patch → target/linux/orion/patches-2.6.32/090-wrt350nv2_gpio_leds_buttons.patch


+ 32 - 0
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,
+ 	},
+ };
+ 

+ 13 - 0
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,
+ 	},
+ };
+ 

+ 23 - 0
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

+ 0 - 0
target/linux/orion/patches/300-skb_cb_align.patch → target/linux/orion/patches-2.6.32/300-skb_cb_align.patch


+ 1 - 1
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)
  {

+ 1 - 1
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