summaryrefslogtreecommitdiff
path: root/target/linux/rb532/patches-3.14
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/rb532/patches-3.14')
-rw-r--r--target/linux/rb532/patches-3.14/001-cmdline_hack.patch20
-rw-r--r--target/linux/rb532/patches-3.14/002-rb532_nand_fixup.patch47
-rw-r--r--target/linux/rb532/patches-3.14/003-MIPS-rc32434-fix-broken-pci-init.patch37
-rw-r--r--target/linux/rb532/patches-3.14/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch11
4 files changed, 0 insertions, 115 deletions
diff --git a/target/linux/rb532/patches-3.14/001-cmdline_hack.patch b/target/linux/rb532/patches-3.14/001-cmdline_hack.patch
deleted file mode 100644
index eacb8e0..0000000
--- a/target/linux/rb532/patches-3.14/001-cmdline_hack.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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
deleted file mode 100644
index 916653d..0000000
--- a/target/linux/rb532/patches-3.14/002-rb532_nand_fixup.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- 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
deleted file mode 100644
index af6f7ca..0000000
--- a/target/linux/rb532/patches-3.14/003-MIPS-rc32434-fix-broken-pci-init.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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 <juhosg@openwrt.org>
-X-Patchwork-Id: 6940
-Message-Id: <1400142944-32147-1-git-send-email-juhosg@openwrt.org>
-To: Ralf Baechle <ralf@linux-mips.org>
-Cc: linux-mips@linux-mips.org, Gabor Juhos <juhosg@openwrt.org>
-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 <wbx@openadk.org>
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-
----
-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
deleted file mode 100644
index ad4dfc4..0000000
--- a/target/linux/rb532/patches-3.14/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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,
- }