From af58224462ba563edd5606139779716986bb0412 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Tue, 14 Oct 2014 11:32:43 +0000 Subject: rb532: add 3.14 support Signed-off-by: Roman Yeryomin SVN-Revision: 42908 --- .../rb532/patches-3.14/001-cmdline_hack.patch | 20 +++++++++ .../rb532/patches-3.14/002-rb532_nand_fixup.patch | 47 ++++++++++++++++++++++ .../003-MIPS-rc32434-fix-broken-pci-init.patch | 37 +++++++++++++++++ ...tion_info-rename-rootfs-to-rootfs_onboard.patch | 11 +++++ 4 files changed, 115 insertions(+) create mode 100644 target/linux/rb532/patches-3.14/001-cmdline_hack.patch create mode 100644 target/linux/rb532/patches-3.14/002-rb532_nand_fixup.patch create mode 100644 target/linux/rb532/patches-3.14/003-MIPS-rc32434-fix-broken-pci-init.patch create mode 100644 target/linux/rb532/patches-3.14/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch (limited to 'target/linux/rb532/patches-3.14') diff --git a/target/linux/rb532/patches-3.14/001-cmdline_hack.patch b/target/linux/rb532/patches-3.14/001-cmdline_hack.patch new file mode 100644 index 0000000000..a39da9c14a --- /dev/null +++ b/target/linux/rb532/patches-3.14/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.14/002-rb532_nand_fixup.patch b/target/linux/rb532/patches-3.14/002-rb532_nand_fixup.patch new file mode 100644 index 0000000000..916653da54 --- /dev/null +++ b/target/linux/rb532/patches-3.14/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; + } + + diff --git a/target/linux/rb532/patches-3.14/003-MIPS-rc32434-fix-broken-pci-init.patch b/target/linux/rb532/patches-3.14/003-MIPS-rc32434-fix-broken-pci-init.patch new file mode 100644 index 0000000000..af6f7ca2c6 --- /dev/null +++ b/target/linux/rb532/patches-3.14/003-MIPS-rc32434-fix-broken-pci-init.patch @@ -0,0 +1,37 @@ +From patchwork Thu May 15 08:35:44 2014 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: MIPS: RC32434: fix broken PCI resource initialization +From: Gabor Juhos +X-Patchwork-Id: 6940 +Message-Id: <1400142944-32147-1-git-send-email-juhosg@openwrt.org> +To: Ralf Baechle +Cc: linux-mips@linux-mips.org, Gabor Juhos +Date: Thu, 15 May 2014 10:35:44 +0200 + +The parent field of the 'rc32434_res_pci_mem1' resource points to +the resource itself which is obviously wrong. Due to the broken +initialitazion, the PCI devices on the Mikrotik RB532 boards are +not working since commit 22283178 (MIPS: avoid possible resource +conflict in register_pci_controller). + +Remove the field initialization to fix the issue. + +Reported-by: Waldemar Brodkorb +Signed-off-by: Gabor Juhos + +--- +arch/mips/pci/pci-rc32434.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/arch/mips/pci/pci-rc32434.c ++++ b/arch/mips/pci/pci-rc32434.c +@@ -53,7 +53,6 @@ static struct resource rc32434_res_pci_m + .start = 0x50000000, + .end = 0x5FFFFFFF, + .flags = IORESOURCE_MEM, +- .parent = &rc32434_res_pci_mem1, + .sibling = NULL, + .child = &rc32434_res_pci_mem2 + }; diff --git a/target/linux/rb532/patches-3.14/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch b/target/linux/rb532/patches-3.14/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch new file mode 100644 index 0000000000..e3f6c4113e --- /dev/null +++ b/target/linux/rb532/patches-3.14/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch @@ -0,0 +1,11 @@ +--- a/arch/mips/rb532/devices.c 2014-07-07 01:05:10.000000000 +0300 ++++ b/arch/mips/rb532/devices.c 2014-07-07 01:05:27.268505016 +0300 +@@ -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, + } -- cgit v1.2.3