diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2016-08-14 23:45:43 +0300 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2016-08-15 15:32:37 +0200 |
| commit | d106c7d56b7403788441837b15a59b1815319ad0 (patch) | |
| tree | 30b0371e89ec15684776c2aedba461cb30cf6c50 | |
| parent | 74aecc2d450938ce9c3e157b60f8277e68908c65 (diff) | |
| download | upstream-d106c7d56b7403788441837b15a59b1815319ad0.tar.gz upstream-d106c7d56b7403788441837b15a59b1815319ad0.tar.bz2 upstream-d106c7d56b7403788441837b15a59b1815319ad0.zip | |
rb532: rename patches directory to patches-4.1
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
| -rw-r--r-- | target/linux/rb532/patches-4.1/001-cmdline_hack.patch (renamed from target/linux/rb532/patches/001-cmdline_hack.patch) | 18 | ||||
| -rw-r--r-- | target/linux/rb532/patches-4.1/002-rb532_nand_fixup.patch (renamed from target/linux/rb532/patches/002-rb532_nand_fixup.patch) | 16 | ||||
| -rw-r--r-- | target/linux/rb532/patches-4.1/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch (renamed from target/linux/rb532/patches/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch) | 12 |
3 files changed, 22 insertions, 24 deletions
diff --git a/target/linux/rb532/patches/001-cmdline_hack.patch b/target/linux/rb532/patches-4.1/001-cmdline_hack.patch index a39da9c14a..2429b1bfc5 100644 --- a/target/linux/rb532/patches/001-cmdline_hack.patch +++ b/target/linux/rb532/patches-4.1/001-cmdline_hack.patch @@ -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++) = ' '; diff --git a/target/linux/rb532/patches/002-rb532_nand_fixup.patch b/target/linux/rb532/patches-4.1/002-rb532_nand_fixup.patch index 6f885997fc..5b1dd51104 100644 --- a/target/linux/rb532/patches/002-rb532_nand_fixup.patch +++ b/target/linux/rb532/patches-4.1/002-rb532_nand_fixup.patch @@ -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; } - - diff --git a/target/linux/rb532/patches/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch b/target/linux/rb532/patches-4.1/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch index ad4dfc4c08..2ef9e51c1e 100644 --- a/target/linux/rb532/patches/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch +++ b/target/linux/rb532/patches-4.1/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch @@ -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, + } |