diff options
| -rw-r--r-- | package/base-files/files/lib/upgrade/common.sh | 23 | ||||
| -rw-r--r-- | package/system/mtd/src/mtd.c | 38 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.10/400-rootfs_split.patch | 143 | ||||
| -rw-r--r-- | target/linux/x86/base-files/lib/upgrade/platform.sh | 6 |
4 files changed, 9 insertions, 201 deletions
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 6bb36db489..7e6e5fc015 100644 --- a/package/base-files/files/lib/upgrade/common.sh +++ b/package/base-files/files/lib/upgrade/common.sh @@ -175,10 +175,6 @@ get_magic_long() { get_image "$@" | dd bs=4 count=1 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"' } -refresh_mtd_partitions() { - mtd refresh rootfs -} - jffs2_copy_config() { if grep rootfs_data /proc/mtd >/dev/null; then # squashfs+jffs2 @@ -191,7 +187,7 @@ jffs2_copy_config() { default_do_upgrade() { sync - if [ "$SAVE_CONFIG" -eq 1 -a -z "$USE_REFRESH" ]; then + if [ "$SAVE_CONFIG" -eq 1 ]; then get_image "$1" | mtd -j "$CONF_TAR" write - "${PART_NAME:-image}" else get_image "$1" | mtd write - "${PART_NAME:-image}" @@ -206,19 +202,10 @@ do_upgrade() { default_do_upgrade "$ARGV" fi - [ "$SAVE_CONFIG" -eq 1 -a -n "$USE_REFRESH" ] && { - v "Refreshing partitions" - if type 'platform_refresh_partitions' >/dev/null 2>/dev/null; then - platform_refresh_partitions - else - refresh_mtd_partitions - fi - if type 'platform_copy_config' >/dev/null 2>/dev/null; then - platform_copy_config - else - jffs2_copy_config - fi - } + if [ "$SAVE_CONFIG" -eq 1 ] && type 'platform_copy_config' >/dev/null 2>/dev/null; then + platform_copy_config + fi + v "Upgrade completed" [ -n "$DELAY" ] && sleep "$DELAY" ask_bool 1 "Reboot" && { diff --git a/package/system/mtd/src/mtd.c b/package/system/mtd/src/mtd.c index bdbaab51a4..a660486283 100644 --- a/package/system/mtd/src/mtd.c +++ b/package/system/mtd/src/mtd.c @@ -44,10 +44,6 @@ #include "fis.h" #include "mtd.h" -#ifndef MTDREFRESH -#define MTDREFRESH _IO('M', 50) -#endif - #define MAX_ARGS 8 #define JFFS2_DEFAULT_DIR "" /* directory name without /, empty means root dir */ @@ -248,33 +244,6 @@ mtd_erase(const char *mtd) } -static int -mtd_refresh(const char *mtd) -{ - int fd; - - if (quiet < 2) - fprintf(stderr, "Refreshing mtd partition %s ... ", mtd); - - fd = mtd_check_open(mtd); - if(fd < 0) { - fprintf(stderr, "Could not open mtd device: %s\n", mtd); - exit(1); - } - - if (ioctl(fd, MTDREFRESH, NULL)) { - fprintf(stderr, "Failed to refresh the MTD device\n"); - close(fd); - exit(1); - } - close(fd); - - if (quiet < 2) - fprintf(stderr, "\n"); - - return 0; -} - static void indicate_writing(const char *mtd) { @@ -575,7 +544,6 @@ int main (int argc, char **argv) CMD_ERASE, CMD_WRITE, CMD_UNLOCK, - CMD_REFRESH, CMD_JFFS2WRITE, CMD_FIXTRX, CMD_FIXSEAMA, @@ -658,9 +626,6 @@ int main (int argc, char **argv) if ((strcmp(argv[0], "unlock") == 0) && (argc == 2)) { cmd = CMD_UNLOCK; device = argv[1]; - } else if ((strcmp(argv[0], "refresh") == 0) && (argc == 2)) { - cmd = CMD_REFRESH; - device = argv[1]; } else if ((strcmp(argv[0], "erase") == 0) && (argc == 2)) { cmd = CMD_ERASE; device = argv[1]; @@ -739,9 +704,6 @@ int main (int argc, char **argv) mtd_unlock(device); mtd_write_jffs2(device, imagefile, jffs2dir); break; - case CMD_REFRESH: - mtd_refresh(device); - break; case CMD_FIXTRX: if (mtd_fixtrx) { mtd_fixtrx(device, offset); diff --git a/target/linux/generic/patches-3.10/400-rootfs_split.patch b/target/linux/generic/patches-3.10/400-rootfs_split.patch index 2bb7774fc6..4c8e019240 100644 --- a/target/linux/generic/patches-3.10/400-rootfs_split.patch +++ b/target/linux/generic/patches-3.10/400-rootfs_split.patch @@ -35,7 +35,7 @@ /* * MTD methods which simply translate the effective address and pass through -@@ -613,6 +615,144 @@ int mtd_del_partition(struct mtd_info *m +@@ -613,6 +615,92 @@ int mtd_del_partition(struct mtd_info *m } EXPORT_SYMBOL_GPL(mtd_del_partition); @@ -123,64 +123,12 @@ + + return 0; +} -+ -+static int refresh_rootfs_split(struct mtd_info *mtd) -+{ -+ struct mtd_partition tpart; -+ struct mtd_part *part; -+ char *name; -+ //int index = 0; -+ int offset, size; -+ int ret; -+ -+ part = PART(mtd); -+ -+ /* check for the new squashfs offset first */ -+ ret = split_squashfs(part->master, part->offset, &offset); -+ if (ret) -+ return ret; -+ -+ if ((offset > 0) && !mtd->split) { -+ printk(KERN_INFO "%s: creating new split partition for \"%s\"\n", __func__, mtd->name); -+ /* if we don't have a rootfs split partition, create a new one */ -+ tpart.name = (char *) mtd->name; -+ tpart.size = mtd->size; -+ tpart.offset = part->offset; -+ -+ return split_rootfs_data(part->master, &part->mtd, &tpart); -+ } else if ((offset > 0) && mtd->split) { -+ /* update the offsets of the existing partition */ -+ size = mtd->size + part->offset - offset; -+ -+ part = PART(mtd->split); -+ part->offset = offset; -+ part->mtd.size = size; -+ printk(KERN_INFO "%s: %s partition \"" ROOTFS_SPLIT_NAME "\", offset: 0x%06x (0x%06x)\n", -+ __func__, (!strcmp(part->mtd.name, ROOTFS_SPLIT_NAME) ? "updating" : "creating"), -+ (u32) part->offset, (u32) part->mtd.size); -+ name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL); -+ strcpy(name, ROOTFS_SPLIT_NAME); -+ part->mtd.name = name; -+ } else if ((offset <= 0) && mtd->split) { -+ printk(KERN_INFO "%s: removing partition \"%s\"\n", __func__, mtd->split->name); -+ -+ /* mark existing partition as removed */ -+ part = PART(mtd->split); -+ name = kmalloc(sizeof(ROOTFS_SPLIT_NAME) + 1, GFP_KERNEL); -+ strcpy(name, ROOTFS_REMOVED_NAME); -+ part->mtd.name = name; -+ part->offset = 0; -+ part->mtd.size = 0; -+ } -+ -+ return 0; -+} +#endif /* CONFIG_MTD_ROOTFS_SPLIT */ + /* * 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 -@@ -629,6 +769,9 @@ int add_mtd_partitions(struct mtd_info * +@@ -629,6 +717,9 @@ int add_mtd_partitions(struct mtd_info * struct mtd_part *slave; uint64_t cur_offset = 0; int i; @@ -190,7 +138,7 @@ printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name); -@@ -643,12 +786,53 @@ int add_mtd_partitions(struct mtd_info * +@@ -643,6 +734,21 @@ int add_mtd_partitions(struct mtd_info * add_mtd_device(&slave->mtd); @@ -212,53 +160,6 @@ cur_offset = slave->offset + slave->mtd.size; } - return 0; - } - -+int mtd_device_refresh(struct mtd_info *mtd) -+{ -+ int ret = 0; -+ -+ if (IS_PART(mtd)) { -+ struct mtd_part *part; -+ struct mtd_info *master; -+ -+ part = PART(mtd); -+ master = part->master; -+ if (master->refresh_device) -+ ret = master->refresh_device(master); -+ } -+ -+ if (!ret && mtd->refresh_device) -+ ret = mtd->refresh_device(mtd); -+ -+#ifdef CONFIG_MTD_ROOTFS_SPLIT -+ if (!ret && IS_PART(mtd) && !strcmp(mtd->name, "rootfs")) -+ refresh_rootfs_split(mtd); -+#endif -+ -+ return 0; -+} -+EXPORT_SYMBOL_GPL(mtd_device_refresh); -+ - static DEFINE_SPINLOCK(part_parser_lock); - static LIST_HEAD(part_parsers); - ---- a/drivers/mtd/mtdchar.c -+++ b/drivers/mtd/mtdchar.c -@@ -1010,6 +1010,12 @@ static int mtdchar_ioctl(struct file *fi - break; - } - -+ case MTDREFRESH: -+ { -+ ret = mtd_device_refresh(mtd); -+ break; -+ } -+ - default: - ret = -ENOTTY; - } --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -114,6 +114,7 @@ struct nand_ecclayout { @@ -269,48 +170,12 @@ struct mtd_info { u_char type; uint32_t flags; -@@ -226,6 +227,9 @@ struct mtd_info { +@@ -226,6 +227,8 @@ struct mtd_info { int (*_block_markbad) (struct mtd_info *mtd, loff_t ofs); int (*_suspend) (struct mtd_info *mtd); void (*_resume) (struct mtd_info *mtd); -+ int (*refresh_device)(struct mtd_info *mtd); + struct mtd_info *split; + /* * If the driver is something smart, like UBI, it may need to maintain * its own reference counting. The below functions are only for driver. -@@ -368,6 +372,7 @@ extern int mtd_device_parse_register(str - int defnr_parts); - #define mtd_device_register(master, parts, nr_parts) \ - mtd_device_parse_register(master, NULL, NULL, parts, nr_parts) -+extern int mtd_device_refresh(struct mtd_info *master); - extern int mtd_device_unregister(struct mtd_info *master); - extern struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num); - extern int __get_mtd_device(struct mtd_info *mtd); ---- a/include/linux/mtd/partitions.h -+++ b/include/linux/mtd/partitions.h -@@ -36,12 +36,14 @@ - * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK). - */ - -+struct mtd_partition; - struct mtd_partition { - char *name; /* identifier string */ - uint64_t size; /* partition size */ - uint64_t offset; /* offset within the master MTD space */ - uint32_t mask_flags; /* master MTD flags to mask out for this partition */ - struct nand_ecclayout *ecclayout; /* out of band layout for this partition (NAND only) */ -+ int (*refresh_partition)(struct mtd_info *); - }; - - #define MTDPART_OFS_RETAIN (-3) ---- a/include/uapi/mtd/mtd-abi.h -+++ b/include/uapi/mtd/mtd-abi.h -@@ -202,6 +202,7 @@ struct otp_info { - * without OOB, e.g., NOR flash. - */ - #define MEMWRITE _IOWR('M', 24, struct mtd_write_req) -+#define MTDREFRESH _IO('M', 50) - - /* - * Obsolete legacy interface. Keep it in order not to break userspace diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh index dd94db0694..9503d5db88 100644 --- a/target/linux/x86/base-files/lib/upgrade/platform.sh +++ b/target/linux/x86/base-files/lib/upgrade/platform.sh @@ -1,5 +1,3 @@ -USE_REFRESH=1 - x86_get_rootfs() { local rootfsdev local rootfstype @@ -27,10 +25,6 @@ platform_check_image() { esac } -platform_refresh_partitions() { - return 0 -} - platform_copy_config() { local rootfs="$(x86_get_rootfs)" local rootfsdev="${rootfs##*:}" |