diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-02-05 11:21:31 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-02-05 11:21:31 +0000 |
| commit | b361a9d59a725b50f00f47ccf319cf86ba5f43c4 (patch) | |
| tree | f23d731023ca1d43d5966a5ed350b7c9344f4377 /target/linux/generic | |
| parent | 67b91f47d62abf43ab15d22c0ab66993ee63b540 (diff) | |
| download | mtk-20170518-b361a9d59a725b50f00f47ccf319cf86ba5f43c4.zip mtk-20170518-b361a9d59a725b50f00f47ccf319cf86ba5f43c4.tar.gz mtk-20170518-b361a9d59a725b50f00f47ccf319cf86ba5f43c4.tar.bz2 | |
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 <maxime.ripard@free-electrons.com>
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 44260
Diffstat (limited to 'target/linux/generic')
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 002a79a..27ed474 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 <daniel@makrotopia.org> --- 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 <daniel@makrotopia.org> + + /* 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 <daniel@makrotopia.org> 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 67600ae..d7b20b8 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 <daniel@makrotopia.org> --- 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 <daniel@makrotopia.org> + + /* 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 <daniel@makrotopia.org> 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 67600ae..d7b20b8 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 <daniel@makrotopia.org> --- 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 <daniel@makrotopia.org> + + /* 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 <daniel@makrotopia.org> 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 7f9e097..bb28538 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 <daniel@makrotopia.org> --- 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 <daniel@makrotopia.org> + + /* 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 <daniel@makrotopia.org> 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) } } |