projects / openwrt.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 060af27)
generic: allow ubi autoattach to run on NOR flash
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 5 Feb 2015 11:21:31 +0000 (11:21 +0000)
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 5 Feb 2015 11:21:31 +0000 (11:21 +0000)
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44260 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/generic/patches-3.10/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch patch | blob | history
target/linux/generic/patches-3.14/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch patch | blob | history
target/linux/generic/patches-3.18/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch patch | blob | history
target/linux/generic/patches-3.19/490-ubi-auto-attach-mtd-device-named-ubi-or-data-on-boot.patch patch | blob | history

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 (file)
--- 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
 
 --- 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;
  }
  
        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 ||
 +
 +              /* 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);
 +                  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;
  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 (file)
--- 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
 
 --- 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;
  }
  
        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 ||
 +
 +              /* 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);
 +                  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;
  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 (file)
--- 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
 
 --- 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;
  }
  
        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 ||
 +
 +              /* 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);
 +                  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;
  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 (file)
--- 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
 
 --- 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;
  }
  
        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 ||
 +
 +              /* 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);
 +                  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;
  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)
                }
        }
  
                }
        }
  
OpenWrt main development branch