From: juhosg Date: Sun, 15 Sep 2013 17:03:29 +0000 (+0000) Subject: kernel/3.10: add new Kconfig option for firmware partition split X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=16456c35e76d640037bc41f80ec1326f44405b66 kernel/3.10: add new Kconfig option for firmware partition split Add a new kernel config option for generic firmware partition split support and change the uImage split support to depend on the new option. Aslo rename the MTD_UIMAGE_SPLIT_NAME option to MTD_SPLIT_FIRMWARE_NAME to make it more generic. The patch is in preparation for multiple firmware format support. Signed-off-by: Gabor Juhos git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38002 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/target/linux/ar71xx/config-3.10 b/target/linux/ar71xx/config-3.10 index 6c75f14420..82559b8e12 100644 --- a/target/linux/ar71xx/config-3.10 +++ b/target/linux/ar71xx/config-3.10 @@ -207,6 +207,7 @@ CONFIG_MTD_MYLOADER_PARTS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2 CONFIG_MTD_REDBOOT_PARTS=y +CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_TPLINK_PARTS=y CONFIG_MTD_UIMAGE_SPLIT=y CONFIG_MTD_WRT160NL_PARTS=y diff --git a/target/linux/generic/config-3.10 b/target/linux/generic/config-3.10 index 3cf5bb2e03..0f3b78f2a7 100644 --- a/target/linux/generic/config-3.10 +++ b/target/linux/generic/config-3.10 @@ -1931,12 +1931,13 @@ CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1 CONFIG_MTD_ROOTFS_ROOT_DEV=y CONFIG_MTD_ROOTFS_SPLIT=y # CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_SPLIT_FIRMWARE is not set +CONFIG_MTD_SPLIT_FIRMWARE_NAME="firmware" # CONFIG_MTD_SST25L is not set # CONFIG_MTD_SWAP is not set # CONFIG_MTD_TESTS is not set # CONFIG_MTD_UBI is not set # CONFIG_MTD_UIMAGE_SPLIT is not set -CONFIG_MTD_UIMAGE_SPLIT_NAME="firmware" # CONFIG_MUTEX_SPIN_ON_OWNER is not set # CONFIG_MV643XX_ETH is not set # CONFIG_MVMDIO is not set diff --git a/target/linux/generic/patches-3.10/400-mtd-add-rootfs-split-support.patch b/target/linux/generic/patches-3.10/400-mtd-add-rootfs-split-support.patch index edbb704115..6a4c16134e 100644 --- a/target/linux/generic/patches-3.10/400-mtd-add-rootfs-split-support.patch +++ b/target/linux/generic/patches-3.10/400-mtd-add-rootfs-split-support.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -12,6 +12,27 @@ menuconfig MTD +@@ -12,6 +12,32 @@ menuconfig MTD if MTD @@ -14,15 +14,20 @@ + bool "Automatically split 'rootfs' partition for squashfs" + default y + -+config MTD_UIMAGE_SPLIT -+ bool "Automatically split off rootfs from a kernel partition containing a uImage" ++config MTD_SPLIT_FIRMWARE ++ bool "Automatically split firmware partition for kernel+rootfs" + default y + -+config MTD_UIMAGE_SPLIT_NAME -+ string "uImage partition name" -+ depends on MTD_UIMAGE_SPLIT ++config MTD_SPLIT_FIRMWARE_NAME ++ string "Firmware partition name" ++ depends on MTD_SPLIT_FIRMWARE + default "firmware" + ++config MTD_UIMAGE_SPLIT ++ bool "Enable split support for firmware partitions containing a uImage" ++ depends on MTD_SPLIT_FIRMWARE ++ default y ++ +endmenu + config MTD_TESTS @@ -116,7 +121,7 @@ int mtd_del_partition(struct mtd_info *master, int partno) { struct mtd_part *slave, *next; -@@ -613,6 +627,148 @@ int mtd_del_partition(struct mtd_info *m +@@ -613,6 +627,151 @@ int mtd_del_partition(struct mtd_info *m } EXPORT_SYMBOL_GPL(mtd_del_partition); @@ -196,12 +201,6 @@ + +#define UBOOT_MAGIC 0x27051956 + -+#ifdef CONFIG_MTD_UIMAGE_SPLIT_NAME -+#define UIMAGE_SPLIT_NAME CONFIG_MTD_UIMAGE_SPLIT_NAME -+#else -+#define UIMAGE_SPLIT_NAME "unused" -+#endif -+ +static void split_uimage(struct mtd_info *master, struct mtd_part *part) +{ + struct { @@ -211,9 +210,6 @@ + } hdr; + size_t len; + -+ if (strcmp(part->mtd.name, UIMAGE_SPLIT_NAME) != 0) -+ return; -+ + if (mtd_read(master, part->offset, sizeof(hdr), &len, (void *) &hdr)) + return; + @@ -229,12 +225,23 @@ + part->mtd.size - len, false); +} + ++#ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME ++#define SPLIT_FIRMWARE_NAME CONFIG_MTD_SPLIT_FIRMWARE_NAME ++#else ++#define SPLIT_FIRMWARE_NAME "unused" ++#endif ++ ++static void split_firmware(struct mtd_info *master, struct mtd_part *part) ++{ ++ if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT)) ++ split_uimage(master, part); ++} ++ +void __weak arch_split_mtd_part(struct mtd_info *master, const char *name, + int offset, int size) +{ +} + -+ +static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part) +{ + static int rootfs_found = 0; @@ -256,8 +263,9 @@ + split_rootfs_data(master, part); + } + -+ if (config_enabled(CONFIG_MTD_UIMAGE_SPLIT)) -+ split_uimage(master, part); ++ if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) && ++ config_enabled(CONFIG_MTD_SPLIT_FIRMWARE)) ++ split_firmware(master, part); + + arch_split_mtd_part(master, part->mtd.name, part->offset, + part->mtd.size); @@ -265,7 +273,7 @@ /* * 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 -@@ -642,6 +798,7 @@ int add_mtd_partitions(struct mtd_info * +@@ -642,6 +801,7 @@ int add_mtd_partitions(struct mtd_info * mutex_unlock(&mtd_partitions_mutex); add_mtd_device(&slave->mtd); diff --git a/target/linux/generic/patches-3.10/430-mtd-add-myloader-partition-parser.patch b/target/linux/generic/patches-3.10/430-mtd-add-myloader-partition-parser.patch index 4b61307c37..bca00230ae 100644 --- a/target/linux/generic/patches-3.10/430-mtd-add-myloader-partition-parser.patch +++ b/target/linux/generic/patches-3.10/430-mtd-add-myloader-partition-parser.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig -@@ -176,6 +176,22 @@ config MTD_BCM47XX_PARTS +@@ -181,6 +181,22 @@ config MTD_BCM47XX_PARTS This provides partitions parser for devices based on BCM47xx boards. diff --git a/target/linux/lantiq/config-default b/target/linux/lantiq/config-default index 574fee3970..0ba6de9a40 100644 --- a/target/linux/lantiq/config-default +++ b/target/linux/lantiq/config-default @@ -105,6 +105,7 @@ CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_LANTIQ=y CONFIG_MTD_OF_PARTS=y CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_UIMAGE_SPLIT=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y diff --git a/target/linux/ramips/mt7620a/config-3.10 b/target/linux/ramips/mt7620a/config-3.10 index fe54475be4..618c27a901 100644 --- a/target/linux/ramips/mt7620a/config-3.10 +++ b/target/linux/ramips/mt7620a/config-3.10 @@ -109,6 +109,7 @@ CONFIG_MTD_M25P80=y CONFIG_MTD_OF_PARTS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_UIMAGE_SPLIT=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y diff --git a/target/linux/ramips/rt288x/config-3.10 b/target/linux/ramips/rt288x/config-3.10 index b6bfe18ce7..2b899b528b 100644 --- a/target/linux/ramips/rt288x/config-3.10 +++ b/target/linux/ramips/rt288x/config-3.10 @@ -97,6 +97,7 @@ CONFIG_MTD_M25P80=y CONFIG_MTD_OF_PARTS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_UIMAGE_SPLIT=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y diff --git a/target/linux/ramips/rt305x/config-3.10 b/target/linux/ramips/rt305x/config-3.10 index fb414fa0be..47d6d18060 100644 --- a/target/linux/ramips/rt305x/config-3.10 +++ b/target/linux/ramips/rt305x/config-3.10 @@ -100,6 +100,7 @@ CONFIG_MTD_M25P80=y CONFIG_MTD_OF_PARTS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_UIMAGE_SPLIT=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y diff --git a/target/linux/ramips/rt3883/config-3.10 b/target/linux/ramips/rt3883/config-3.10 index 3d2d9fe698..509af454fb 100644 --- a/target/linux/ramips/rt3883/config-3.10 +++ b/target/linux/ramips/rt3883/config-3.10 @@ -100,6 +100,7 @@ CONFIG_MTD_M25P80=y CONFIG_MTD_OF_PARTS=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_SPLIT_FIRMWARE=y CONFIG_MTD_UIMAGE_SPLIT=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y