From: John Crispin <john@openwrt.org>
Date: Sun, 30 Mar 2014 09:16:35 +0000 (+0000)
Subject: lantiq: fix mtd_split for brnboot firmware images
X-Git-Tag: reboot~7583
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8b0507c9ca55ca6ee2bc0a83f02a5b636d39b198;p=oweals%2Fopenwrt.git

lantiq: fix mtd_split for brnboot firmware images

The existing code only tries to split a parition with name "rootfs"
while actually looking for kernel+rootfs, where usually "firmware" is
used as a partition name. This doesn't make sense, as even if there
was a partition 'rootfs' given by mtdparts or via device-tree, this
code would lead to another partition called 'rootfs' being created
which would not be properly distinguished in the current user-space
code.

While potentially we could use CONFIG_MTD_SPLIT_FIRMWARE_NAME to make
that configurable, the lack of users of brnboot and the fact that we
can freely decide the partition name made me simply change the
hard-coded string constant from "rootfs" to "firmware".

(I'm going to add support for ARV7506PW which run brnboot and needs
this change)

SVN-Revision: 40324
---

diff --git a/target/linux/lantiq/patches-3.10/0100-mtd-split.patch b/target/linux/lantiq/patches-3.10/0100-mtd-split.patch
index 1911b4451e..c2ce9c1b42 100644
--- a/target/linux/lantiq/patches-3.10/0100-mtd-split.patch
+++ b/target/linux/lantiq/patches-3.10/0100-mtd-split.patch
@@ -34,7 +34,7 @@
 +	size_t len;
 +	int ret;
 +
-+	if (strcmp(name, "rootfs") != 0)
++	if (strcmp(name, "firmware") != 0)
 +		return;
 +	while (part_size < end) {
 +		long size_min = part_size - 0x400 - 12 - offset;