diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-09-24 13:17:42 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2013-09-24 13:17:42 +0000 |
commit | 2f05e1f6d62a00268fa50a913f44cae72c1e612e (patch) | |
tree | b88567827e8b1e12f525209880ac1dfa0829b045 /target/linux/rb532/patches-3.10 | |
parent | 13ec78c18f4cf10b44a551110468f613fdaff3f5 (diff) | |
download | upstream-2f05e1f6d62a00268fa50a913f44cae72c1e612e.tar.gz upstream-2f05e1f6d62a00268fa50a913f44cae72c1e612e.tar.bz2 upstream-2f05e1f6d62a00268fa50a913f44cae72c1e612e.zip |
rb532: add support for 3.10
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38158
Diffstat (limited to 'target/linux/rb532/patches-3.10')
-rw-r--r-- | target/linux/rb532/patches-3.10/001-cmdline_hack.patch | 20 | ||||
-rw-r--r-- | target/linux/rb532/patches-3.10/002-rb532_nand_fixup.patch | 47 |
2 files changed, 67 insertions, 0 deletions
diff --git a/target/linux/rb532/patches-3.10/001-cmdline_hack.patch b/target/linux/rb532/patches-3.10/001-cmdline_hack.patch new file mode 100644 index 0000000000..a39da9c14a --- /dev/null +++ b/target/linux/rb532/patches-3.10/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[COMMAND_LINE_SIZE] __initdata; +@@ -108,6 +109,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-3.10/002-rb532_nand_fixup.patch b/target/linux/rb532/patches-3.10/002-rb532_nand_fixup.patch new file mode 100644 index 0000000000..916653da54 --- /dev/null +++ b/target/linux/rb532/patches-3.10/002-rb532_nand_fixup.patch @@ -0,0 +1,47 @@ +--- a/arch/mips/rb532/devices.c ++++ b/arch/mips/rb532/devices.c +@@ -140,6 +140,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); +@@ -275,6 +288,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) { +@@ -293,6 +316,7 @@ static void __init rb532_nand_setup(void + rb532_nand_data.chip.nr_partitions = ARRAY_SIZE(rb532_partition_info); + rb532_nand_data.chip.partitions = rb532_partition_info; + rb532_nand_data.chip.chip_delay = NAND_CHIP_DELAY; ++ rb532_nand_data.chip.chip_fixup = &rb532_nand_fixup; + } + + |