db845c: qcom: rmtfs: Use -o option to override partition by-name
Instead of hardcoding BY_PARTLABEL_PATH for AOSP,
reuse -o option as suggested by Bjorn to expand John's
patch to find correct partition by-name on newer
kernels (which is /dev/block/platform/soc*/*.*/by-name).
For example: On db845c running v5.4+ kernel we run:
rmtfs -o /dev/block/platform/soc@0/1d84000.ufshc/by-name -P -r -s
Change-Id: I05a18566370aff1018a79ec2c83532a2849ca359
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: John Stultz <john.stultz@linaro.org>
diff --git a/qcom/rmtfs/storage.c b/qcom/rmtfs/storage.c
index d31f757..4c78ab3 100644
--- a/qcom/rmtfs/storage.c
+++ b/qcom/rmtfs/storage.c
@@ -11,11 +11,7 @@
#define MAX_CALLERS 10
#define STORAGE_MAX_SIZE (16 * 1024 * 1024)
-#ifndef ANDROID
#define BY_PARTLABEL_PATH "/dev/disk/by-partlabel"
-#else
-#define BY_PARTLABEL_PATH "/dev/block/by-name"
-#endif
#define MIN(x, y) ((x) < (y) ? (x) : (y))
@@ -60,7 +56,8 @@
storage_dir = storage_root;
if (use_partitions) {
- storage_dir = BY_PARTLABEL_PATH;
+ if (!storage_root)
+ storage_dir = BY_PARTLABEL_PATH;
storage_use_partitions = true;
}