c997634c01
Fixes: b5956700702b ("kernel: backport nvmem v6.6 fixes and v6.7 changes")
Fixes: https://github.com/openwrt/openwrt/issues/13831
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
25 lines
927 B
Diff
25 lines
927 B
Diff
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Mon, 7 Nov 2022 23:48:24 +0100
|
|
Subject: [PATCH] mtd: support OpenWrt's MTD_ROOTFS_ROOT_DEV
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
This allows setting ROOT_DEV to MTD partition named "rootfs".
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
---
|
|
|
|
--- a/drivers/mtd/mtdcore.c
|
|
+++ b/drivers/mtd/mtdcore.c
|
|
@@ -784,7 +784,8 @@ int add_mtd_device(struct mtd_info *mtd)
|
|
|
|
mutex_unlock(&mtd_table_mutex);
|
|
|
|
- if (of_find_property(mtd_get_of_node(mtd), "linux,rootfs", NULL)) {
|
|
+ if (of_find_property(mtd_get_of_node(mtd), "linux,rootfs", NULL) ||
|
|
+ (IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) && !strcmp(mtd->name, "rootfs") && ROOT_DEV == 0)) {
|
|
if (IS_BUILTIN(CONFIG_MTD)) {
|
|
pr_info("mtd: setting mtd%d (%s) as root device\n", mtd->index, mtd->name);
|
|
ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
|