diff options
| author | Davide Garberi <dade.garberi@gmail.com> | 2019-02-01 20:12:47 +0100 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2022-07-27 18:58:41 +0200 |
| commit | 3ecb8962ecd99fb3af78bddada93bc0a2f682d2b (patch) | |
| tree | ced1e4e3461ef08eda14f8c8ccceb12885716515 | |
| parent | f986616bbd99efa9d5fcf13c5783dde56467a6f4 (diff) | |
dts: zuk: Update the fstab configuration
* Do not mount /system as system-as-root, android 10 does it anyway moving the mount on init
* Remove vbmeta since that's needed only for AVB devices
* Mount factory as /vendor partition
* Use android_system and android_vendor links since those are available for msm8996
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
Change-Id: I8f4093bbc43c2f03c0c3f1bf7bd678ce0e609905
| -rwxr-xr-x | arch/arm/boot/dts/qcom/zuk/common.dtsi | 19 | ||||
| -rwxr-xr-x | arch/arm/boot/dts/qcom/zuk/z2_plus-base.dtsi | 8 | ||||
| -rwxr-xr-x | arch/arm/boot/dts/qcom/zuk/z2_row-base.dtsi | 8 |
3 files changed, 35 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/zuk/common.dtsi b/arch/arm/boot/dts/qcom/zuk/common.dtsi index 5ea6b249bfe1..284711585dad 100755 --- a/arch/arm/boot/dts/qcom/zuk/common.dtsi +++ b/arch/arm/boot/dts/qcom/zuk/common.dtsi @@ -335,3 +335,22 @@ &i2c_8 { /delete-node/ nq@28; }; + +&firmware { + android { + /delete-node/ vbmeta; + fstab { + android_system: system { + compatible = "android,system"; + type = "ext4"; + mnt_flags = "ro,barrier=1,discard"; + fsmgr_flags = "wait"; + status = "ok"; + }; + }; + }; +}; + +&android_vendor { + fsmgr_flags = "wait"; +}; diff --git a/arch/arm/boot/dts/qcom/zuk/z2_plus-base.dtsi b/arch/arm/boot/dts/qcom/zuk/z2_plus-base.dtsi index f7f55d09afa4..fa5116ff4a34 100755 --- a/arch/arm/boot/dts/qcom/zuk/z2_plus-base.dtsi +++ b/arch/arm/boot/dts/qcom/zuk/z2_plus-base.dtsi @@ -119,3 +119,11 @@ qcom,ilim-ma = <105>; qcom,int-pwm-freq-khz = <253>;//lowest:253Khz }; + +&android_vendor { + dev = "/dev/block/platform/soc/7464900.sdhci/by-name/factory"; +}; + +&android_system { + dev = "/dev/block/platform/soc/7464900.sdhci/by-name/system"; +}; diff --git a/arch/arm/boot/dts/qcom/zuk/z2_row-base.dtsi b/arch/arm/boot/dts/qcom/zuk/z2_row-base.dtsi index 54cb4a3a812c..7b0f81ae3da4 100755 --- a/arch/arm/boot/dts/qcom/zuk/z2_row-base.dtsi +++ b/arch/arm/boot/dts/qcom/zuk/z2_row-base.dtsi @@ -215,3 +215,11 @@ qcom,wave-play-rate-us = <4166>; qcom,ilim-ma = <85>; }; + +&android_vendor { + dev = "/dev/block/platform/soc/624000.ufshc/by-name/factory"; +}; + +&android_system { + dev = "/dev/block/platform/soc/624000.ufshc/by-name/system"; +}; |