aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/rb532/patches
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-10-26 09:00:35 +0000
committerJohn Crispin <john@openwrt.org>2015-10-26 09:00:35 +0000
commit56dcd0fe90bc1b5d3848845d68f6c229a157faaa (patch)
tree6b333e73c8e8318b026af125d88b2fa6251958df /target/linux/rb532/patches
parentff64ae829399fbd46c1ebc3d6aa34aa098716eca (diff)
downloadupstream-56dcd0fe90bc1b5d3848845d68f6c229a157faaa.tar.gz
upstream-56dcd0fe90bc1b5d3848845d68f6c229a157faaa.tar.bz2
upstream-56dcd0fe90bc1b5d3848845d68f6c229a157faaa.zip
rb532: prepare switch to 4.1
Signed-off-by: Roman Yeryomin <roman@advem.lv> SVN-Revision: 47255
Diffstat (limited to 'target/linux/rb532/patches')
-rw-r--r--target/linux/rb532/patches/001-cmdline_hack.patch20
-rw-r--r--target/linux/rb532/patches/002-rb532_nand_fixup.patch47
-rw-r--r--target/linux/rb532/patches/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch11
3 files changed, 78 insertions, 0 deletions
diff --git a/target/linux/rb532/patches/001-cmdline_hack.patch b/target/linux/rb532/patches/001-cmdline_hack.patch
new file mode 100644
index 0000000000..a39da9c14a
--- /dev/null
+++ b/target/linux/rb532/patches/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/002-rb532_nand_fixup.patch b/target/linux/rb532/patches/002-rb532_nand_fixup.patch
new file mode 100644
index 0000000000..6f885997fc
--- /dev/null
+++ b/target/linux/rb532/patches/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);
+@@ -254,6 +267,16 @@ static struct platform_device *rb532_dev
+ /* 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) {
+@@ -272,6 +295,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;
+ }
+
+
diff --git a/target/linux/rb532/patches/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch b/target/linux/rb532/patches/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch
new file mode 100644
index 0000000000..ad4dfc4c08
--- /dev/null
+++ b/target/linux/rb532/patches/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch
@@ -0,0 +1,11 @@
+--- a/arch/mips/rb532/devices.c
++++ b/arch/mips/rb532/devices.c
+@@ -202,7 +202,7 @@ static struct mtd_partition rb532_partit
+ .offset = 0,
+ .size = 4 * 1024 * 1024,
+ }, {
+- .name = "rootfs",
++ .name = "rootfs_onboard",
+ .offset = MTDPART_OFS_NXTBLK,
+ .size = MTDPART_SIZ_FULL,
+ }