From 70f671d76cf2f30e29ac3a619e30eaa39a32a27c Mon Sep 17 00:00:00 2001 From: doomvrr Date: Thu, 10 Aug 2023 23:52:16 +0300 Subject: [PATCH] x1slte -> r8s * changed device identifiers * update proprietary files list --- Android.mk | 2 +- AndroidProducts.mk | 8 +++--- BoardConfig.mk | 12 ++++----- README.md | 18 ++++++------- device.mk | 10 +++---- extract-files.sh | 4 +-- lineage.dependencies | 4 +-- lineage_x1slte.mk => lineage_r8s.mk | 18 ++++++------- proprietary-files.txt | 41 ++++++++++++++++++++--------- setup-makefiles.sh | 4 +-- 10 files changed, 69 insertions(+), 52 deletions(-) rename lineage_x1slte.mk => lineage_r8s.mk (75%) diff --git a/Android.mk b/Android.mk index bd42ec2..fb60e7a 100644 --- a/Android.mk +++ b/Android.mk @@ -21,7 +21,7 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_DEVICE),x1slte) +ifeq ($(TARGET_DEVICE),r8s) include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/AndroidProducts.mk b/AndroidProducts.mk index cb3eeef..653b96c 100644 --- a/AndroidProducts.mk +++ b/AndroidProducts.mk @@ -14,9 +14,9 @@ # limitations under the License. PRODUCT_MAKEFILES := \ - $(LOCAL_DIR)/lineage_x1slte.mk + $(LOCAL_DIR)/lineage_r8s.mk COMMON_LUNCH_CHOICES := \ - lineage_x1slte-user \ - lineage_x1slte-userdebug \ - lineage_x1slte-eng + lineage_r8s-user \ + lineage_r8s-userdebug \ + lineage_r8s-eng diff --git a/BoardConfig.mk b/BoardConfig.mk index 5f162d7..bf8b7e7 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -14,18 +14,18 @@ # limitations under the License. # inherit from common -include device/samsung/universal990-common/BoardConfigCommon.mk +include device/samsung/exynos990-common/BoardConfigCommon.mk -DEVICE_PATH := device/samsung/x1slte +DEVICE_PATH := device/samsung/r8s # Display -TARGET_SCREEN_DENSITY := 480 +TARGET_SCREEN_DENSITY := 420 # Kernel -TARGET_KERNEL_CONFIG := exynos9830-x1slte_defconfig +TARGET_KERNEL_CONFIG := exynos9830-r8slte_defconfig # OTA -TARGET_OTA_ASSERT_DEVICE := x1slte +TARGET_OTA_ASSERT_DEVICE := r8s # inherit from the proprietary version --include vendor/samsung/x1slte/BoardConfigVendor.mk +-include vendor/samsung/r8s/BoardConfigVendor.mk diff --git a/README.md b/README.md index 680131c..7bf54e8 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ Copyright 2023 - The LineageOS Project -Device configuration for Samsung Galaxy S20 LTE (SM-G980F). +Device configuration for Samsung Galaxy S20 FE (SM-G780F). ======================================== Basic | Specification List @@ -8,15 +8,15 @@ Basic | Specification List CPU | Octa-core 2x2.73 GHz Mongoose M5 & 2x2.50 GHz Cortex-A76 & 4x2.0 GHz Cortex-A55 Chipset | Samsung Exynos 990 GPU | ARM Mali-G77 MP11 -Memory | 8 GB +Memory | 6 GB Shipped Android Version | 10 Storage | 128 GB MicroSD | Up to 256 GB -Battery | Li-Ion 4000 mAh -Dimensions | 151,7 mm x 69,1 mm x 7,9 mm -Display | 3200 x 1440 pixel, 6.2" -Rear Camera | 12 MP, f/1.8, 26mm (wide), 64 MP, f/2.0, 29mm (telephoto), 12 MP, f/2.2, 13mm, 120˚ (ultrawide), LED flash, auto-HDR, panorama -Front Camera | 10 MP, f/2.2, 26mm, Dual video call, Auto-HDR -Release Date | 11 February 2020 +Battery | Li-Ion 4500 mAh +Dimensions | 159,8 mm x 74,5 mm x 8,4 mm +Display | 2400 x 1080 pixel, 6.5" +Rear Camera | 12 MP, f/1.8, 26mm (wide), 8 MP, f/2.4, 76mm (telephoto), 12 MP, f/2.2, 13mm, 120˚ (ultrawide), LED flash, auto-HDR, panorama +Front Camera | 32 MP, f/2.2, 26mm, HDR +Release Date | 02 October 2020 -![Samsung Galaxy S20](https://fdn2.gsmarena.com/vv/pics/samsung/samsung-galaxy-s20-2.jpg "Samsung Galaxy S20") +![Samsung Galaxy S20 FE](https://fdn2.gsmarena.com/vv/pics/samsung/samsung-galaxy-s20-fe-4g-1.jpg "Samsung Galaxy S20 FE") diff --git a/device.mk b/device.mk index 3974076..f75c692 100644 --- a/device.mk +++ b/device.mk @@ -14,15 +14,15 @@ # limitations under the License. # -DEVICE_PATH := device/samsung/x1slte +DEVICE_PATH := device/samsung/r8s # Audio PRODUCT_COPY_FILES += \ $(DEVICE_PATH)/configs/audio/mixer_gains.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_gains.xml # Boot Animation -TARGET_SCREEN_HEIGHT := 3200 -TARGET_SCREEN_WIDTH := 1440 +TARGET_SCREEN_HEIGHT := 2400 +TARGET_SCREEN_WIDTH := 1080 # Overlays DEVICE_PACKAGE_OVERLAYS += $(LOCAL_PATH)/overlay @@ -35,7 +35,7 @@ PRODUCT_COPY_FILES += \ PRODUCT_SOONG_NAMESPACES += $(DEVICE_PATH) # Inherit from common -$(call inherit-product, device/samsung/universal990-common/device-common.mk) +$(call inherit-product, device/samsung/exynos990-common/device-common.mk) # Inherit from the proprietary version -$(call inherit-product-if-exists, vendor/samsung/x1slte/x1slte-vendor.mk) +$(call inherit-product-if-exists, vendor/samsung/r8s/r8s-vendor.mk) diff --git a/extract-files.sh b/extract-files.sh index 479fdd3..74fbd9c 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -33,8 +33,8 @@ fi set -e -export DEVICE=x1slte -export DEVICE_COMMON=universal990-common +export DEVICE=r8s +export DEVICE_COMMON=exynos990-common export VENDOR=samsung "./../../${VENDOR}/${DEVICE_COMMON}/extract-files.sh" "$@" diff --git a/lineage.dependencies b/lineage.dependencies index 93e2b08..8dcdf1b 100644 --- a/lineage.dependencies +++ b/lineage.dependencies @@ -1,6 +1,6 @@ [ { - "repository": "android_device_samsung_universal990-common", - "target_path": "device/samsung/universal990-common" + "repository": "android_device_samsung_exynos990-common", + "target_path": "device/samsung/exynos990-common" } ] diff --git a/lineage_x1slte.mk b/lineage_r8s.mk similarity index 75% rename from lineage_x1slte.mk rename to lineage_r8s.mk index df79dd5..119327e 100644 --- a/lineage_x1slte.mk +++ b/lineage_r8s.mk @@ -18,29 +18,29 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) -# Inherit from x1slte device -$(call inherit-product, device/samsung/x1slte/device.mk) +# Inherit from r8s device +$(call inherit-product, device/samsung/r8s/device.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base_telephony.mk) # Inherit some common Lineage stuff. $(call inherit-product, vendor/lineage/config/common_full_phone.mk) # Device identifier. This must come after all inclusions -PRODUCT_DEVICE := x1slte -PRODUCT_NAME := lineage_x1slte +PRODUCT_DEVICE := r8s +PRODUCT_NAME := lineage_r8s PRODUCT_BRAND := samsung -PRODUCT_MODEL := SM-G980F +PRODUCT_MODEL := SM-G780F PRODUCT_MANUFACTURER := samsung PRODUCT_GMS_CLIENTID_BASE := android-samsung # Use the latest approved GMS identifiers PRODUCT_BUILD_PROP_OVERRIDES += \ - PRODUCT_NAME=x1sxx \ - PRIVATE_BUILD_DESC="x1sltexx-user 11 RP1A.200720.012 G980FXXSADUH5 release-keys" + PRODUCT_NAME=r8sxx \ + PRIVATE_BUILD_DESC="r8sxx-user 11 RP1A.200720.012 G780FXXUDFWH5 release-keys" -BUILD_FINGERPRINT := samsung/x1sxx/x1s:11/RP1A.200720.012/G980FXXSADUH5:user/release-keys +BUILD_FINGERPRINT := samsung/r8sxx/r8s:11/RP1A.200720.012/G780FXXUDFWH5:user/release-keys # Define PDA property for camera PRODUCT_SYSTEM_PROPERTIES += \ - ro.build.PDA=G980FXXSADUH5 + ro.build.PDA=G780FXXUDFWH5 diff --git a/proprietary-files.txt b/proprietary-files.txt index db75d4e..c4cb701 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,12 +1,11 @@ -# All unpinned blobs are from G980FXXSIHWF6 -# Vendor security patch level 2023-07-01 +# All unpinned blobs are from G780FXXUDFWH5 +# Vendor security patch level 2023-08-01 # Audio -vendor/etc/LVACFS_Configuration.txt -vendor/etc/LVACFS_ControlParams.txt vendor/etc/dolby/dax-default.xml vendor/etc/floating_feature.xml -vendor/lib/librecordalive.so +-vendor/lib/lib_SamsungRec_07020.so -vendor/lib/soundfx/libswdap.so # Audio (Firmware) @@ -18,7 +17,14 @@ vendor/firmware/AP_AUDIO_SLSI.bin vendor/firmware/SoundBoosterParam.bin # Bluetooth -vendor/firmware/bcmdhd_clm.blob +-vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti +vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc +-vendor/lib/hw/android.hardware.bluetooth@1.0-impl-qti.so +-vendor/lib64/hw/android.hardware.bluetooth@1.0-impl-qti.so +-vendor/lib64/vendor.samsung.hardware.bluetooth.a2dp@1.0.so +-vendor/lib/vendor.samsung.hardware.bluetooth.a2dp@1.0.so +-vendor/lib64/vendor.samsung.hardware.bluetooth@2.0.so +-vendor/lib/vendor.samsung.hardware.bluetooth@2.0.so # Camera -vendor/lib64/hw/camera.exynos990.so @@ -32,6 +38,7 @@ vendor/firmware/dual_cal_wide_swide.bin vendor/firmware/dual_cal_wide_tele.bin # Firmware +vendor/firmware/a96t356_r8s.bin vendor/firmware/cs35l40-bot-dsp1-spk-prot-calib.bin vendor/firmware/cs35l40-bot-dsp1-spk-prot.bin vendor/firmware/cs35l40-rcv-dsp1-spk-prot-calib.bin @@ -40,17 +47,18 @@ vendor/firmware/cs40l20.bin vendor/firmware/is_lib.bin vendor/firmware/is_mcu_fw.bin vendor/firmware/is_rta.bin -vendor/firmware/setfile_2la.bin +vendor/firmware/setfile_3l6.bin vendor/firmware/setfile_2ld.bin -vendor/firmware/setfile_3j1.bin -vendor/firmware/setfile_gw2.bin +vendor/firmware/setfile_hi847.bin +vendor/firmware/setfile_imx616.bin # GPS/GNSS -vendor/lib64/libwrappergps.so # NFC -vendor/etc/nfc/sec_s3nsen4_hwreg.bin -vendor/etc/nfc/sec_s3nsen4_swreg.bin +vendor/etc/nfc/sec_s3nrn4v_hwreg.bin +vendor/etc/nfc/sec_s3nrn4v_swreg.bin +vendor/firmware/nfc/sec_s3nrn4v_firmware.bin # RIL - G981BXXSCDUJ5 -vendor/lib64/libsec-ril-dsds.so|b5ccc85c955a5f79ab3267d5ea95919541678bfd @@ -71,5 +79,14 @@ vendor/tee/00000000-0000-0000-0000-54412d48444d vendor/tee/driver/00000000-0000-0000-0000-53626f786476 # Wi-Fi -vendor/firmware/nvram.txt_1rh_es43_b1 -vendor/firmware/nvram.txt_CS01_semco_b1 +-vendor/bin/hw/macloader +vendor/etc/init/wifi_qcom_ap_exynos.rc +vendor/etc/init/wifi.rc +vendor/etc/wifi/indoorchannel.info +vendor/firmware/qca6390/amss20.bin +vendor/firmware/qca6390/bdwlan.elf +vendor/firmware/qca6390/bdwlan.elf1 +vendor/firmware/qca6390/bdwlan.elf2 +vendor/firmware/qca6390/m3.bin +vendor/firmware/qca6390/regdb.bin +vendor/firmware/wlan/qcom_cfg.ini diff --git a/setup-makefiles.sh b/setup-makefiles.sh index ed8aef1..bfaeb42 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -8,8 +8,8 @@ set -e -export DEVICE=x1slte -export DEVICE_COMMON=universal990-common +export DEVICE=r8s +export DEVICE_COMMON=exynos990-common export VENDOR=samsung "./../../${VENDOR}/${DEVICE_COMMON}/setup-makefiles.sh" "$@"