projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[adm5120] refresh patches to match upstream style
[openwrt.git]
/
target
/
linux
/
generic-2.6
/
patches
/
060-rootfs_split.patch
diff --git
a/target/linux/generic-2.6/patches/060-rootfs_split.patch
b/target/linux/generic-2.6/patches/060-rootfs_split.patch
index
c8fe052
..
2103606
100644
(file)
--- a/
target/linux/generic-2.6/patches/060-rootfs_split.patch
+++ b/
target/linux/generic-2.6/patches/060-rootfs_split.patch
@@
-1,8
+1,8
@@
-Index: linux/drivers/mtd/Kconfig
+Index: linux
-2.6.21.7
/drivers/mtd/Kconfig
===================================================================
===================================================================
---- linux.orig/drivers/mtd/Kconfig
-+++ linux/drivers/mtd/Kconfig
-@@ -4
7,6 +47
,16 @@ config MTD_PARTITIONS
+--- linux
-2.6.21.7
.orig/drivers/mtd/Kconfig
++++ linux
-2.6.21.7
/drivers/mtd/Kconfig
+@@ -4
9,6 +49
,16 @@ config MTD_PARTITIONS
devices. Partitioning on NFTL 'devices' is a different - that's the
'normal' form of partitioning used on a block device.
devices. Partitioning on NFTL 'devices' is a different - that's the
'normal' form of partitioning used on a block device.
@@
-19,10
+19,10
@@
Index: linux/drivers/mtd/Kconfig
config MTD_REDBOOT_PARTS
tristate "RedBoot partition table parsing"
depends on MTD_PARTITIONS
config MTD_REDBOOT_PARTS
tristate "RedBoot partition table parsing"
depends on MTD_PARTITIONS
-Index: linux/drivers/mtd/mtdpart.c
+Index: linux
-2.6.21.7
/drivers/mtd/mtdpart.c
===================================================================
===================================================================
---- linux.orig/drivers/mtd/mtdpart.c
-+++ linux/drivers/mtd/mtdpart.c
+--- linux
-2.6.21.7
.orig/drivers/mtd/mtdpart.c
++++ linux
-2.6.21.7
/drivers/mtd/mtdpart.c
@@ -20,6 +20,8 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
@@ -20,6 +20,8 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
@@
-32,7
+32,7
@@
Index: linux/drivers/mtd/mtdpart.c
/* Our partition linked list */
static LIST_HEAD(mtd_partitions);
/* Our partition linked list */
static LIST_HEAD(mtd_partitions);
-@@ -308,6 +310,26
5
@@ int del_mtd_partitions(struct mtd_info *
+@@ -308,6 +310,26
6
@@ int del_mtd_partitions(struct mtd_info *
return 0;
}
return 0;
}
@@
-62,6
+62,7
@@
Index: linux/drivers/mtd/mtdpart.c
+ slave->mtd.subpage_sft = master->subpage_sft;
+
+ slave->mtd.name = part->name;
+ slave->mtd.subpage_sft = master->subpage_sft;
+
+ slave->mtd.name = part->name;
++ slave->mtd.bank_size = master->bank_size;
+ slave->mtd.owner = master->owner;
+
+ slave->mtd.read = part_read;
+ slave->mtd.owner = master->owner;
+
+ slave->mtd.read = part_read;
@@
-252,8
+253,8
@@
Index: linux/drivers/mtd/mtdpart.c
+ goto out;
+ }
+
+ goto out;
+ }
+
-+ part->name = (unsigned char *)&part[1];
+ memcpy(part, old, sizeof(*part));
+ memcpy(part, old, sizeof(*part));
++ part->name = (unsigned char *)&part[1];
+ strcpy(part->name, ROOTFS_SPLIT_NAME);
+
+ len = (u32) sb->bytes_used;
+ strcpy(part->name, ROOTFS_SPLIT_NAME);
+
+ len = (u32) sb->bytes_used;
@@
-284,7
+285,7
@@
Index: linux/drivers/mtd/mtdpart.c
+ if (dpart == NULL)
+ return 1;
+
+ if (dpart == NULL)
+ return 1;
+
-+ printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%
lX, len=%l
X \n",
++ printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=%
X, len=%
X \n",
+ ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
+
+ ret = add_one_partition(master, dpart, index, NULL);
+ ROOTFS_SPLIT_NAME, dpart->offset, dpart->size);
+
+ ret = add_one_partition(master, dpart, index, NULL);
@@
-298,7
+299,7
@@
Index: linux/drivers/mtd/mtdpart.c
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
-@@ -320,16
8 +581
,31 @@ int add_mtd_partitions(struct mtd_info *
+@@ -320,16
9 +582
,31 @@ int add_mtd_partitions(struct mtd_info *
int nbparts)
{
struct mtd_part *slave;
int nbparts)
{
struct mtd_part *slave;
@@
-331,6
+332,7
@@
Index: linux/drivers/mtd/mtdpart.c
- slave->mtd.subpage_sft = master->subpage_sft;
-
- slave->mtd.name = parts[i].name;
- slave->mtd.subpage_sft = master->subpage_sft;
-
- slave->mtd.name = parts[i].name;
+- slave->mtd.bank_size = master->bank_size;
- slave->mtd.owner = master->owner;
-
- slave->mtd.read = part_read;
- slave->mtd.owner = master->owner;
-
- slave->mtd.read = part_read;
@@
-461,7
+463,7
@@
Index: linux/drivers/mtd/mtdpart.c
+ j++;
+
+ if (strcmp(part->name, "rootfs") == 0 && slave->registered) {
+ j++;
+
+ if (strcmp(part->name, "rootfs") == 0 && slave->registered) {
-+#if CONFIG_MTD_ROOTFS_ROOT_DEV
++#if
def
CONFIG_MTD_ROOTFS_ROOT_DEV
+ if (ROOT_DEV == 0) {
+ printk(KERN_NOTICE "mtd: partition \"rootfs\" "
+ "set to be root filesystem\n");
+ if (ROOT_DEV == 0) {
+ printk(KERN_NOTICE "mtd: partition \"rootfs\" "
+ "set to be root filesystem\n");
@@
-480,7
+482,7
@@
Index: linux/drivers/mtd/mtdpart.c
- add_mtd_device(&slave->mtd);
- slave->registered = 1;
+#endif
- add_mtd_device(&slave->mtd);
- slave->registered = 1;
+#endif
-+#if CONFIG_MTD_ROOTFS_SPLIT
++#if
def
CONFIG_MTD_ROOTFS_SPLIT
+ ret = split_rootfs_data(master, part, j);
+ if (ret == 0)
+ j++;
+ ret = split_rootfs_data(master, part, j);
+ if (ret == 0)
+ j++;
This page took
0.028174 seconds
and
4
git commands to generate.
projects / openwrt.git / blobdiff