Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Bringup Xiaomi Mi 9T (davinci) to 20.0 from 17.1 #234

Closed
GarciaLnk wants to merge 2 commits into from
Closed

Bringup Xiaomi Mi 9T (davinci) to 20.0 from 17.1 #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5017f8c
20.0: davinci bringup
GarciaLnk Aug 11, 2023
81de1a0
17.1: drop davinci
GarciaLnk Aug 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Manifests/Manifest_LAOS-17.1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,12 +109,6 @@
<project path="device/cyanogen/msm8916-common" name="LineageOS/android_device_cyanogen_msm8916-common" remote="github" />
<project path="kernel/cyanogen/msm8916" name="LineageOS/android_kernel_cyanogen_msm8916" remote="github" />

<!-- Xiaomi Redmi K20 / Mi 9T (davinci) -->
<project path="hardware/xiaomi" name="LineageOS/android_hardware_xiaomi" remote="github" />
<project path="device/xiaomi/davinci" name="LineageOS/android_device_xiaomi_davinci" remote="github" />
<project path="device/xiaomi/sm6150-common" name="LineageOS/android_device_xiaomi_sm6150-common" remote="github" />
<project path="kernel/xiaomi/sm6150" name="LineageOS/android_kernel_xiaomi_sm6150" remote="github" />

<!-- Yandex Phone (Amber) -->
<project path="device/yandex/Amber" name="LineageOS/android_device_yandex_Amber" remote="github" />
<project path="kernel/yandex/sdm660" name="LineageOS/android_kernel_yandex_sdm660" remote="github" />
Expand All @@ -124,7 +118,6 @@
<project path="vendor/oneplus" name="[COLOUR IN THE LINES]/proprietary_vendor_oneplus" remote="github" />
<project path="vendor/oppo" name="[COLOUR IN THE LINES]/proprietary_vendor_oppo" remote="github" />
<project path="vendor/wileyfox" name="[COLOUR IN THE LINES]/proprietary_vendor_wileyfox" remote="github" />
<project path="vendor/xiaomi" name="[COLOUR IN THE LINES]/proprietary_vendor_xiaomi" remote="gitlab" revision="lineage-17.1" />
<project path="vendor/yandex" name="[COLOUR IN THE LINES]/proprietary_vendor_yandex" remote="github" />

</manifest>
7 changes: 7 additions & 0 deletions Manifests/Manifest_LAOS-20.0.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,11 @@
<!-- Xiaomi Mi 8 Explorer Edition (ursa) -->
<project path="device/xiaomi/ursa" name="LineageOS/android_device_xiaomi_ursa" remote="github" revision="lineage-20" />

<!-- Xiaomi Redmi K20 / Mi 9T (davinci) -->
<project path="device/xiaomi/davinci" name="LineageOS/android_device_xiaomi_davinci" remote="github" revision="lineage-20" />
<project path="device/xiaomi/sm6150-common" name="LineageOS/android_device_xiaomi_sm6150-common" remote="github" revision="lineage-20" />
<project path="kernel/xiaomi/sm6150" name="LineageOS/android_kernel_xiaomi_sm6150" remote="github" revision="lineage-20" />

<!-- Proprietary Blobs -->
<project path="vendor/fairphone/FP3" name="[COLOUR IN THE LINES]/proprietary_vendor_fairphone_FP3" remote="github" revision="lineage-20" />
<project path="vendor/fairphone/FP4" name="[COLOUR IN THE LINES]/proprietary_vendor_fairphone_FP4" remote="github" revision="lineage-20" />
Expand Down Expand Up @@ -321,6 +326,8 @@
<project path="vendor/xiaomi/sm8250-common" name="[COLOUR IN THE LINES]/proprietary_vendor_xiaomi_sm8250-common" remote="github" revision="lineage-20" />
<project path="vendor/xiaomi/lmi" name="[COLOUR IN THE LINES]/proprietary_vendor_xiaomi_lmi" remote="github" revision="lineage-20" />
<project path="vendor/xiaomi/alioth" name="[COLOUR IN THE LINES]/proprietary_vendor_xiaomi_alioth" remote="github" revision="lineage-20" />
<project path="vendor/xiaomi/sm6150-common" name="[COLOUR IN THE LINES]/proprietary_vendor_xiaomi_sm6150-common" remote="github" revision="lineage-20" />
<project path="vendor/xiaomi/davinci" name="[COLOUR IN THE LINES]/proprietary_vendor_xiaomi_davinci" remote="github" revision="lineage-20" />
<project path="vendor/google/bluejay" name="[COLOUR IN THE LINES]/proprietary_vendor_google_bluejay" remote="gitlab" revision="lineage-20" />
<project path="vendor/google/cheetah" name="[COLOUR IN THE LINES]/proprietary_vendor_google_cheetah" remote="gitlab" revision="lineage-20" />
<project path="vendor/google/oriole" name="[COLOUR IN THE LINES]/proprietary_vendor_google_oriole" remote="gitlab" revision="lineage-20" />
Expand Down
3 changes: 2 additions & 1 deletion Scripts/Common/Optimize.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ sed -i 's/zramsize=.*/zramsize=50%,max_comp_streams=8/' essential/mata/rootdir/e
sed -i 's/zramsize=.*/zramsize=50%,max_comp_streams=4/' zte/axon7/rootdir/etc/fstab.qcom &>/dev/null || true;
sed -i 's/zramsize=.*/zramsize=50%,max_comp_streams=8/' sony/tama-common/rootdir/etc/fstab.qcom &>/dev/null || true;
#4GB+ (2GB+)
sed -i 's/zramsize=.*/zramsize=50%,max_comp_streams=8/' google/redbull/fstab.hardware google/sunfish/fstab.hardware oneplus/msm8998-common/rootdir/etc/fstab.qcom oneplus/sdm845-common/rootdir/etc/fstab.qcom xiaomi/sm6150-common/rootdir/etc/fstab*.qcom &>/dev/null || true;
sed -i 's/zramsize=.*/zramsize=50%,max_comp_streams=8/' google/redbull/fstab.hardware google/sunfish/fstab.hardware oneplus/msm8998-common/rootdir/etc/fstab.qcom oneplus/sdm845-common/rootdir/etc/fstab.qcom &>/dev/null || true;
sed -i 's/zramsize=.*/zramsize=50%,max_comp_streams=8,zram_backingdev_size=512M/' xiaomi/sm6150-common/rootdir/etc/fstab.zram &>/dev/null || true;
Copy link
Member

@SkewedZeppelin SkewedZeppelin Aug 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why have both zramsize and zram_backingdev_size?

Copy link
Contributor Author

@GarciaLnk GarciaLnk Aug 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm just respecting the device tree changes, zram_backingdev_size seems to enable zram writeback with a 512M limit.

Alternatively, the sed regex could be changed to keep additional changes and only modify the values of zramsize and max_comp_streams if that's the intent of the patch.

echo "Finished zram tweaks";
fi;

Expand Down
4 changes: 1 addition & 3 deletions Scripts/LineageOS-17.1/Functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ umask 0022;
#Last verified: 2021-10-16

patchAllKernels() {
startPatcher "kernel_cyanogen_msm8916 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_oneplus_msm8994 kernel_xiaomi_sm6150 kernel_yandex_sdm660";
startPatcher "kernel_cyanogen_msm8916 kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_oneplus_msm8994 kernel_yandex_sdm660";
}
export -f patchAllKernels;

Expand Down Expand Up @@ -62,8 +62,6 @@ buildAll() {
buildDevice clark;
#SD810
buildDevice oneplus2;
#SD730
buildDevice davinci avb;
#SD660
buildDevice Amber verity;
}
Expand Down
8 changes: 0 additions & 8 deletions Scripts/LineageOS-17.1/Patch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,14 +539,6 @@ if enterAndClear "device/oppo/common"; then
awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation
fi;

if enterAndClear "device/xiaomi/davinci"; then
smallerSystem;
Copy link
Member

@SkewedZeppelin SkewedZeppelin Aug 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are you sure it fits?

Copy link
Contributor Author

@GarciaLnk GarciaLnk Aug 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The system partition in davinci is 3.5 GiB large, so I don't see why the system image would need further reduction. I have used DivestOS in davinci in the past up to 19.1, without using smallerSystem, and I haven't faced any issues.

fi;

if enterAndClear "device/xiaomi/sm6150-common"; then
smallerSystem;
fi;

#Make changes to all devices
cd "$DOS_BUILD_BASE";
find "hardware/qcom/gps" -name "gps\.conf" -type f -print0 | xargs -0 -n 1 -P 4 -I {} bash -c 'hardenLocationConf "{}"';
Expand Down
0 ..._Patchers/android_kernel_xiaomi_sm6150.sh → ..._Patchers/android_kernel_xiaomi_sm6150.sh
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion Scripts/LineageOS-20.0/Functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ umask 0022;
#Last verified: 2022-10-15

patchAllKernels() {
startPatcher "kernel_essential_msm8998 kernel_fairphone_sdm632 kernel_fairphone_sm7225 kernel_fxtec_msm8998 kernel_fxtec_sm6115 kernel_google_gs101_private_gs-google kernel_google_gs201_private_gs-google kernel_google_msm-4.9 kernel_google_msm-4.14 kernel_google_redbull kernel_google_wahoo kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm7250 kernel_oneplus_sm8150 kernel_oneplus_sm8250 kernel_oneplus_sm8350 kernel_razer_msm8998 kernel_razer_sdm845 kernel_samsung_exynos9810 kernel_sony_sdm845 kernel_xiaomi_msm8937 kernel_xiaomi_sdm845 kernel_xiaomi_sm8250";
startPatcher "kernel_essential_msm8998 kernel_fairphone_sdm632 kernel_fairphone_sm7225 kernel_fxtec_msm8998 kernel_fxtec_sm6115 kernel_google_gs101_private_gs-google kernel_google_gs201_private_gs-google kernel_google_msm-4.9 kernel_google_msm-4.14 kernel_google_redbull kernel_google_wahoo kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm7250 kernel_oneplus_sm8150 kernel_oneplus_sm8250 kernel_oneplus_sm8350 kernel_razer_msm8998 kernel_razer_sdm845 kernel_samsung_exynos9810 kernel_sony_sdm845 kernel_xiaomi_msm8937 kernel_xiaomi_sdm845 kernel_xiaomi_sm8250 kernel_xiaomi_sm6150";
}
export -f patchAllKernels;

Expand Down Expand Up @@ -90,6 +90,7 @@ buildAll() {
buildDevice flame avb;
#SD730
buildDevice sunfish avb;
buildDevice davinci avb;
#SD632
buildDevice FP3 avb;
#SD865
Expand Down