diff --git a/device.mk b/device.mk index 9398b2d..2b2b51a 100644 --- a/device.mk +++ b/device.mk @@ -239,7 +239,6 @@ PRODUCT_PACKAGES += \ init.oplus.hw.rc \ init.oplus.hw.rc.recovery \ init.oplus.rc \ - init.oplus.sh \ init.qcom.early_boot.sh \ init.qcom.post_boot.sh \ init.qcom.rc \ diff --git a/init/init.oplus.hw.rc b/init/init.oplus.hw.rc index 8f68d6e..b0f3fea 100644 --- a/init/init.oplus.hw.rc +++ b/init/init.oplus.hw.rc @@ -4,12 +4,6 @@ # SPDX-License-Identifier: Apache-2.0 # -on property:ro.boot.rf_version=11 - setprop ro.boot.hardware.revision "CN" - -on property:ro.boot.rf_version=12 - setprop ro.boot.hardware.revision "TMO" - on property:ro.boot.rf_version=13 setprop ro.boot.hardware.revision "IN" diff --git a/init/init.oplus.rc b/init/init.oplus.rc index d1d45ad..f4ee32a 100644 --- a/init/init.oplus.rc +++ b/init/init.oplus.rc @@ -53,9 +53,7 @@ on property:ro.boot.prjname=* on property:sys.boot_completed=1 # Display - copy /vendor/etc/OPlus_QC_LTM_Commercial_SM8250_2020_02_07.pfm /mnt/vendor/persist/data/pfm/licenses/1000-1000-no-exp-958228818.pfm - copy /vendor/etc/Oppo_QC_LTM_Commercial_SM8250_2020_01_15.pfm /mnt/vendor/persist/data/pfm/licenses/1000-1000-no-exp-1186717196.pfm - chown system system /mnt/vendor/persist/data/pfm/licenses/1000-1000-no-exp-1186717196.pfm + copy /vendor/etc/Oppo_QC_LTM_Commercial_2020_01_03.pfm /mnt/vendor/persist/data/pfm/licenses/1000-1000-no-exp-958228818.pfm chown system system /mnt/vendor/persist/data/pfm/licenses/1000-1000-no-exp-958228818.pfm on property:sys.usb.config=adb && property:sys.usb.configfs=1 diff --git a/init/init.target.rc b/init/init.target.rc index 73b924a..cad2ecf 100644 --- a/init/init.target.rc +++ b/init/init.target.rc @@ -1,4 +1,3 @@ - # Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -29,8 +28,10 @@ # on early-init - exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules audio_q6_pdr audio_q6_notifier audio_snd_event audio_apr audio_adsp_loader audio_q6 audio_native audio_usf audio_pinctrl_wcd audio_pinctrl_lpi audio_swr audio_platform audio_hdmi audio_stub audio_wcd_core audio_wsa881x audio_bolero_cdc audio_wsa_macro audio_va_macro audio_rx_macro audio_tx_macro audio_wcd938x audio_wcd938x_slave audio_machine_kona + exec u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules audio_q6_pdr audio_q6_notifier audio_snd_event audio_apr audio_adsp_loader audio_q6 audio_native audio_usf audio_pinctrl_lpi audio_swr audio_platform audio_hdmi audio_stub audio_wcd_core audio_wsa881x audio_wsa883x audio_bolero_cdc audio_wsa_macro audio_va_macro audio_rx_macro audio_tx_macro audio_wcd938x audio_wcd938x_slave audio_wcd937x audio_wcd937x_slave audio_machine_lito write /proc/sys/kernel/sched_boost 1 + exec u:r:vendor_qti_init_shell:s0 -- /vendor/bin/init.qti.early_init.sh + setprop ro.soc.model ${ro.vendor.qti.soc_model} on init write /dev/stune/foreground/schedtune.sched_boost_no_override 1 @@ -40,18 +41,17 @@ on init write /dev/stune/system-background/schedtune.colocate 0 write /dev/stune/foreground/schedtune.colocate 0 write /dev/stune/top-app/schedtune.colocate 1 - wait /dev/block/platform/soc/1d84000.ufshc - symlink /dev/block/platform/soc/1d84000.ufshc /dev/block/bootdevice - chown system system /sys/devices/platform/soc/1d84000.ufshc/auto_hibern8 - chmod 0660 /sys/devices/platform/soc/1d84000.ufshc/auto_hibern8 - start logd + #Moving to init as this is needed for qseecomd + wait /dev/block/platform/soc/${ro.boot.bootdevice} + symlink /dev/block/platform/soc/${ro.boot.bootdevice} /dev/block/bootdevice + start vendor.qseecomd + start keymaster-4-0 on early-fs start vold on fs start hwservicemanager - mkdir /mnt/vendor/spunvm 0660 system system mount_all /vendor/etc/fstab.qcom --early chown root system /mnt/vendor/persist chmod 0771 /mnt/vendor/persist @@ -61,7 +61,6 @@ on fs on post-fs # set RLIMIT_MEMLOCK to 64MB setrlimit 8 67108864 67108864 - write /dev/ipa 1 on late-fs wait_for_prop hwservicemanager.ready true @@ -70,8 +69,6 @@ on late-fs on post-fs-data mkdir /vendor/data/tombstones 0771 system system - # Enable WLAN cold boot calibration - write /sys/devices/platform/soc/b0000000.qcom,cnss-qca6390/fs_ready 1 on early-boot start vendor.sensors @@ -81,20 +78,20 @@ on boot # Add a cpuset for the camera daemon # We want all cores for camera mkdir /dev/cpuset/camera-daemon - write /dev/cpuset/camera-daemon/cpus 0-3 + write /dev/cpuset/camera-daemon/cpus 0-7 write /dev/cpuset/camera-daemon/mems 0 chown cameraserver cameraserver /dev/cpuset/camera-daemon chown cameraserver cameraserver /dev/cpuset/camera-daemon/tasks chmod 0660 /dev/cpuset/camera-daemon/tasks - #USB controller configuration +#USB controller configuration setprop vendor.usb.rndis.func.name "gsi" setprop vendor.usb.rmnet.func.name "gsi" setprop vendor.usb.rmnet.inst.name "rmnet" setprop vendor.usb.dpl.inst.name "dpl" - setprop vendor.usb.qdss.inst.name "qdss" + setprop vendor.usb.qdss.inst.name "qdss_mdm" setprop vendor.usb.controller a600000.dwc3 - # Load all wlan drivers - exec_background u:r:vendor_modprobe:s0 -- /vendor/bin/modprobe -a -d /vendor/lib/modules/ qca_cld3_qca6390 qca_cld3_qca6490 +#Load WLAN driver + insmod /vendor/lib/modules/qca_cld3_wlan.ko on property:vendor.display.lcd_density=560 setprop dalvik.vm.heapgrowthlimit 256m @@ -105,17 +102,14 @@ on property:vendor.display.lcd_density=640 on boot && property:persist.vendor.usb.controller.default=* setprop vendor.usb.controller ${persist.vendor.usb.controller.default} +on property:vendor.usb.controller=* + setprop sys.usb.controller ${vendor.usb.controller} + on charger start vendor.power_off_alarm - setprop sys.usb.controller a600000.dwc3 + setprop vendor.usb.controller a600000.dwc3 setprop sys.usb.configfs 1 -service vendor.lowi /vendor/bin/sscrpcd - class core - user system - group system wakelock - capabilities BLOCK_SUSPEND - #pd-mapper service vendor.pd_mapper /vendor/bin/pd-mapper class core @@ -153,7 +147,7 @@ on property:sys.shutdown.requested=* on property:vold.decrypt=trigger_restart_framework start vendor.cnss_diag -service vendor.cnss_diag /system/vendor/bin/cnss_diag -q -f -b 128 -t HELIUM +service vendor.cnss_diag /system/vendor/bin/cnss_diag -q -f -t HELIUM class main user system group system wifi inet sdcard_rw media_rw diag diff --git a/init/init_oplus.cpp b/init/init_oplus.cpp index 43a2f7c..052356e 100644 --- a/init/init_oplus.cpp +++ b/init/init_oplus.cpp @@ -37,50 +37,14 @@ void vendor_load_properties() { auto rf_version = std::stoi(GetProperty("ro.boot.rf_version", "0")); switch (rf_version) { - case 11: // CN - if (device == "OnePlus8") { - OverrideProperty("ro.product.product.model", "IN2010"); - } else if (device == "OnePlus8T") { - OverrideProperty("ro.product.product.model", "KB2000"); - } else if (device == "OnePlus8Pro") { - OverrideProperty("ro.product.product.model", "IN2020"); - } - break; - case 12: // TMO - if (device == "OnePlus8") { - OverrideProperty("ro.product.product.model", "IN2017"); - } else if (device == "OnePlus8T") { - OverrideProperty("ro.product.product.model", "KB2007"); - } else if (device == "OnePlus8Pro") { - OverrideProperty("ro.product.product.model", "IN2027"); - } - break; case 13: // IN - if (device == "OnePlus8") { - OverrideProperty("ro.product.product.model", "IN2011"); - } else if (device == "OnePlus8T") { - OverrideProperty("ro.product.product.model", "KB2001"); - } else if (device == "OnePlus8Pro") { - OverrideProperty("ro.product.product.model", "IN2021"); - } + OverrideProperty("ro.product.product.model", "AC2001"); break; case 14: // EU - if (device == "OnePlus8") { - OverrideProperty("ro.product.product.model", "IN2013"); - } else if (device == "OnePlus8T") { - OverrideProperty("ro.product.product.model", "KB2003"); - } else if (device == "OnePlus8Pro") { - OverrideProperty("ro.product.product.model", "IN2023"); - } + OverrideProperty("ro.product.product.model", "AC2003"); break; case 15: // NA - if (device == "OnePlus8") { - OverrideProperty("ro.product.product.model", "IN2015"); - } else if (device == "OnePlus8T") { - OverrideProperty("ro.product.product.model", "KB2005"); - } else if (device == "OnePlus8Pro") { - OverrideProperty("ro.product.product.model", "IN2025"); - } + OverrideProperty("ro.product.product.model", "AC2005"); break; default: LOG(ERROR) << "Unexpected RF version: " << rf_version;