Signed-off-by: Stijn Tintel <st...@linux-ipv6.be>
---
.../linux/rb532/patches-4.1/001-cmdline_hack.patch | 20 +++++++++
.../rb532/patches-4.1/002-rb532_nand_fixup.patch | 45 +++++++++++++++++++++
...tion_info-rename-rootfs-to-rootfs_onboard.patch | 11 +++++
target/linux/rb532/patches/001-cmdline_hack.patch | 20 ---------
.../linux/rb532/patches/002-rb532_nand_fixup.patch | 47 ----------------------
...tion_info-rename-rootfs-to-rootfs_onboard.patch | 11 -----
6 files changed, 76 insertions(+), 78 deletions(-)
create mode 100644 target/linux/rb532/patches-4.1/001-cmdline_hack.patch
create mode 100644 target/linux/rb532/patches-4.1/002-rb532_nand_fixup.patch
create mode 100644
target/linux/rb532/patches-4.1/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch
delete mode 100644 target/linux/rb532/patches/001-cmdline_hack.patch
delete mode 100644 target/linux/rb532/patches/002-rb532_nand_fixup.patch
delete mode 100644
target/linux/rb532/patches/004-rb532_partition_info-rename-rootfs-to-rootfs_onboard.patch
diff --git a/target/linux/rb532/patches-4.1/001-cmdline_hack.patch
b/target/linux/rb532/patches-4.1/001-cmdline_hack.patch
new file mode 100644
index 0000000..2429b1b
--- /dev/null
+++ b/target/linux/rb532/patches-4.1/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-4.1/002-rb532_nand_fixup.patch
b/target/linux/rb532/patches-4.1/002-rb532_nand_fixup.patch
new file mode 100644
index 0000000..5b1dd51
--- /dev/null
+++ b/target/linux/rb532/patches-4.1/002-rb532_nand_fixup.patch
@@ -0,0 +1,45 @@
+--- 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-4.1/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
new file mode 100644
index 0000000..2ef9e51
--- /dev/null
+++
b/target/linux/rb532/patches-4.1/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,
+ }
diff --git a/target/linux/rb532/patches/001-cmdline_hack.patch
b/target/linux/rb532/patches/001-cmdline_hack.patch
deleted file mode 100644
index a39da9c..0000000
--- a/target/linux/rb532/patches/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/002-rb532_nand_fixup.patch
b/target/linux/rb532/patches/002-rb532_nand_fixup.patch
deleted file mode 100644
index 6f88599..0000000
--- a/target/linux/rb532/patches/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);
-@@ -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
deleted file mode 100644
index ad4dfc4..0000000
---
a/target/linux/rb532/patches/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,
- }
--
2.7.3
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
