summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2009-06-13 17:14:24 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2009-06-13 17:14:24 +0200
commita8259a651484f6dd5051a20e64f43ae27fc04613 (patch)
tree64a9d6e992f73bf29a3e4be73920d392eab24147
parent32430d22108818f0dd88a4ada7f0f7c13b213101 (diff)
move patches to correct directory
- add mtd root patch globally
-rw-r--r--target/linux/patches/2.6.29.1/cygwin-compat.patch (renamed from target/linux/patches/2.6.29/cygwin-compat.patch)0
-rw-r--r--target/linux/patches/2.6.29.1/freebsd-compat.patch (renamed from target/linux/patches/2.6.29/freebsd-compat.patch)0
-rw-r--r--target/linux/patches/2.6.29.1/mips-gcc-44.patch (renamed from target/linux/patches/2.6.29/mips-gcc-44.patch)0
-rw-r--r--target/linux/patches/2.6.29.1/ocf.patch (renamed from target/linux/patches/2.6.29/ocf.patch)0
-rw-r--r--target/linux/patches/2.6.29.1/swconfig.patch (renamed from target/linux/patches/2.6.29/swconfig.patch)0
-rw-r--r--target/linux/patches/2.6.29.1/yaffs2.patch (renamed from target/linux/patches/2.6.29/yaffs2.patch)0
-rw-r--r--target/linux/patches/2.6.30/mtd-root.patch62
7 files changed, 62 insertions, 0 deletions
diff --git a/target/linux/patches/2.6.29/cygwin-compat.patch b/target/linux/patches/2.6.29.1/cygwin-compat.patch
index 453748618..453748618 100644
--- a/target/linux/patches/2.6.29/cygwin-compat.patch
+++ b/target/linux/patches/2.6.29.1/cygwin-compat.patch
diff --git a/target/linux/patches/2.6.29/freebsd-compat.patch b/target/linux/patches/2.6.29.1/freebsd-compat.patch
index fb09008f6..fb09008f6 100644
--- a/target/linux/patches/2.6.29/freebsd-compat.patch
+++ b/target/linux/patches/2.6.29.1/freebsd-compat.patch
diff --git a/target/linux/patches/2.6.29/mips-gcc-44.patch b/target/linux/patches/2.6.29.1/mips-gcc-44.patch
index ccee68b9b..ccee68b9b 100644
--- a/target/linux/patches/2.6.29/mips-gcc-44.patch
+++ b/target/linux/patches/2.6.29.1/mips-gcc-44.patch
diff --git a/target/linux/patches/2.6.29/ocf.patch b/target/linux/patches/2.6.29.1/ocf.patch
index 69cffc1da..69cffc1da 100644
--- a/target/linux/patches/2.6.29/ocf.patch
+++ b/target/linux/patches/2.6.29.1/ocf.patch
diff --git a/target/linux/patches/2.6.29/swconfig.patch b/target/linux/patches/2.6.29.1/swconfig.patch
index 4e34e5ff5..4e34e5ff5 100644
--- a/target/linux/patches/2.6.29/swconfig.patch
+++ b/target/linux/patches/2.6.29.1/swconfig.patch
diff --git a/target/linux/patches/2.6.29/yaffs2.patch b/target/linux/patches/2.6.29.1/yaffs2.patch
index 6c384b74c..6c384b74c 100644
--- a/target/linux/patches/2.6.29/yaffs2.patch
+++ b/target/linux/patches/2.6.29.1/yaffs2.patch
diff --git a/target/linux/patches/2.6.30/mtd-root.patch b/target/linux/patches/2.6.30/mtd-root.patch
new file mode 100644
index 000000000..3576848be
--- /dev/null
+++ b/target/linux/patches/2.6.30/mtd-root.patch
@@ -0,0 +1,62 @@
+diff -Nur linux-2.6.29.1.orig/drivers/mtd/Kconfig linux-2.6.29.1/drivers/mtd/Kconfig
+--- linux-2.6.29.1.orig/drivers/mtd/Kconfig 2009-04-02 22:55:27.000000000 +0200
++++ linux-2.6.29.1/drivers/mtd/Kconfig 2009-05-02 19:24:14.444062164 +0200
+@@ -53,6 +53,11 @@
+ should normally be compiled as kernel modules. The modules perform
+ various checks and verifications when loaded.
+
++config MTD_ROOTFS_ROOT_DEV
++ bool "Automatically set 'rootfs' partition to be root filesystem"
++ depends on MTD_PARTITIONS
++ default y
++
+ config MTD_REDBOOT_PARTS
+ tristate "RedBoot partition table parsing"
+ depends on MTD_PARTITIONS
+diff -Nur linux-2.6.29.1.orig/drivers/mtd/mtdpart.c linux-2.6.29.1/drivers/mtd/mtdpart.c
+--- linux-2.6.29.1.orig/drivers/mtd/mtdpart.c 2009-04-02 22:55:27.000000000 +0200
++++ linux-2.6.29.1/drivers/mtd/mtdpart.c 2009-05-02 19:26:39.038093851 +0200
+@@ -18,6 +18,7 @@
+ #include <linux/mtd/mtd.h>
+ #include <linux/mtd/partitions.h>
+ #include <linux/mtd/compatmac.h>
++#include <linux/root_dev.h>
+
+ /* Our partition linked list */
+ static LIST_HEAD(mtd_partitions);
+@@ -37,7 +38,7 @@
+ * the pointer to that structure with this macro.
+ */
+ #define PART(x) ((struct mtd_part *)(x))
+-
++#define IS_PART(mtd) (mtd->read == part_read)
+
+ /*
+ * MTD methods which simply translate the effective address and pass through
+@@ -502,14 +503,23 @@
+ {
+ struct mtd_part *slave;
+ uint64_t cur_offset = 0;
+- int i;
++ int i, j, ret;
+
+ printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
+
+- for (i = 0; i < nbparts; i++) {
+- slave = add_one_partition(master, parts + i, i, cur_offset);
++ for (i = 0, j = 0; i < nbparts; i++) {
++ slave = add_one_partition(master, parts + i, j++, cur_offset);
+ if (!slave)
+ return -ENOMEM;
++ if (!strcmp(parts[i].name, "rootfs") && slave->registered) {
++#ifdef CONFIG_MTD_ROOTFS_ROOT_DEV
++ if (ROOT_DEV == 0) {
++ printk(KERN_NOTICE "mtd: partition \"rootfs\" "
++ "set to be root filesystem\n");
++ ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, slave->mtd.index);
++ }
++#endif
++ }
+ cur_offset = slave->offset + slave->mtd.size;
+ }
+