rb532: rename patches directory to patches-4.1

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
v19.07.3_mercusys_ac12_duma
Stijn Tintel 8 years ago committed by John Crispin
parent 74aecc2d45
commit d106c7d56b

@ -1,20 +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);
return simple_strtoul(num, 0, 10);
}
+extern char __image_cmdline[];
void __init prom_setup_cmdline(void)
{
static char cmd_line[COMMAND_LINE_SIZE] __initdata;
static char cmd_line[COMMAND_LINE_SIZE] __initdata;
@@ -108,6 +109,9 @@ void __init prom_setup_cmdline(void)
}
*(cp++) = ' ';
}
*(cp++) = ' ';
+ strcpy(cp,(__image_cmdline));
+ cp += strlen(__image_cmdline);
+
i = strlen(arcs_cmdline);
if (i > 0) {
*(cp++) = ' ';
i = strlen(arcs_cmdline);
if (i > 0) {
*(cp++) = ' ';

@ -2,7 +2,7 @@
+++ b/arch/mips/rb532/devices.c
@@ -140,6 +140,19 @@ static struct platform_device cf_slot0 =
};
/* Resources and device for NAND */
+
+/*
@ -19,11 +19,11 @@
+
static int rb532_dev_ready(struct mtd_info *mtd)
{
return gpio_get_value(GPIO_RDY);
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;
@ -36,12 +36,10 @@
+
static void __init rb532_nand_setup(void)
{
switch (mips_machtype) {
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.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;
}

@ -1,11 +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,
}, {
.offset = 0,
.size = 4 * 1024 * 1024,
}, {
- .name = "rootfs",
+ .name = "rootfs_onboard",
.offset = MTDPART_OFS_NXTBLK,
.size = MTDPART_SIZ_FULL,
}
.offset = MTDPART_OFS_NXTBLK,
.size = MTDPART_SIZ_FULL,
}
Loading…
Cancel
Save