From 7d29db1f065612d72ac797ad0db76097ec470097 Mon Sep 17 00:00:00 2001
From: acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 16 Mar 2010 08:23:02 +0000
Subject: rb532: sync patches. Use 2.6.33.1 kernel

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20237 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../rb532/patches-2.6.34/001-cmdline_hack.patch    | 20 +++++++++
 .../patches-2.6.34/002-rb532_nand_fixup.patch      | 48 ++++++++++++++++++++++
 2 files changed, 68 insertions(+)
 create mode 100644 target/linux/rb532/patches-2.6.34/001-cmdline_hack.patch
 create mode 100644 target/linux/rb532/patches-2.6.34/002-rb532_nand_fixup.patch

(limited to 'target/linux/rb532/patches-2.6.34')

diff --git a/target/linux/rb532/patches-2.6.34/001-cmdline_hack.patch b/target/linux/rb532/patches-2.6.34/001-cmdline_hack.patch
new file mode 100644
index 000000000..82a324ccf
--- /dev/null
+++ b/target/linux/rb532/patches-2.6.34/001-cmdline_hack.patch
@@ -0,0 +1,20 @@
+--- a/arch/mips/rb532/prom.c
++++ b/arch/mips/rb532/prom.c
+@@ -67,6 +67,7 @@ static inline unsigned long tag2ul(char 
+ 	return simple_strtoul(num, 0, 10);
+ }
+ 
++extern char __image_cmdline[];
+ void __init prom_setup_cmdline(void)
+ {
+ 	static char cmd_line[CL_SIZE] __initdata;
+@@ -109,6 +110,9 @@ void __init prom_setup_cmdline(void)
+ 	}
+ 	*(cp++) = ' ';
+ 
++	strcpy(cp,(__image_cmdline));
++	cp += strlen(__image_cmdline);
++
+ 	i = strlen(arcs_cmdline);
+ 	if (i > 0) {
+ 		*(cp++) = ' ';
diff --git a/target/linux/rb532/patches-2.6.34/002-rb532_nand_fixup.patch b/target/linux/rb532/patches-2.6.34/002-rb532_nand_fixup.patch
new file mode 100644
index 000000000..0ba9fefb0
--- /dev/null
+++ b/target/linux/rb532/patches-2.6.34/002-rb532_nand_fixup.patch
@@ -0,0 +1,48 @@
+--- a/arch/mips/rb532/devices.c
++++ b/arch/mips/rb532/devices.c
+@@ -139,6 +139,19 @@ static struct platform_device cf_slot0 =
+ };
+ 
+ /* Resources and device for NAND */
++
++/*
++ * We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader
++ * will not be able to find the kernel that we load.  So set the oobinfo
++ * when creating the partitions
++ */
++static struct nand_ecclayout rb532_nand_ecclayout = {
++	.eccbytes       = 6,
++	.eccpos         = { 8, 9, 10, 13, 14, 15 },
++	.oobavail       = 9,
++	.oobfree        = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
++};
++
+ static int rb532_dev_ready(struct mtd_info *mtd)
+ {
+ 	return gpio_get_value(GPIO_RDY);
+@@ -280,6 +293,16 @@ static void __init parse_mac_addr(char *
+ /* NAND definitions */
+ #define NAND_CHIP_DELAY	25
+ 
++static int rb532_nand_fixup(struct mtd_info *mtd)
++{
++	struct nand_chip *chip = mtd->priv;
++
++	if (mtd->writesize == 512)
++		chip->ecc.layout = &rb532_nand_ecclayout;
++
++	return 0;
++}
++
+ static void __init rb532_nand_setup(void)
+ {
+ 	switch (mips_machtype) {
+@@ -299,6 +322,8 @@ static void __init rb532_nand_setup(void
+ 	rb532_nand_data.chip.partitions = rb532_partition_info;
+ 	rb532_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
+ 	rb532_nand_data.chip.options = NAND_NO_AUTOINCR;
++	
++	rb532_nand_data.chip.chip_fixup = &rb532_nand_fixup;
+ }
+ 
+ 
-- 
cgit v1.2.3