From b361a9d59a725b50f00f47ccf319cf86ba5f43c4 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Thu, 5 Feb 2015 11:21:31 +0000 Subject: [PATCH] generic: allow ubi autoattach to run on NOR flash Some devices out there only have a NOR flash to store the rootfs on. While using UBI is arguable on this kind of flash, this is something that should be supported. Signed-off-by: Maxime Ripard Signed-off-by: Imre Kaloz SVN-Revision: 44260 --- ...bi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | 5 +++-- ...bi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | 5 +++-- ...bi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | 5 +++-- ...bi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index 002a79ab73..27ed474127 100644 --- a/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1207,6 +1207,48 @@ static struct mtd_info * __init open_mtd +@@ -1207,6 +1207,49 @@ static struct mtd_info * __init open_mtd return mtd; } @@ -43,6 +43,7 @@ Signed-off-by: Daniel Golle + + /* auto-add only media types where UBI makes sense */ + if (mtd->type == MTD_NANDFLASH || ++ mtd->type == MTD_NORFLASH || + mtd->type == MTD_DATAFLASH || + mtd->type == MTD_MLCNANDFLASH) { + mutex_lock(&ubi_devices_mutex); @@ -60,7 +61,7 @@ Signed-off-by: Daniel Golle static int __init ubi_init(void) { int err, i, k; -@@ -1290,6 +1332,12 @@ static int __init ubi_init(void) +@@ -1290,6 +1333,12 @@ static int __init ubi_init(void) } } diff --git a/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index 67600ae972..d7b20b81f5 100644 --- a/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1209,6 +1209,48 @@ static struct mtd_info * __init open_mtd +@@ -1209,6 +1209,49 @@ static struct mtd_info * __init open_mtd return mtd; } @@ -43,6 +43,7 @@ Signed-off-by: Daniel Golle + + /* auto-add only media types where UBI makes sense */ + if (mtd->type == MTD_NANDFLASH || ++ mtd->type == MTD_NORFLASH || + mtd->type == MTD_DATAFLASH || + mtd->type == MTD_MLCNANDFLASH) { + mutex_lock(&ubi_devices_mutex); @@ -60,7 +61,7 @@ Signed-off-by: Daniel Golle static int __init ubi_init(void) { int err, i, k; -@@ -1298,6 +1340,12 @@ static int __init ubi_init(void) +@@ -1298,6 +1341,12 @@ static int __init ubi_init(void) } } diff --git a/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index 67600ae972..d7b20b81f5 100644 --- a/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1209,6 +1209,48 @@ static struct mtd_info * __init open_mtd +@@ -1209,6 +1209,49 @@ static struct mtd_info * __init open_mtd return mtd; } @@ -43,6 +43,7 @@ Signed-off-by: Daniel Golle + + /* auto-add only media types where UBI makes sense */ + if (mtd->type == MTD_NANDFLASH || ++ mtd->type == MTD_NORFLASH || + mtd->type == MTD_DATAFLASH || + mtd->type == MTD_MLCNANDFLASH) { + mutex_lock(&ubi_devices_mutex); @@ -60,7 +61,7 @@ Signed-off-by: Daniel Golle static int __init ubi_init(void) { int err, i, k; -@@ -1298,6 +1340,12 @@ static int __init ubi_init(void) +@@ -1298,6 +1341,12 @@ static int __init ubi_init(void) } } diff --git a/target/linux/generic/patches-3.19/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch b/target/linux/generic/patches-3.19/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch index 7f9e0970c9..bb28538d38 100644 --- a/target/linux/generic/patches-3.19/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch +++ b/target/linux/generic/patches-3.19/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch @@ -11,7 +11,7 @@ Signed-off-by: Daniel Golle --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c -@@ -1213,6 +1213,48 @@ static struct mtd_info * __init open_mtd +@@ -1213,6 +1213,49 @@ static struct mtd_info * __init open_mtd return mtd; } @@ -43,6 +43,7 @@ Signed-off-by: Daniel Golle + + /* auto-add only media types where UBI makes sense */ + if (mtd->type == MTD_NANDFLASH || ++ mtd->type == MTD_NORFLASH || + mtd->type == MTD_DATAFLASH || + mtd->type == MTD_MLCNANDFLASH) { + mutex_lock(&ubi_devices_mutex); @@ -60,7 +61,7 @@ Signed-off-by: Daniel Golle static int __init ubi_init(void) { int err, i, k; -@@ -1305,6 +1347,12 @@ static int __init ubi_init(void) +@@ -1305,6 +1348,12 @@ static int __init ubi_init(void) } } -- 2.25.1