mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2024-12-13 10:24:51 +00:00
52a82ce3dd
This just copies the files from the kernel 4.14 specific folders into the kernel 4.19 specific folder, no changes are done to the files in this commit. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
35 lines
982 B
Diff
35 lines
982 B
Diff
From: Daniel Golle <daniel@makrotopia.org>
|
|
Subject: ubi: set ROOT_DEV to ubiblock "rootfs" if unset
|
|
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|
---
|
|
drivers/mtd/ubi/block.c | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
--- a/drivers/mtd/ubi/block.c
|
|
+++ b/drivers/mtd/ubi/block.c
|
|
@@ -50,6 +50,7 @@
|
|
#include <linux/scatterlist.h>
|
|
#include <linux/idr.h>
|
|
#include <asm/div64.h>
|
|
+#include <linux/root_dev.h>
|
|
|
|
#include "ubi-media.h"
|
|
#include "ubi.h"
|
|
@@ -445,6 +446,15 @@ int ubiblock_create(struct ubi_volume_in
|
|
dev_info(disk_to_dev(dev->gd), "created from ubi%d:%d(%s)",
|
|
dev->ubi_num, dev->vol_id, vi->name);
|
|
mutex_unlock(&devices_mutex);
|
|
+
|
|
+ if (!strcmp(vi->name, "rootfs") &&
|
|
+ IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
|
|
+ ROOT_DEV == 0) {
|
|
+ pr_notice("ubiblock: device ubiblock%d_%d (%s) set to be root filesystem\n",
|
|
+ dev->ubi_num, dev->vol_id, vi->name);
|
|
+ ROOT_DEV = MKDEV(gd->major, gd->first_minor);
|
|
+ }
|
|
+
|
|
return 0;
|
|
|
|
out_free_queue:
|