Просмотр исходного кода

move patches to correct directory

- add mtd root patch globally
Waldemar Brodkorb 16 лет назад
Родитель
Сommit
a8259a6514

+ 0 - 0
target/linux/patches/2.6.29/cygwin-compat.patch → target/linux/patches/2.6.29.1/cygwin-compat.patch


+ 0 - 0
target/linux/patches/2.6.29/freebsd-compat.patch → target/linux/patches/2.6.29.1/freebsd-compat.patch


+ 0 - 0
target/linux/patches/2.6.29/mips-gcc-44.patch → target/linux/patches/2.6.29.1/mips-gcc-44.patch


+ 0 - 0
target/linux/patches/2.6.29/ocf.patch → target/linux/patches/2.6.29.1/ocf.patch


+ 0 - 0
target/linux/patches/2.6.29/swconfig.patch → target/linux/patches/2.6.29.1/swconfig.patch


+ 0 - 0
target/linux/patches/2.6.29/yaffs2.patch → target/linux/patches/2.6.29.1/yaffs2.patch


+ 62 - 0
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;
+ 	}
+