ipq806x: rename "rootfs" to "ubi" on nand

OpenWrt expects the ubi paritition to be named "ubi", not "rootfs".

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46786

diff --git a/target/linux/ipq806x/patches-3.18/302-mtd-qcom-smem-rename-rootfs-ubi.patch b/target/linux/ipq806x/patches-3.18/302-mtd-qcom-smem-rename-rootfs-ubi.patch
new file mode 100644 (file)
index 0000000..471a87b
--- /dev/null
+++ b/target/linux/ipq806x/patches-3.18/302-mtd-qcom-smem-rename-rootfs-ubi.patch
@@ -0,0 +1,13 @@
+--- a/drivers/mtd/qcom_smem_part.c
++++ b/drivers/mtd/qcom_smem_part.c
+@@ -192,6 +192,10 @@ static int parse_qcom_smem_partitions(st
+               m_part->size = le32_to_cpu(s_part->size) * (*smem_blksz);
+               m_part->offset = le32_to_cpu(s_part->start) * (*smem_blksz);
+ 
++              /* "rootfs" conflicts with OpenWrt auto mounting */
++              if (mtd_type_is_nand(master) && !strcmp(m_part->name, "rootfs"))
++                      m_part->name = "ubi";
++
+               /*
+                * The last SMEM partition may have its size marked as
+                * something like 0xffffffff, which means "until the end of the

diff --git a/target/linux/ipq806x/patches-4.1/302-mtd-qcom-smem-rename-rootfs-ubi.patch b/target/linux/ipq806x/patches-4.1/302-mtd-qcom-smem-rename-rootfs-ubi.patch
new file mode 100644 (file)
index 0000000..471a87b
--- /dev/null
+++ b/target/linux/ipq806x/patches-4.1/302-mtd-qcom-smem-rename-rootfs-ubi.patch
@@ -0,0 +1,13 @@
+--- a/drivers/mtd/qcom_smem_part.c
++++ b/drivers/mtd/qcom_smem_part.c
+@@ -192,6 +192,10 @@ static int parse_qcom_smem_partitions(st
+               m_part->size = le32_to_cpu(s_part->size) * (*smem_blksz);
+               m_part->offset = le32_to_cpu(s_part->start) * (*smem_blksz);
+ 
++              /* "rootfs" conflicts with OpenWrt auto mounting */
++              if (mtd_type_is_nand(master) && !strcmp(m_part->name, "rootfs"))
++                      m_part->name = "ubi";
++
+               /*
+                * The last SMEM partition may have its size marked as
+                * something like 0xffffffff, which means "until the end of the