aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/rb532/patches-2.6.33
diff options
context:
space:
mode:
authorAlexandros C. Couloumbis <alex@ozo.com>2010-03-16 08:23:02 +0000
committerAlexandros C. Couloumbis <alex@ozo.com>2010-03-16 08:23:02 +0000
commitb254833bae548f5513b6f06367fe2996a7be4be1 (patch)
tree9220997e4051cee8722824c772568bfb2261ecd2 /target/linux/rb532/patches-2.6.33
parentdc49c59a07a7fe5d68ba06c7760b154239b2aeae (diff)
downloadupstream-b254833bae548f5513b6f06367fe2996a7be4be1.tar.gz
upstream-b254833bae548f5513b6f06367fe2996a7be4be1.tar.bz2
upstream-b254833bae548f5513b6f06367fe2996a7be4be1.zip
rb532: sync patches. Use 2.6.33.1 kernel
SVN-Revision: 20237
Diffstat (limited to 'target/linux/rb532/patches-2.6.33')
-rw-r--r--target/linux/rb532/patches-2.6.33/001-cmdline_hack.patch20
-rw-r--r--target/linux/rb532/patches-2.6.33/002-rb532_nand_fixup.patch48
2 files changed, 68 insertions, 0 deletions
diff --git a/target/linux/rb532/patches-2.6.33/001-cmdline_hack.patch b/target/linux/rb532/patches-2.6.33/001-cmdline_hack.patch
new file mode 100644
index 0000000000..82a324ccf7
--- /dev/null
+++ b/target/linux/rb532/patches-2.6.33/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.33/002-rb532_nand_fixup.patch b/target/linux/rb532/patches-2.6.33/002-rb532_nand_fixup.patch
new file mode 100644
index 0000000000..0ba9fefb0f
--- /dev/null
+++ b/target/linux/rb532/patches-2.6.33/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;
+ }
+
+