diff --git a/Android.mk b/Android.mk index 6bf9a03..008b561 100644 --- a/Android.mk +++ b/Android.mk @@ -7,6 +7,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),hiphi) +ifeq ($(TARGET_DEVICE),eqs) include $(call all-subdir-makefiles,$(LOCAL_PATH)) endif diff --git a/AndroidProducts.mk b/AndroidProducts.mk index 606c4e1..136bb43 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -6,9 +6,9 @@ # PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/twrp_hiphi.mk + $(LOCAL_DIR)/twrp_eqs.mk COMMON_LUNCH_CHOICES := \ - twrp_hiphi-user \ - twrp_hiphi-userdebug \ - twrp_hiphi-eng + twrp_eqs-user \ + twrp_eqs-userdebug \ + twrp_eqs-eng diff --git a/BoardConfig.mk b/BoardConfig.mk index 8535fcd..25a022c 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -5,7 +5,7 @@ # SPDX-License-Identifier: Apache-2.0 # -DEVICE_PATH := device/motorola/hiphi +DEVICE_PATH := device/motorola/eqs # For building with minimal manifest ALLOW_MISSING_DEPENDENCIES := true @@ -50,8 +50,8 @@ TARGET_USES_REMOTEPROC := true TARGET_SCREEN_DENSITY := 400 # Init -TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_hiphi -TARGET_RECOVERY_DEVICE_MODULES := libinit_hiphi +#TARGET_INIT_VENDOR_LIB := //$(DEVICE_PATH):libinit_eqs +#TARGET_RECOVERY_DEVICE_MODULES := libinit_eqs # Kernel TARGET_PREBUILT_KERNEL := $(DEVICE_PATH)/prebuilt/kernel @@ -137,7 +137,7 @@ TW_INCLUDE_NTFS_3G := true TW_BACKUP_EXCLUSIONS := /data/fonts TW_NO_SCREEN_BLANK := true TW_BRIGHTNESS_PATH := "/sys/class/backlight/panel0-backlight/brightness" -TW_MAX_BRIGHTNESS := 2047 +TW_MAX_BRIGHTNESS := 3515 TW_DEFAULT_BRIGHTNESS := 1024 TW_FRAMERATE := 60 TW_HAS_EDL_MODE := true diff --git a/README.md b/README.md index dcd8973..f198ed5 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,24 @@ -Device configuration for Motorola Edge 30 Pro / Edge Plus (2022) / Edge Plus 5G UW / Edge X30 (hiphi/hiphic/hiphid) +Device configuration for Edge 30 Ultra / Edge X30 Pro (codenamed "eqs") ========================================= -The Motorola Edge 30 Pro / Edge Plus (2022) / Edge Plus 5G UW / Edge X30 (codenamed _"hiphi/hiphic/hiphid"_) is a flagship smartphone from Motorola mobility announced in December 2021. +The Motorola Edge 30 Ultra / Edge X30 Pro (codenamed _"eqs"_) is a flagship smartphone from Motorola mobility announced in December 2021. ## Device specifications Basic | Spec Sheet -------:|:------------------------- -SoC | Qualcomm SM8450 Snapdragon 8 Gen 1 (4 nm) -CPU | Octa-core (1x3.0 GHz Kryo 780 & 3x2.5 GHz Kryo 780 & 4x1.8GHz Kryo 780) +SoC | Qualcomm SM8475 Snapdragon 8+ Gen 1 (4 nm) +CPU | Octa-core (1x3.19 GHz Cortex-X2 & 3x2.75 GHz Cortex-A710 & 4x1.8GHz Cortex-A510) GPU | Adreno 730 Memory | 8/12 GB RAM (LPDDR5) Shipped Android Version | 12.0, My UX 3.0 (Global) / MY UI 3.0 (China) Storage | 128/256/512 GB (UFS 3.1) -Battery | Non-removable Li-Po 4800 mAh (Global) / 5000 mAh (China) battery -Display | 2400 x 1080 pixels, 6.18 inches (~403 ppi density) -Camera | 50MP (Main) + 50MP (Ultra-wide) + 2MP (Depth) + 60MP (Selfie) +Battery | Non-removable Li-Po 4610 mAh battery +Display | 2400 x 1080 pixels, 6.67 inches (~403 ppi density) +Camera | 200MP (Main) + 50MP (Ultra-wide) + 12MP (Telephoto) + 60MP (Selfie) ## Device picture -![Motorola Edge 30 Pro / Edge Plus (2022) / Edge Plus 5G UW / Edge X30](https://i.imgur.com/B0cNJ79.png) +![Motorola Edge 30 Ultra / Edge X30 Pro](https://fdn2.gsmarena.com/vv/pics/motorola/motorola-edge-30-ultra-3.jpg) # Status Current state of features: @@ -47,7 +47,7 @@ Current state of features: ```bash export ALLOW_MISSING_DEPENDENCIES=true source build/envsetup.sh -lunch twrp_hiphi-eng +lunch twrp_eqs-eng mka recoveryimage -j$(nproc --all) ``` diff --git a/bootctrl/Android.bp b/bootctrl/Android.bp index 4778f28..bc91110 100644 --- a/bootctrl/Android.bp +++ b/bootctrl/Android.bp @@ -15,14 +15,14 @@ // cc_library { - name: "bootctrl.moto_sm8450", + name: "bootctrl.moto_sm8475", defaults: ["bootctrl_hal_defaults"], - static_libs: ["libgptutils.moto_sm8450"], + static_libs: ["libgptutils.moto_sm8475"], } cc_library_shared { name: "android.hardware.boot@1.2-impl-qti", stem: "android.hardware.boot@1.0-impl-1.2-qti", defaults: ["android.hardware.boot@1.2-impl-qti_defaults"], - static_libs: ["libgptutils.moto_sm8450"], + static_libs: ["libgptutils.moto_sm8475"], } diff --git a/gpt-utils/Android.bp b/gpt-utils/Android.bp index fb5801a..4bb3ecf 100644 --- a/gpt-utils/Android.bp +++ b/gpt-utils/Android.bp @@ -15,7 +15,7 @@ // cc_library { - name: "libgptutils.moto_sm8450", + name: "libgptutils.moto_sm8475", vendor: true, recovery_available: true, shared_libs: [ diff --git a/libinit/Android.bp b/libinit/Android.bp.bak similarity index 84% rename from libinit/Android.bp rename to libinit/Android.bp.bak index ce128de..0680f51 100644 --- a/libinit/Android.bp +++ b/libinit/Android.bp.bak @@ -5,9 +5,9 @@ // cc_library_static { - name: "libinit_hiphi", + name: "libinit_eqs", recovery_available: true, - srcs: ["init_hiphi.cpp"], + srcs: ["init_eqs.cpp"], whole_static_libs: ["libbase"], include_dirs: [ "system/core/init", diff --git a/libinit/init_hiphi.cpp b/libinit/init_eqs.cpp similarity index 77% rename from libinit/init_hiphi.cpp rename to libinit/init_eqs.cpp index ef3d4e7..9e55df4 100644 --- a/libinit/init_hiphi.cpp +++ b/libinit/init_eqs.cpp @@ -79,18 +79,6 @@ void load_device_properties(const std::string& description, const std::string& f void vendor_load_properties() { const std::string sku = GetProperty("ro.boot.hardware.sku", ""); if (sku == "XT2201-1") { - load_device_properties("hiphi-user 12 S3SHS32.12-42-11-5 bf0951", "motorola/hiphi/hiphi:12/S3SHS32.12-42-11-5/bf0951:user/release-keys", "hiphi", "Motorola Edge 30 Pro"); - } - if (sku == "XT2201-3") { - load_device_properties("hiphi-user 12 S3SHS32.12-42-11-5 bf0951", "motorola/hiphi/hiphi:12/S3SHS32.12-42-11-5/bf0951:user/release-keys", "hiphi", "Motorola Edge Plus (2022)"); - } - if (sku == "XT2201-4") { - load_device_properties("hiphi-user 12 S3SHS32.12-42-11-5 bf0951", "motorola/hiphi/hiphi:12/S3SHS32.12-42-11-5/bf0951:user/release-keys", "hiphi", "Motorola Edge Plus 5G UW"); - } - if (sku == "XT2201-2") { - load_device_properties("hiphic-user 12 S3SC32.7-42-20 02af5", "motorola/hiphic/hiphic:12/S3SC32.7-42-20/02af5:user/release-keys", "hiphic", "Motorola Edge X30"); - } - if (sku == "XT2201-6") { - load_device_properties("hiphid-user 12 S3SF32.35-5-9 37351", "motorola/hiphid/hiphid:12/S3SF32.35-5-9/37351:user/release-keys", "hiphid", "Motorola Edge X30"); + load_device_properties("eqs-user 12 S3SHS32.12-42-11-5 bf0951", "motorola/eqs/eqs:12/S3SHS32.12-42-11-5/bf0951:user/release-keys", "eqs", "Motorola Edge 30 Pro"); } } diff --git a/recovery/root/system/bin/android.hardware.gatekeeper@1.0-service-qti b/recovery/root/system/bin/android.hardware.gatekeeper@1.0-service-qti old mode 100644 new mode 100755 diff --git a/recovery/root/system/bin/android.hardware.keymaster@4.0-strongbox-service-qti b/recovery/root/system/bin/android.hardware.keymaster@4.0-strongbox-service-qti new file mode 100755 index 0000000..dab1d33 Binary files /dev/null and b/recovery/root/system/bin/android.hardware.keymaster@4.0-strongbox-service-qti differ diff --git a/recovery/root/system/bin/android.hardware.keymaster@4.1-service-qti b/recovery/root/system/bin/android.hardware.keymaster@4.1-service-qti old mode 100644 new mode 100755 diff --git a/recovery/root/system/bin/android.hardware.security.keymint-service-qti b/recovery/root/system/bin/android.hardware.security.keymint-service-qti old mode 100644 new mode 100755 diff --git a/recovery/root/system/bin/qseecomd b/recovery/root/system/bin/qseecomd old mode 100644 new mode 100755 diff --git a/recovery/root/system/bin/vendor.qti.hardware.qteeconnector@1.0-service b/recovery/root/system/bin/vendor.qti.hardware.qteeconnector@1.0-service old mode 100644 new mode 100755 diff --git a/recovery/root/system/bin/vendor.qti.hardware.vibrator.service b/recovery/root/system/bin/vendor.qti.hardware.vibrator.service old mode 100644 new mode 100755 diff --git a/recovery/root/vendor/etc/vintf/manifest.xml b/recovery/root/vendor/etc/vintf/manifest.xml index f2d427e..ce47e33 100644 --- a/recovery/root/vendor/etc/vintf/manifest.xml +++ b/recovery/root/vendor/etc/vintf/manifest.xml @@ -1,9 +1,8 @@ @@ -104,6 +103,11 @@ hwbinder @4.1::IKeymasterDevice/default + + android.hardware.keymaster + hwbinder + @4.0::IKeymasterDevice/strongbox + android.hardware.media.omx hwbinder @@ -206,25 +210,15 @@ @1.1::IDisplayPanel/default - - com.motorola.hardware.display.stylus - hwbinder - 1.1 - - IMotStylus - default - - @1.1::IMotStylus/default - com.motorola.hardware.display.touch hwbinder - 1.1 + 1.2 IMotTouch default - @1.1::IMotTouch/default + @1.2::IMotTouch/default com.qualcomm.qti.dpm.api @@ -323,12 +317,32 @@ motorola.hardware.wireless.powershare hwbinder - 2.0 + 1.0 IMotPowerShare default - @2.0::IMotPowerShare/default + @1.0::IMotPowerShare/default + + + motorola.hardware.wireless.wlc + hwbinder + 2.0 + + IMotWlc + default + + @2.0::IMotWlc/default + + + vendor.egistec.hardware.fingerprint + hwbinder + 4.0 + + IBiometricsFingerprintRbs + default + + @4.0::IBiometricsFingerprintRbs/default vendor.nxp.hardware.nfc @@ -764,13 +778,13 @@ vendor.qti.ims.factory hwbinder 1.1 - 2.1 + 2.2 IImsFactory default @1.1::IImsFactory/default - @2.1::IImsFactory/default + @2.2::IImsFactory/default vendor.qti.imsrtpservice @@ -806,6 +820,36 @@ @1.0::IQspmhal/default + + vendor.qti.spu + hwbinder + 1.1 + + ISPUManager + default + + @1.1::ISPUManager/default + + + vendor.qti.spu + hwbinder + 2.0 + + ISPUManager + default + + @2.0::ISPUManager/default + + + vendor.zui.hardware.ifaa + hwbinder + 1.0 + + IIFAADevice + default + + @1.0::IIFAADevice/default + 31.0 diff --git a/recovery/root/vendor/lib64/hw/android.hardware.health@2.0-impl-2.1-qti.so b/recovery/root/vendor/lib64/hw/android.hardware.health@2.0-impl-2.1-qti.so index 1a919da..1c97e0d 100644 Binary files a/recovery/root/vendor/lib64/hw/android.hardware.health@2.0-impl-2.1-qti.so and b/recovery/root/vendor/lib64/hw/android.hardware.health@2.0-impl-2.1-qti.so differ diff --git a/recovery/root/vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so b/recovery/root/vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so index 8b1b58f..f57cc71 100644 Binary files a/recovery/root/vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so and b/recovery/root/vendor/lib64/hw/vendor.qti.hardware.qteeconnector@1.0-impl.so differ diff --git a/recovery/root/vendor/lib64/libboot_control_qti.so b/recovery/root/vendor/lib64/libboot_control_qti.so index d55b18b..a0b330f 100644 Binary files a/recovery/root/vendor/lib64/libboot_control_qti.so and b/recovery/root/vendor/lib64/libboot_control_qti.so differ diff --git a/recovery/root/vendor/lib64/libdiag.so b/recovery/root/vendor/lib64/libdiag.so index 3836594..807eb42 100644 Binary files a/recovery/root/vendor/lib64/libdiag.so and b/recovery/root/vendor/lib64/libdiag.so differ diff --git a/recovery/root/vendor/lib64/libdrmutils.so b/recovery/root/vendor/lib64/libdrmutils.so index 8c0954e..4a7dd23 100644 Binary files a/recovery/root/vendor/lib64/libdrmutils.so and b/recovery/root/vendor/lib64/libdrmutils.so differ diff --git a/recovery/root/vendor/lib64/libkeymasterdeviceutils.so b/recovery/root/vendor/lib64/libkeymasterdeviceutils.so index 42517de..b7ecdcf 100644 Binary files a/recovery/root/vendor/lib64/libkeymasterdeviceutils.so and b/recovery/root/vendor/lib64/libkeymasterdeviceutils.so differ diff --git a/recovery/root/vendor/lib64/libkeymasterprovision.so b/recovery/root/vendor/lib64/libkeymasterprovision.so index d7aa69d..b404e7c 100644 Binary files a/recovery/root/vendor/lib64/libkeymasterprovision.so and b/recovery/root/vendor/lib64/libkeymasterprovision.so differ diff --git a/recovery/root/vendor/lib64/libkeymasterutils.so b/recovery/root/vendor/lib64/libkeymasterutils.so index 123e0fd..845b169 100644 Binary files a/recovery/root/vendor/lib64/libkeymasterutils.so and b/recovery/root/vendor/lib64/libkeymasterutils.so differ diff --git a/recovery/root/vendor/lib64/libminksocket_vendor.so b/recovery/root/vendor/lib64/libminksocket_vendor.so index c4e638f..f1659d2 100644 Binary files a/recovery/root/vendor/lib64/libminksocket_vendor.so and b/recovery/root/vendor/lib64/libminksocket_vendor.so differ diff --git a/recovery/root/vendor/lib64/libops.so b/recovery/root/vendor/lib64/libops.so index ccd08a3..82d9e08 100644 Binary files a/recovery/root/vendor/lib64/libops.so and b/recovery/root/vendor/lib64/libops.so differ diff --git a/recovery/root/vendor/lib64/libqmi_client_qmux.so b/recovery/root/vendor/lib64/libqmi_client_qmux.so index 12cec04..5daedd8 100644 Binary files a/recovery/root/vendor/lib64/libqmi_client_qmux.so and b/recovery/root/vendor/lib64/libqmi_client_qmux.so differ diff --git a/recovery/root/vendor/lib64/libqmiservices.so b/recovery/root/vendor/lib64/libqmiservices.so index b8ee29d..ceb9d28 100644 Binary files a/recovery/root/vendor/lib64/libqmiservices.so and b/recovery/root/vendor/lib64/libqmiservices.so differ diff --git a/recovery/root/vendor/lib64/libqtikeymaster4.so b/recovery/root/vendor/lib64/libqtikeymaster4.so index 3ecce52..ecd3b7f 100644 Binary files a/recovery/root/vendor/lib64/libqtikeymaster4.so and b/recovery/root/vendor/lib64/libqtikeymaster4.so differ diff --git a/recovery/root/vendor/lib64/libqtikeymint.so b/recovery/root/vendor/lib64/libqtikeymint.so index 8f541d1..99c0482 100644 Binary files a/recovery/root/vendor/lib64/libqtikeymint.so and b/recovery/root/vendor/lib64/libqtikeymint.so differ diff --git a/recovery/root/vendor/lib64/libsoc_helper.so b/recovery/root/vendor/lib64/libsoc_helper.so index 67dce4f..c1668d5 100644 Binary files a/recovery/root/vendor/lib64/libsoc_helper.so and b/recovery/root/vendor/lib64/libsoc_helper.so differ diff --git a/recovery/root/vendor/lib64/libsoc_helper_jni.so b/recovery/root/vendor/lib64/libsoc_helper_jni.so index dd834a7..6da0cf7 100644 Binary files a/recovery/root/vendor/lib64/libsoc_helper_jni.so and b/recovery/root/vendor/lib64/libsoc_helper_jni.so differ diff --git a/recovery/root/vendor/lib64/libspcom.so b/recovery/root/vendor/lib64/libspcom.so index a889ba0..e976c37 100644 Binary files a/recovery/root/vendor/lib64/libspcom.so and b/recovery/root/vendor/lib64/libspcom.so differ diff --git a/recovery/root/vendor/lib64/vendor.qti.hardware.vibrator.impl.so b/recovery/root/vendor/lib64/vendor.qti.hardware.vibrator.impl.so index bbf4a79..6644c4b 100644 Binary files a/recovery/root/vendor/lib64/vendor.qti.hardware.vibrator.impl.so and b/recovery/root/vendor/lib64/vendor.qti.hardware.vibrator.impl.so differ diff --git a/twrp_hiphi.mk b/twrp_eqs.mk similarity index 74% rename from twrp_hiphi.mk rename to twrp_eqs.mk index 914078c..079f864 100644 --- a/twrp_hiphi.mk +++ b/twrp_eqs.mk @@ -16,11 +16,11 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk) # Inherit some common TWRP stuff. $(call inherit-product, vendor/twrp/config/common.mk) -# Inherit from hiphi device -$(call inherit-product, device/motorola/hiphi/device.mk) +# Inherit from eqs device +$(call inherit-product, device/motorola/eqs/device.mk) -PRODUCT_DEVICE := hiphi -PRODUCT_NAME := twrp_hiphi +PRODUCT_DEVICE := eqs +PRODUCT_NAME := twrp_eqs PRODUCT_BRAND := motorola PRODUCT_MODEL := motorola edge 30 pro PRODUCT_MANUFACTURER := motorola @@ -28,6 +28,6 @@ PRODUCT_MANUFACTURER := motorola PRODUCT_GMS_CLIENTID_BASE := android-motorola PRODUCT_BUILD_PROP_OVERRIDES += \ - PRIVATE_BUILD_DESC="hiphi-user 12 S3SHS32.12-42-11-5 bf0951 release-keys" + PRIVATE_BUILD_DESC="eqs-user 12 S3SHS32.12-42-11-5 bf0951 release-keys" -BUILD_FINGERPRINT := motorola/hiphi/hiphi:12/S3SHS32.12-42-11-5/bf0951:user/release-keys +BUILD_FINGERPRINT := motorola/eqs/eqs:12/S3SHS32.12-42-11-5/bf0951:user/release-keys