Author: rmilecki Date: 2015-09-24 13:19:12 +0200 (Thu, 24 Sep 2015) New Revision: 47040
Removed: trunk/target/linux/generic/patches-4.1/406-mtd-old-rootfs-squashfs-splitter.patch Modified: trunk/target/linux/generic/config-4.1 trunk/target/linux/generic/patches-4.1/430-mtd-add-myloader-partition-parser.patch Log: kernel: remove old "rootfs" splitter A year ago I made this old splitter obsolete (see r42828), it's time to completely remove it now. For all this time we got these warnings: "Dedicated partitioner didn't create "rootfs_data" partition, please fill a bug report!" and "Support for built-in "rootfs_data" splitter will be removed, please use CONFIG_MTD_SPLIT_SQUASHFS_ROOT" but I'm not aware of any bug reports related to that. Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]> Modified: trunk/target/linux/generic/config-4.1 =================================================================== --- trunk/target/linux/generic/config-4.1 2015-09-24 09:18:59 UTC (rev 47039) +++ trunk/target/linux/generic/config-4.1 2015-09-24 11:19:12 UTC (rev 47040) @@ -2344,7 +2344,6 @@ # CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set # CONFIG_MTD_ROM is not set CONFIG_MTD_ROOTFS_ROOT_DEV=y -CONFIG_MTD_ROOTFS_SPLIT=y # CONFIG_MTD_SLRAM is not set # CONFIG_MTD_SM_COMMON is not set # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set Deleted: trunk/target/linux/generic/patches-4.1/406-mtd-old-rootfs-squashfs-splitter.patch =================================================================== --- trunk/target/linux/generic/patches-4.1/406-mtd-old-rootfs-squashfs-splitter.patch 2015-09-24 09:18:59 UTC (rev 47039) +++ trunk/target/linux/generic/patches-4.1/406-mtd-old-rootfs-squashfs-splitter.patch 2015-09-24 11:19:12 UTC (rev 47040) @@ -1,76 +0,0 @@ ---- a/drivers/mtd/Kconfig -+++ b/drivers/mtd/Kconfig -@@ -18,6 +18,11 @@ config MTD_ROOTFS_ROOT_DEV - bool "Automatically set 'rootfs' partition to be root filesystem" - default y - -+config MTD_ROOTFS_SPLIT -+ bool "Automatically split 'rootfs' partition for squashfs" -+ select MTD_SPLIT -+ default y -+ - config MTD_SPLIT_FIRMWARE - bool "Automatically split firmware partition for kernel+rootfs" - default y ---- a/drivers/mtd/mtdpart.c -+++ b/drivers/mtd/mtdpart.c -@@ -696,6 +696,47 @@ mtd_pad_erasesize(struct mtd_info *mtd, - return len; - } - -+static int split_squashfs(struct mtd_info *master, int offset, int *split_offset) -+{ -+ size_t squashfs_len; -+ int len, ret; -+ -+ ret = mtd_get_squashfs_len(master, offset, &squashfs_len); -+ if (ret) -+ return ret; -+ -+ len = mtd_pad_erasesize(master, offset, squashfs_len); -+ *split_offset = offset + len; -+ -+ return 0; -+} -+ -+static void split_rootfs_data(struct mtd_info *master, struct mtd_part *part) -+{ -+ unsigned int split_offset = 0; -+ unsigned int split_size; -+ int ret; -+ -+ ret = split_squashfs(master, part->offset, &split_offset); -+ if (ret) -+ return; -+ -+ if (split_offset <= 0) -+ return; -+ -+ if (config_enabled(CONFIG_MTD_SPLIT_SQUASHFS_ROOT)) -+ pr_err("Dedicated partitioner didn't create \"rootfs_data\" partition, please fill a bug report!\n"); -+ else -+ pr_warn("Support for built-in \"rootfs_data\" splitter will be removed, please use CONFIG_MTD_SPLIT_SQUASHFS_ROOT\n"); -+ -+ split_size = part->mtd.size - (split_offset - part->offset); -+ printk(KERN_INFO "mtd: partition \"%s\" created automatically, ofs=0x%x, len=0x%x\n", -+ ROOTFS_SPLIT_NAME, split_offset, split_size); -+ -+ __mtd_add_partition(master, ROOTFS_SPLIT_NAME, split_offset, -+ split_size, false); -+} -+ - #define UBOOT_MAGIC 0x27051956 - - static void split_uimage(struct mtd_info *master, struct mtd_part *part) -@@ -758,7 +799,10 @@ static void mtd_partition_split(struct m - return; - - if (!strcmp(part->mtd.name, "rootfs")) { -- run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS); -+ int num = run_parsers_by_type(part, MTD_PARSER_TYPE_ROOTFS); -+ -+ if (num <= 0 && config_enabled(CONFIG_MTD_ROOTFS_SPLIT)) -+ split_rootfs_data(master, part); - - rootfs_found = 1; - } Modified: trunk/target/linux/generic/patches-4.1/430-mtd-add-myloader-partition-parser.patch =================================================================== --- trunk/target/linux/generic/patches-4.1/430-mtd-add-myloader-partition-parser.patch 2015-09-24 09:18:59 UTC (rev 47039) +++ trunk/target/linux/generic/patches-4.1/430-mtd-add-myloader-partition-parser.patch 2015-09-24 11:19:12 UTC (rev 47040) @@ -1,6 +1,6 @@ --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -184,6 +184,22 @@ config MTD_BCM47XX_PARTS +@@ -179,6 +179,22 @@ config MTD_BCM47XX_PARTS This provides partitions parser for devices based on BCM47xx boards. _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
