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 002a79ab73d12628329c35c9bc072772a7a3f170..27ed474127b3a36e92cd3f8f44296f7f5c04dfb7 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 67600ae972189f7abe3ece5bec91a1bb30f2d968..d7b20b81f5f2acfe1464097f0b492d461045bb3c 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 67600ae972189f7abe3ece5bec91a1bb30f2d968..d7b20b81f5f2acfe1464097f0b492d461045bb3c 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 7f9e0970c9910e6a378c1c0de7ab89d6dbb21341..bb28538d386ae188eed400c7acaa2c8256e20305 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) } }