[automerger skipped] Merge 24Q3 to AOSP main am: b6f7a2a2e2 -s ours am: f2732980a7 -s ours
am skip reason: Merged-In Iffe880b97e0296047b9e2b9c9929d67d09d257b6 with SHA-1 ac3a513033 is already in history
Original change: https://android-review.googlesource.com/c/device/google/raviole/+/3257839
Change-Id: I50bcd5acd347f65c90744517f8a62a88aa5f6ddc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/device-oriole.mk b/device-oriole.mk
index 7de385a..95cc084 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -17,6 +17,14 @@
# Restrict the visibility of Android.bp files to improve build analysis time
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
+ifdef RELEASE_GOOGLE_ORIOLE_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR)
+endif
+RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
+
+
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_ORIOLE_VERSION)
# Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
@@ -197,12 +205,31 @@
TARGET_SVN ?= $(RELEASE_SVN_ORIOLE)
else
# Set this for older releases that don't use build flag
-TARGET_SVN ?= 85
+TARGET_SVN ?= 86
endif
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=$(TARGET_SVN)
+# Set device family property for SMR builds
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.build.device_family=O6R4B9
+
+# Set build properties for SMR builds
+ifeq ($(RELEASE_IS_SMR), true)
+ ifneq (,$(RELEASE_BASE_OS_ORIOLE))
+ PRODUCT_BASE_OS := $(RELEASE_BASE_OS_ORIOLE)
+ endif
+endif
+
+# Set build properties for EMR builds
+ifeq ($(RELEASE_IS_EMR), true)
+ ifneq (,$(RELEASE_BASE_OS_ORIOLE))
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_ORIOLE)
+ endif
+endif
+
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
ro.support_hide_display_cutout=true
@@ -253,8 +280,8 @@
vendor.samsung_slsi.hardware.tetheroffload@1.1-service
# Override default distortion output gain according to UX experiments
-PRODUCT_PRODUCT_PROPERTIES += \
- vendor.audio.hapticgenerator.distortion.output.gain=0.5
+PRODUCT_VENDOR_PROPERTIES += \
+ vendor.audio.hapticgenerator.distortion.output.gain=0.32
# RKPD
PRODUCT_PRODUCT_PROPERTIES += \
@@ -288,11 +315,21 @@
# Location
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
PRODUCT_COPY_FILES += \
- device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ device/google/raviole/location/gps.6.1.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ else
+ PRODUCT_COPY_FILES += \
+ device/google/raviole/location/gps.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ endif
else
+ ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
PRODUCT_COPY_FILES += \
- device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ device/google/raviole/location/gps_user.6.1.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ else
+ PRODUCT_COPY_FILES += \
+ device/google/raviole/location/gps_user.xml.oriole:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ endif
endif
# Enable DeviceAsWebcam support
@@ -306,3 +343,15 @@
# Disable AVF Remote Attestation
PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
+
+# Bluetooth device id
+# Oriole: 0x4106
+PRODUCT_PRODUCT_PROPERTIES += \
+ bluetooth.device_id.product_id=16646
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif
diff --git a/device-raven.mk b/device-raven.mk
index 03b3b44..4ceb39e 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -17,6 +17,14 @@
# Restrict the visibility of Android.bp files to improve build analysis time
$(call inherit-product-if-exists, vendor/google/products/sources_pixel.mk)
+ifdef RELEASE_GOOGLE_RAVEN_RADIO_DIR
+RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR)
+endif
+RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR))
+
+
TARGET_LINUX_KERNEL_VERSION := $(RELEASE_KERNEL_RAVEN_VERSION)
# Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_RAVEN_DIR)
@@ -201,12 +209,31 @@
TARGET_SVN ?= $(RELEASE_SVN_RAVEN)
else
# Set this for older releases that don't use build flag
-TARGET_SVN ?= 85
+TARGET_SVN ?= 86
endif
PRODUCT_VENDOR_PROPERTIES += \
ro.vendor.build.svn=$(TARGET_SVN)
+# Set device family property for SMR
+PRODUCT_PROPERTY_OVERRIDES += \
+ ro.build.device_family=O6R4B9
+
+# Set build properties for SMR builds
+ifeq ($(RELEASE_IS_SMR), true)
+ ifneq (,$(RELEASE_BASE_OS_RAVEN))
+ PRODUCT_BASE_OS := $(RELEASE_BASE_OS_RAVEN)
+ endif
+endif
+
+# Set build properties for EMR builds
+ifeq ($(RELEASE_IS_EMR), true)
+ ifneq (,$(RELEASE_BASE_OS_RAVEN))
+ PRODUCT_PROPERTY_OVERRIDES += \
+ ro.build.version.emergency_base_os=$(RELEASE_BASE_OS_RAVEN)
+ endif
+endif
+
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \
ro.support_hide_display_cutout=true
@@ -261,8 +288,8 @@
vendor.samsung_slsi.hardware.tetheroffload@1.1-service
# Override default distortion output gain according to UX experiments
-PRODUCT_PRODUCT_PROPERTIES += \
- vendor.audio.hapticgenerator.distortion.output.gain=0.5
+PRODUCT_VENDOR_PROPERTIES += \
+ vendor.audio.hapticgenerator.distortion.output.gain=0.32
# RKPD
PRODUCT_PRODUCT_PROPERTIES += \
@@ -299,11 +326,21 @@
# Location
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+ ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
PRODUCT_COPY_FILES += \
- device/google/raviole/location/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ device/google/raviole/location/gps.6.1.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ else
+ PRODUCT_COPY_FILES += \
+ device/google/raviole/location/gps.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ endif
else
+ ifneq (,$(filter 6.1, $(TARGET_LINUX_KERNEL_VERSION)))
PRODUCT_COPY_FILES += \
- device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ device/google/raviole/location/gps_user.6.1.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ else
+ PRODUCT_COPY_FILES += \
+ device/google/raviole/location/gps_user.xml.raven:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.xml
+ endif
endif
# Enable DeviceAsWebcam support
@@ -316,3 +353,15 @@
# Disable AVF Remote Attestation
PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED := true
+
+# Bluetooth device id
+# Raven: 0x4107
+PRODUCT_PRODUCT_PROPERTIES += \
+ bluetooth.device_id.product_id=16647
+
+# ETM
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+$(call inherit-product-if-exists, device/google/common/etm/device-userdebug-modules.mk)
+endif
+endif
diff --git a/device-slider.mk b/device-slider.mk
index 09eb645..9a51f6f 100644
--- a/device-slider.mk
+++ b/device-slider.mk
@@ -14,6 +14,10 @@
# limitations under the License.
#
+RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
+
# Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers
diff --git a/device-whitefin.mk b/device-whitefin.mk
index f7e19c3..c9be012 100644
--- a/device-whitefin.mk
+++ b/device-whitefin.mk
@@ -14,6 +14,10 @@
# limitations under the License.
#
+RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
+RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
+$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
+
# Keeps flexibility for kasan and ufs builds
TARGET_KERNEL_DIR ?= $(RELEASE_KERNEL_ORIOLE_DIR)
TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_KERNEL_ORIOLE_DIR)/kernel-headers
diff --git a/location/gps.6.1.xml.oriole b/location/gps.6.1.xml.oriole
new file mode 100644
index 0000000..f442e3a
--- /dev/null
+++ b/location/gps.6.1.xml.oriole
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+ <hal
+ PortName="/dev/ttyBCM"
+ BaudRate="921600"
+ GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+ CustGpioDelayMs="250"
+ LogEnabled="true"
+ Log="JAVA"
+ SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
+ LogDirectory="/sdcard/gps/broadcom/storage/"
+ CtrlPipe="/data/vendor/gps/glgpsctrl"
+ NmeaOutName="/data/vendor/gps/nmea_out"
+
+ acSuplServer="supl.google.com"
+ SuplPort="7275"
+ SuplLogEnable="true"
+ SuplLogFullName="/data/vendor/gps/suplflow.txt"
+ tlsEnable="true"
+
+ SuplSslMethod="SSLv23_NO_TLSv1_2"
+ SuplEnable="true"
+ SuplUseApn="false"
+ SuplUseApnNI="true"
+ SuplDummyCellInfo="true"
+ SuplUseFwCellInfo="false"
+ SuplTlsCertDirPath="/etc/security/cacerts"
+ SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+ SuplUT1Seconds="20"
+ SuplUT2Seconds="20"
+ SuplUT3Seconds="20"
+ TcpConnectionTimeout="20"
+ SuplLppCapable="true"
+ SuplEcidCapable="true"
+ SuplVersion="2"
+ SuplMinorVersion="0"
+ SuplOtdoaCapable="true"
+ SuplOtdoaCapable2="true"
+ SuplGlonassCapable = "true"
+ SuplGalileoCapable = "true"
+ SuplBdsCapable = "true"
+ SuplMgpsCapable = "true"
+
+ RtoEnable="true"
+ RtiEnable="true"
+ HttpSyncLto="true"
+ LtoFileName="lto2.dat"
+ LtoDir="/data/vendor/gps/"
+ LtoSyncThresholdDays="1"
+
+ GnssYearOfHardware="2020"
+ CpEarlyFixGuardTimeSec="1"
+ CpGuardTimeSec="1"
+ CpLppGuardTimeSec="1"
+ IgnoreInjectedSystemTime="true"
+
+ AttributionAppPkgName="com.google.android.carrierlocation"
+
+ AssertEnabled="true"
+ ExitOnComFailure="true"
+ CpLppeCancelDbhOnAgnssProvideLoc="true"
+ CpLppeUseAgnssLocForEmptyDbh="true"
+ ReAidingOnHotStart="false"
+ ReAidingIntervalSec="3600"
+ PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+ SensorsMask="0x244"
+ MaxThreadNum="13"
+ />
+
+ <gll
+ PpsEnable="true"
+ LogPriMask="LOG_INFO"
+ LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+ FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+ MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+ MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+ RfType="GL_RF_4776_BRCM"
+ ExtL5Bias="9.3"
+ EnableFilteringForLTEB13="true"
+
+ WarmStandbyTimeout1Seconds="10"
+ WarmStandbyTimeout2Seconds="15"
+
+ EnableGnssPropagateInStandby="true"
+
+ RfPathLossDb_Ap="4.2"
+ RfPathLossDb_Cp="4.2"
+ RfPathLossDb_Ap_L5="4.1"
+ RfPathLossDb_Cp_L5="4.1"
+ OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+ EnableOnChipStopNotification="2"
+ PowerMode="3"
+ MinGpsWeekNumber="2216"
+ OnChipAccMask="50"
+ EnableB1C="false"
+
+ RTICacheTimeoutSec="3600"
+ />
+
+ <gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
+ EnableNicAutoSwitch="true"
+ EnableNavic="true"
+ />
+
+</glgps>
+
diff --git a/location/gps.6.1.xml.raven b/location/gps.6.1.xml.raven
new file mode 100644
index 0000000..3726311
--- /dev/null
+++ b/location/gps.6.1.xml.raven
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+ <hal
+ PortName="/dev/ttyBCM"
+ BaudRate="921600"
+ GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+ CustGpioDelayMs="250"
+ LogEnabled="true"
+ Log="JAVA"
+ SecondaryConfigPath="/data/vendor/gps/overlay/gps_overlay.xml"
+ LogDirectory="/sdcard/gps/broadcom/storage/"
+ CtrlPipe="/data/vendor/gps/glgpsctrl"
+ NmeaOutName="/data/vendor/gps/nmea_out"
+
+ acSuplServer="supl.google.com"
+ SuplPort="7275"
+ SuplLogEnable="true"
+ SuplLogFullName="/data/vendor/gps/suplflow.txt"
+ tlsEnable="true"
+
+ SuplSslMethod="SSLv23_NO_TLSv1_2"
+ SuplEnable="true"
+ SuplUseApn="false"
+ SuplUseApnNI="true"
+ SuplDummyCellInfo="true"
+ SuplUseFwCellInfo="false"
+ SuplTlsCertDirPath="/etc/security/cacerts"
+ SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+ SuplUT1Seconds="20"
+ SuplUT2Seconds="20"
+ SuplUT3Seconds="20"
+ TcpConnectionTimeout="20"
+ SuplLppCapable="true"
+ SuplEcidCapable="true"
+ SuplVersion="2"
+ SuplMinorVersion="0"
+ SuplOtdoaCapable="true"
+ SuplOtdoaCapable2="true"
+ SuplGlonassCapable = "true"
+ SuplGalileoCapable = "true"
+ SuplBdsCapable = "true"
+ SuplMgpsCapable = "true"
+
+ RtoEnable="true"
+ RtiEnable="true"
+ HttpSyncLto="true"
+ LtoFileName="lto2.dat"
+ LtoDir="/data/vendor/gps/"
+ LtoSyncThresholdDays="1"
+
+ GnssYearOfHardware="2020"
+ CpEarlyFixGuardTimeSec="1"
+ CpGuardTimeSec="1"
+ CpLppGuardTimeSec="1"
+ IgnoreInjectedSystemTime="true"
+
+ AttributionAppPkgName="com.google.android.carrierlocation"
+
+ AssertEnabled="true"
+ ExitOnComFailure="true"
+ CpLppeCancelDbhOnAgnssProvideLoc="true"
+ CpLppeUseAgnssLocForEmptyDbh="true"
+ ReAidingOnHotStart="false"
+ ReAidingIntervalSec="3600"
+ PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+ SensorsMask="0x244"
+ MaxThreadNum="13"
+ />
+
+ <gll
+ PpsEnable="true"
+ LogPriMask="LOG_INFO"
+ LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+ FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+ MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+ MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+ RfType="GL_RF_4776_BRCM"
+ ExtL5Bias="10.6"
+ EnableFilteringForLTEB13="true"
+
+ WarmStandbyTimeout1Seconds="10"
+ WarmStandbyTimeout2Seconds="15"
+
+ EnableGnssPropagateInStandby="true"
+
+ RfPathLossDb_Ap="4.1"
+ RfPathLossDb_Cp="4.1"
+ RfPathLossDb_Ap_L5="4"
+ RfPathLossDb_Cp_L5="4"
+ OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+ EnableOnChipStopNotification="2"
+ PowerMode="3"
+ MinGpsWeekNumber="2216"
+ OnChipAccMask="50"
+ EnableB1C="false"
+
+ RTICacheTimeoutSec="3600"
+ />
+
+ <gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
+ EnableNicAutoSwitch="true"
+ EnableNavic="true"
+ />
+
+</glgps>
+
diff --git a/location/gps.xml b/location/gps.xml
index fb8dd62..76eb81e 100644
--- a/location/gps.xml
+++ b/location/gps.xml
@@ -49,6 +49,7 @@
LtoSyncThresholdDays="1"
GnssYearOfHardware="2020"
+ CpEarlyFixGuardTimeSec="1"
CpGuardTimeSec="1"
CpLppGuardTimeSec="1"
IgnoreInjectedSystemTime="true"
@@ -56,6 +57,7 @@
AttributionAppPkgName="com.google.android.carrierlocation"
AssertEnabled="true"
+ ExitOnComFailure="true"
CpLppeCancelDbhOnAgnssProvideLoc="true"
CpLppeUseAgnssLocForEmptyDbh="true"
ReAidingOnHotStart="false"
@@ -97,6 +99,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/location/gps.xml.oriole b/location/gps.xml.oriole
index 7dc695c..1171998 100644
--- a/location/gps.xml.oriole
+++ b/location/gps.xml.oriole
@@ -49,6 +49,7 @@
LtoSyncThresholdDays="1"
GnssYearOfHardware="2020"
+ CpEarlyFixGuardTimeSec="1"
CpGuardTimeSec="1"
CpLppGuardTimeSec="1"
IgnoreInjectedSystemTime="true"
@@ -56,6 +57,7 @@
AttributionAppPkgName="com.google.android.carrierlocation"
AssertEnabled="true"
+ ExitOnComFailure="true"
CpLppeCancelDbhOnAgnssProvideLoc="true"
CpLppeUseAgnssLocForEmptyDbh="true"
ReAidingOnHotStart="false"
@@ -97,6 +99,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/location/gps.xml.raven b/location/gps.xml.raven
index 31cf6c9..8ca7eeb 100644
--- a/location/gps.xml.raven
+++ b/location/gps.xml.raven
@@ -49,6 +49,7 @@
LtoSyncThresholdDays="1"
GnssYearOfHardware="2020"
+ CpEarlyFixGuardTimeSec="1"
CpGuardTimeSec="1"
CpLppGuardTimeSec="1"
IgnoreInjectedSystemTime="true"
@@ -56,6 +57,7 @@
AttributionAppPkgName="com.google.android.carrierlocation"
AssertEnabled="true"
+ ExitOnComFailure="true"
CpLppeCancelDbhOnAgnssProvideLoc="true"
CpLppeUseAgnssLocForEmptyDbh="true"
ReAidingOnHotStart="false"
@@ -97,6 +99,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/location/gps_user.6.1.xml.oriole b/location/gps_user.6.1.xml.oriole
new file mode 100644
index 0000000..ccea80d
--- /dev/null
+++ b/location/gps_user.6.1.xml.oriole
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+ <hal
+ PortName="/dev/ttyBCM"
+ BaudRate="921600"
+ GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+ CustGpioDelayMs="250"
+ LogEnabled="false"
+ Log="JAVA"
+ LogDirectory="/sdcard/gps/broadcom/storage/"
+ CtrlPipe="/data/vendor/gps/glgpsctrl"
+ NmeaOutName="/data/vendor/gps/nmea_out"
+
+ acSuplServer="supl.google.com"
+ SuplPort="7275"
+ SuplLogEnable="false"
+ SuplLogFullName="/data/vendor/gps/suplflow.txt"
+ tlsEnable="true"
+
+ SuplSslMethod="SSLv23_NO_TLSv1_2"
+ SuplEnable="true"
+ SuplUseApn="false"
+ SuplUseApnNI="true"
+ SuplDummyCellInfo="true"
+ SuplUseFwCellInfo="false"
+ SuplTlsCertDirPath="/etc/security/cacerts"
+ SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+ SuplUT1Seconds="20"
+ SuplUT2Seconds="20"
+ SuplUT3Seconds="20"
+ TcpConnectionTimeout="20"
+ SuplLppCapable="true"
+ SuplEcidCapable="true"
+ SuplVersion="2"
+ SuplMinorVersion="0"
+ SuplOtdoaCapable="true"
+ SuplOtdoaCapable2="true"
+ SuplGlonassCapable = "true"
+ SuplGalileoCapable = "true"
+ SuplBdsCapable = "true"
+ SuplMgpsCapable = "true"
+
+ RtoEnable="true"
+ RtiEnable="true"
+ HttpSyncLto="true"
+ LtoFileName="lto2.dat"
+ LtoDir="/data/vendor/gps/"
+ LtoSyncThresholdDays="1"
+
+ GnssYearOfHardware="2020"
+ CpEarlyFixGuardTimeSec="1"
+ CpGuardTimeSec="1"
+ CpLppGuardTimeSec="1"
+ IgnoreInjectedSystemTime="true"
+
+ AttributionAppPkgName="com.google.android.carrierlocation"
+
+ AssertEnabled="false"
+ CpLppeCancelDbhOnAgnssProvideLoc="true"
+ CpLppeUseAgnssLocForEmptyDbh="true"
+ ReAidingOnHotStart="false"
+ ReAidingIntervalSec="3600"
+ PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+ SensorsMask="0x244"
+ MaxThreadNum="13"
+ />
+
+ <gll
+ PpsEnable="true"
+ LogPriMask="LOG_INFO"
+ LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+ FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+ MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+ MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+ RfType="GL_RF_4776_BRCM"
+ ExtL5Bias="9.3"
+ EnableFilteringForLTEB13="true"
+
+ WarmStandbyTimeout1Seconds="10"
+ WarmStandbyTimeout2Seconds="15"
+
+ EnableGnssPropagateInStandby="true"
+
+ RfPathLossDb_Ap="4.2"
+ RfPathLossDb_Cp="4.2"
+ RfPathLossDb_Ap_L5="4.1"
+ RfPathLossDb_Cp_L5="4.1"
+ OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+ EnableOnChipStopNotification="false"
+ PowerMode="3"
+ MinGpsWeekNumber="2216"
+ OnChipAccMask="50"
+ EnableB1C="false"
+
+ RTICacheTimeoutSec="3600"
+ />
+
+ <gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
+ EnableNicAutoSwitch="true"
+ EnableNavic="true"
+ />
+
+</glgps>
+
diff --git a/location/gps_user.6.1.xml.raven b/location/gps_user.6.1.xml.raven
new file mode 100644
index 0000000..2230ace
--- /dev/null
+++ b/location/gps_user.6.1.xml.raven
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<glgps xmlns="http://www.glpals.com/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.glpals.com/ glconfig.xsd" >
+ <hal
+ PortName="/dev/ttyBCM"
+ BaudRate="921600"
+ GpioNStdbyPath="/sys/devices/platform/10940000.spi/spi_master/spi5/spi5.0/nstandby"
+ CustGpioDelayMs="250"
+ LogEnabled="false"
+ Log="JAVA"
+ LogDirectory="/sdcard/gps/broadcom/storage/"
+ CtrlPipe="/data/vendor/gps/glgpsctrl"
+ NmeaOutName="/data/vendor/gps/nmea_out"
+
+ acSuplServer="supl.google.com"
+ SuplPort="7275"
+ SuplLogEnable="false"
+ SuplLogFullName="/data/vendor/gps/suplflow.txt"
+ tlsEnable="true"
+
+ SuplSslMethod="SSLv23_NO_TLSv1_2"
+ SuplEnable="true"
+ SuplUseApn="false"
+ SuplUseApnNI="true"
+ SuplDummyCellInfo="true"
+ SuplUseFwCellInfo="false"
+ SuplTlsCertDirPath="/etc/security/cacerts"
+ SuplTlsCertPath="/vendor/etc/gnss/gps.cer"
+ SuplUT1Seconds="20"
+ SuplUT2Seconds="20"
+ SuplUT3Seconds="20"
+ TcpConnectionTimeout="20"
+ SuplLppCapable="true"
+ SuplEcidCapable="true"
+ SuplVersion="2"
+ SuplMinorVersion="0"
+ SuplOtdoaCapable="true"
+ SuplOtdoaCapable2="true"
+ SuplGlonassCapable = "true"
+ SuplGalileoCapable = "true"
+ SuplBdsCapable = "true"
+ SuplMgpsCapable = "true"
+
+ RtoEnable="true"
+ RtiEnable="true"
+ HttpSyncLto="true"
+ LtoFileName="lto2.dat"
+ LtoDir="/data/vendor/gps/"
+ LtoSyncThresholdDays="1"
+
+ GnssYearOfHardware="2020"
+ CpEarlyFixGuardTimeSec="1"
+ CpGuardTimeSec="1"
+ CpLppGuardTimeSec="1"
+ IgnoreInjectedSystemTime="true"
+
+ AttributionAppPkgName="com.google.android.carrierlocation"
+
+ AssertEnabled="false"
+ CpLppeCancelDbhOnAgnssProvideLoc="true"
+ CpLppeUseAgnssLocForEmptyDbh="true"
+ ReAidingOnHotStart="false"
+ ReAidingIntervalSec="3600"
+ PpsDevice="/sys/devices/platform/bbd_pps/pps_assert"
+ SensorsMask="0x244"
+ MaxThreadNum="13"
+ />
+
+ <gll
+ PpsEnable="true"
+ LogPriMask="LOG_INFO"
+ LogFacMask="LOG_NMEA | LOG_GLLIOS | LOG_GLLAPI"
+ FrqPlan="FRQ_PLAN_26MHZ_2PPM_49_152MHZ_300PPB"
+ MultiCarrRFMode="GL_MULTI_CARR_RF_MODE_L1_L5"
+ MultiCarrLnaMask="L1_EXT_ON|L5_EXT_ON"
+ RfType="GL_RF_4776_BRCM"
+ ExtL5Bias="10.6"
+ EnableFilteringForLTEB13="true"
+
+ WarmStandbyTimeout1Seconds="10"
+ WarmStandbyTimeout2Seconds="15"
+
+ EnableGnssPropagateInStandby="true"
+
+ RfPathLossDb_Ap="4.1"
+ RfPathLossDb_Cp="4.1"
+ RfPathLossDb_Ap_L5="4"
+ RfPathLossDb_Cp_L5="4"
+ OnChipGpsCarrierType="3,2,3,3,2,3,2,3,3,3,1,2,1,3,2,1,2,3,1,1,1,1,3,3,3,3,3,1,2,3,2,3"
+
+ EnableOnChipStopNotification="false"
+ PowerMode="3"
+ MinGpsWeekNumber="2216"
+ OnChipAccMask="50"
+ EnableB1C="false"
+
+ RTICacheTimeoutSec="3600"
+ />
+
+ <gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
+ EnableNicAutoSwitch="true"
+ EnableNavic="true"
+ />
+
+</glgps>
+
diff --git a/location/gps_user.xml b/location/gps_user.xml
index a5a4066..405b8b6 100644
--- a/location/gps_user.xml
+++ b/location/gps_user.xml
@@ -48,6 +48,7 @@
LtoSyncThresholdDays="1"
GnssYearOfHardware="2020"
+ CpEarlyFixGuardTimeSec="1"
CpGuardTimeSec="1"
CpLppGuardTimeSec="1"
IgnoreInjectedSystemTime="true"
@@ -96,6 +97,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/location/gps_user.xml.oriole b/location/gps_user.xml.oriole
index e04f9fe..c29ae2c 100644
--- a/location/gps_user.xml.oriole
+++ b/location/gps_user.xml.oriole
@@ -48,6 +48,7 @@
LtoSyncThresholdDays="1"
GnssYearOfHardware="2020"
+ CpEarlyFixGuardTimeSec="1"
CpGuardTimeSec="1"
CpLppGuardTimeSec="1"
IgnoreInjectedSystemTime="true"
@@ -96,6 +97,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/location/gps_user.xml.raven b/location/gps_user.xml.raven
index c132781..41d38c9 100644
--- a/location/gps_user.xml.raven
+++ b/location/gps_user.xml.raven
@@ -48,6 +48,7 @@
LtoSyncThresholdDays="1"
GnssYearOfHardware="2020"
+ CpEarlyFixGuardTimeSec="1"
CpGuardTimeSec="1"
CpLppGuardTimeSec="1"
IgnoreInjectedSystemTime="true"
@@ -96,6 +97,8 @@
/>
<gll_features
+ EnableQzsAutoSwitch="false"
+ EnableGloAutoSwitch="false"
EnableNicAutoSwitch="true"
EnableNavic="true"
/>
diff --git a/oriole/BoardConfig.mk b/oriole/BoardConfig.mk
index 757ee50..d77c0ef 100644
--- a/oriole/BoardConfig.mk
+++ b/oriole/BoardConfig.mk
@@ -24,11 +24,6 @@
BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1
BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
-RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_ORIOLE_RADIO_DIR)
-RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
-$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
-
ifdef AUTOMOTIVE_PRODUCT_PATH
#RBC# include_top device/google/auto_tcu
#RBC# include_top device/google/pixel_tcu
@@ -47,4 +42,11 @@
include device/google/gs101-sepolicy/oriole-sepolicy.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
-include vendor/google_devices/oriole/proprietary/BoardConfigVendor.mk
+
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif
diff --git a/oriole/rro_overlays/NfcOverlay/res/values/config.xml b/oriole/rro_overlays/NfcOverlay/res/values/config.xml
index 1b70812..20ac97d 100644
--- a/oriole/rro_overlays/NfcOverlay/res/values/config.xml
+++ b/oriole/rro_overlays/NfcOverlay/res/values/config.xml
@@ -30,7 +30,7 @@
<item>36</item>
</integer-array>
<integer-array name="antenna_y">
- <item>106</item>
+ <item>51</item>
</integer-array>
<bool name="nfc_observe_mode_supported">true</bool>
</resources>
diff --git a/powerhint-oriole-mainline.json b/powerhint-oriole-mainline.json
index 29dd8ab..57078f2 100644
--- a/powerhint-oriole-mainline.json
+++ b/powerhint-oriole-mainline.json
@@ -1024,18 +1024,6 @@
"Value": "1"
},
{
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "100"
- },
- {
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "1500"
- },
- {
"PowerHint": "EXPENSIVE_RENDERING",
"Node": "PowerHALRenderingState",
"Duration": 0,
@@ -1241,11 +1229,12 @@
"TargetTimeFactor": 1,
"StaleTimeFactor": 15,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
@@ -1274,11 +1263,12 @@
"TargetTimeFactor": 1,
"StaleTimeFactor": 15,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
@@ -1307,11 +1297,12 @@
"TargetTimeFactor": 1,
"StaleTimeFactor": 15,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
diff --git a/powerhint-oriole.json b/powerhint-oriole.json
index 9264d09..239a90d 100644
--- a/powerhint-oriole.json
+++ b/powerhint-oriole.json
@@ -320,14 +320,6 @@
"ResetOnInit": true
},
{
- "Name": "NewlyIdleBalancer",
- "Path": "/proc/vendor_sched/idle_balancer",
- "Values": [
- "0",
- "1"
- ]
- },
- {
"Name": "LimitFlashCurrent",
"Path": "vendor.camera.max_flash_current",
"Values": [
@@ -1071,12 +1063,6 @@
"Value": "0"
},
{
- "PowerHint": "CAMERA_STREAMING_EXTREME",
- "Node": "NewlyIdleBalancer",
- "Duration": 0,
- "Value": "0"
- },
- {
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning",
"Duration": 0,
@@ -1149,12 +1135,6 @@
"Value": "0"
},
{
- "PowerHint": "CAMERA_STREAMING_HIGH",
- "Node": "NewlyIdleBalancer",
- "Duration": 0,
- "Value": "0"
- },
- {
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
"Duration": 0,
@@ -1209,12 +1189,6 @@
"Value": "0"
},
{
- "PowerHint": "CAMERA_STREAMING_STANDARD",
- "Node": "NewlyIdleBalancer",
- "Duration": 0,
- "Value": "0"
- },
- {
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",
"Duration": 0,
@@ -1275,12 +1249,6 @@
"Value": "0"
},
{
- "PowerHint": "CAMERA_STREAMING_LOW",
- "Node": "NewlyIdleBalancer",
- "Duration": 0,
- "Value": "0"
- },
- {
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDCPUSET_RESTRICTED"
@@ -1492,18 +1460,6 @@
"Value": "1"
},
{
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "100"
- },
- {
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "1500"
- },
- {
"PowerHint": "EXPENSIVE_RENDERING",
"Node": "PowerHALRenderingState",
"Duration": 0,
@@ -1758,11 +1714,12 @@
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
@@ -1792,11 +1749,12 @@
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
@@ -1826,11 +1784,12 @@
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
diff --git a/powerhint-raven-mainline.json b/powerhint-raven-mainline.json
index a748e0e..9be9f7f 100644
--- a/powerhint-raven-mainline.json
+++ b/powerhint-raven-mainline.json
@@ -1005,18 +1005,6 @@
"Value": "1"
},
{
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "100"
- },
- {
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "1500"
- },
- {
"PowerHint": "EXPENSIVE_RENDERING",
"Node": "PowerHALRenderingState",
"Duration": 0,
@@ -1222,11 +1210,12 @@
"TargetTimeFactor": 1,
"StaleTimeFactor": 15,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
@@ -1255,11 +1244,12 @@
"TargetTimeFactor": 1,
"StaleTimeFactor": 15,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
@@ -1288,11 +1278,12 @@
"TargetTimeFactor": 1,
"StaleTimeFactor": 15,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
diff --git a/powerhint-raven.json b/powerhint-raven.json
index af6d3c7..fd59158 100644
--- a/powerhint-raven.json
+++ b/powerhint-raven.json
@@ -319,14 +319,6 @@
"ResetOnInit": true
},
{
- "Name": "NewlyIdleBalancer",
- "Path": "/proc/vendor_sched/idle_balancer",
- "Values": [
- "0",
- "1"
- ]
- },
- {
"Name": "LimitFlashCurrent",
"Path": "vendor.camera.max_flash_current",
"Values": [
@@ -1070,12 +1062,6 @@
"Value": "0"
},
{
- "PowerHint": "CAMERA_STREAMING_EXTREME",
- "Node": "NewlyIdleBalancer",
- "Duration": 0,
- "Value": "0"
- },
- {
"PowerHint": "CAMERA_STREAMING_HIGH",
"Node": "PowerHALCameraRunning",
"Duration": 0,
@@ -1148,12 +1134,6 @@
"Value": "0"
},
{
- "PowerHint": "CAMERA_STREAMING_HIGH",
- "Node": "NewlyIdleBalancer",
- "Duration": 0,
- "Value": "0"
- },
- {
"PowerHint": "CAMERA_STREAMING_STANDARD",
"Node": "PowerHALCameraRunning",
"Duration": 0,
@@ -1208,12 +1188,6 @@
"Value": "0"
},
{
- "PowerHint": "CAMERA_STREAMING_STANDARD",
- "Node": "NewlyIdleBalancer",
- "Duration": 0,
- "Value": "0"
- },
- {
"PowerHint": "CAMERA_STREAMING_LOW",
"Node": "PowerHALCameraRunning",
"Duration": 0,
@@ -1274,12 +1248,6 @@
"Value": "0"
},
{
- "PowerHint": "CAMERA_STREAMING_LOW",
- "Node": "NewlyIdleBalancer",
- "Duration": 0,
- "Value": "0"
- },
- {
"PowerHint": "CAMERA_VIDEO_RECORDING",
"Type": "MaskHint",
"Value": "CDCPUSET_RESTRICTED"
@@ -1473,18 +1441,6 @@
"Value": "1"
},
{
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "100"
- },
- {
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "1500"
- },
- {
"PowerHint": "EXPENSIVE_RENDERING",
"Node": "PowerHALRenderingState",
"Duration": 0,
@@ -1739,11 +1695,12 @@
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
@@ -1773,11 +1730,12 @@
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
@@ -1807,11 +1765,12 @@
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 15.0,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
diff --git a/powerhint-slider.json b/powerhint-slider.json
index 98f770e..1de48ef 100644
--- a/powerhint-slider.json
+++ b/powerhint-slider.json
@@ -1349,18 +1349,6 @@
"Value": "1"
},
{
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "100"
- },
- {
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "1500"
- },
- {
"PowerHint": "EXPENSIVE_RENDERING",
"Node": "PowerHALRenderingState",
"Duration": 0,
@@ -1513,11 +1501,12 @@
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 20.0,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
@@ -1547,11 +1536,12 @@
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 20.0,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
@@ -1581,11 +1571,12 @@
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 20.0,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
diff --git a/powerhint-whitefin.json b/powerhint-whitefin.json
index a53293f..9a842a3 100644
--- a/powerhint-whitefin.json
+++ b/powerhint-whitefin.json
@@ -1334,18 +1334,6 @@
"Value": "1"
},
{
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_CRITICAL",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "100"
- },
- {
- "PowerHint": "THERMAL_FLASH_LED_REDUCE_NONE",
- "Node": "LimitFlashCurrent",
- "Duration": 0,
- "Value": "1500"
- },
- {
"PowerHint": "EXPENSIVE_RENDERING",
"Node": "PowerHALRenderingState",
"Duration": 0,
@@ -1480,11 +1468,12 @@
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 20.0,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
@@ -1514,11 +1503,12 @@
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 20.0,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
@@ -1548,11 +1538,12 @@
"TargetTimeFactor": 1.0,
"StaleTimeFactor": 20.0,
"HeuristicBoost_On": true,
- "HBoostOnMissedCycles": 8,
- "HBoostOffMaxAvgRatio": 4.0,
- "HBoostOffMissedCycles": 5,
- "HBoostPidPuFactor": 0.5,
- "HBoostUclampMin": 722,
+ "HBoostModerateJankThreshold": 2,
+ "HBoostOffMaxAvgDurRatio": 4.0,
+ "HBoostSevereJankPidPu": 0.5,
+ "HBoostSevereJankThreshold": 8,
+ "HBoostUclampMinCeilingRange": [480, 722],
+ "HBoostUclampMinFloorRange": [230, 410],
"JankCheckTimeFactor": 1.2,
"LowFrameRateThreshold": 25,
"MaxRecordsNum": 300
diff --git a/raven/BoardConfig.mk b/raven/BoardConfig.mk
index 06f97ae..3d474b6 100644
--- a/raven/BoardConfig.mk
+++ b/raven/BoardConfig.mk
@@ -24,11 +24,6 @@
BOARD_KERNEL_CMDLINE += pcie-exynos-core.load_sequential=1
BOARD_KERNEL_CMDLINE += g2d.load_sequential=1
-RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RAVEN_RADIO_DIR)
-RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR)
-$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RAVEN_DIR))
-
ifdef AUTOMOTIVE_PRODUCT_PATH
#RBC# include_top device/google/auto_tcu
#RBC# include_top device/google/pixel_tcu
@@ -47,4 +42,11 @@
include device/google/gs101-sepolicy/raven-sepolicy.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
-include vendor/google_devices/raven/proprietary/BoardConfigVendor.mk
+
+ifneq (,$(RELEASE_ETM_IN_USERDEBUG_ENG))
+ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
+-include device/google/common/etm/BoardUserdebugModules.mk
+endif
+endif
diff --git a/raven/rro_overlays/NfcOverlay/res/values/config.xml b/raven/rro_overlays/NfcOverlay/res/values/config.xml
index 9545f18..43b0eda 100644
--- a/raven/rro_overlays/NfcOverlay/res/values/config.xml
+++ b/raven/rro_overlays/NfcOverlay/res/values/config.xml
@@ -30,7 +30,7 @@
<item>36</item>
</integer-array>
<integer-array name="antenna_y">
- <item>106</item>
+ <item>61</item>
</integer-array>
<bool name="nfc_observe_mode_supported">true</bool>
</resources>
diff --git a/slider/BoardConfig.mk b/slider/BoardConfig.mk
index 917b79a..2224d56 100644
--- a/slider/BoardConfig.mk
+++ b/slider/BoardConfig.mk
@@ -15,9 +15,6 @@
#
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := slider
-RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
-$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
TARGET_SCREEN_DENSITY := 560
USES_DEVICE_GOOGLE_RAVIOLE := true
@@ -26,3 +23,4 @@
include device/google/gs101/BoardConfig-common.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk
diff --git a/thermal_info_config_charge_oriole.json b/thermal_info_config_charge_oriole.json
index 280dd33..17908e9 100644
--- a/thermal_info_config_charge_oriole.json
+++ b/thermal_info_config_charge_oriole.json
@@ -27,7 +27,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -43,7 +42,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -59,7 +57,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -84,7 +81,6 @@
0.0,
0.0
],
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001,
"PollingDelay":60000,
@@ -102,7 +98,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -127,7 +122,6 @@
0.0,
0.0
],
- "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001,
"PollingDelay":60000,
diff --git a/thermal_info_config_charge_raven.json b/thermal_info_config_charge_raven.json
index 411383b..bb0c1c4 100644
--- a/thermal_info_config_charge_raven.json
+++ b/thermal_info_config_charge_raven.json
@@ -27,7 +27,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -43,7 +42,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -59,7 +57,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -84,7 +81,6 @@
0.0,
0.0
],
- "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001,
"PollingDelay":60000,
@@ -102,7 +98,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -127,7 +122,6 @@
0.0,
0.0
],
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001,
"PollingDelay":60000,
@@ -145,7 +139,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index ad24136..e218126 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -19,25 +19,21 @@
{
"Name":"neutral_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
"Name":"gnss_tcxo_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
"Name":"qi_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
"Name":"usb_pwr_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
@@ -45,7 +41,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", "35.0", "NAN","NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -53,7 +48,6 @@
{
"Name":"disp_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
@@ -61,7 +55,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", "32.9", "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
- "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -450,164 +443,6 @@
"Multiplier":0.001
},
{
- "Name":"battery_cycle",
- "Type":"BCL_VOLTAGE",
- "Multiplier":1,
- "Monitor":false
- },
- {
- "Name":"critical-battery-cell",
- "Type":"BCL_VOLTAGE",
- "VirtualSensor":true,
- "Formula":"COUNT_THRESHOLD",
- "TriggerSensor": "vdroop1",
- "Combination":["battery", "battery_cycle", "vdroop1"],
- "Coefficient":["-10000", "400", "1000"],
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"],
- "Multiplier":1,
- "Monitor":true
- },
- {
- "Name":"FLASH_LED_REDUCE",
- "Type":"UNKNOWN",
- "VirtualSensor":true,
- "Formula":"COUNT_THRESHOLD",
- "TriggerSensor": "vdroop1",
- "Combination":["battery", "battery_cycle", "vdroop1"],
- "Coefficient":["-10000", "400", "1000"],
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN","NAN"],
- "Multiplier":1,
- "Monitor":true,
- "SendPowerHint":true
- },
- {
- "Name":"soc",
- "Type":"BCL_PERCENTAGE",
- "HotThreshold":["NAN", "NAN", "NAN", 90, "NAN", "NAN", "NAN"],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"batoilo",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Monitor":true,
- "BindedCdevInfo": [
- {
- "CdevRequest": "thermal-cpufreq-2",
- "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
- },
- {
- "CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 6, 6, 6]
- }
- ]
- },
- {
- "Name":"vdroop1",
- "Type":"BCL_VOLTAGE",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Monitor":true,
- "BindedCdevInfo": [
- {
- "CdevRequest": "thermal-cpufreq-2",
- "LimitInfo": [0, 0, 0, 0, 7, 10, 10]
- },
- {
- "CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
- }
- ]
- },
- {
- "Name":"vdroop2",
- "Type":"BCL_VOLTAGE",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Monitor":true,
- "BindedCdevInfo": [
- {
- "CdevRequest": "thermal-cpufreq-2",
- "LimitInfo": [0, 0, 0, 0, 7, 10, 10]
- },
- {
- "CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 9, 9, 9]
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 6, 6, 6]
- }
- ]
- },
- {
- "Name":"smpl_gm",
- "Type":"BCL_VOLTAGE",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Monitor":true,
- "BindedCdevInfo": [
- {
- "CdevRequest": "thermal-cpufreq-2",
- "LimitInfo": [0, 0, 0, 0, 7, 10, 10]
- },
- {
- "CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
- }
- ]
- },
- {
- "Name":"ocp_cpu1",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"ocp_cpu2",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"ocp_tpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 10500, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"ocp_gpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
"Name":"TPU",
"Type":"NPU",
"HotThreshold":[
@@ -627,26 +462,22 @@
{
"Name":"thermal-cpufreq-0",
"Type":"CPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote",
- "State2Power":["412", "352", "308", "236", "212", "176", "152", "116", "76", "56", "24"]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote"
},
{
"Name":"thermal-cpufreq-1",
"Type":"CPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote",
- "State2Power":["1198", "1018", "854", "696", "566", "452", "356", "296", "226", "188", "152", "124", "90", "58"]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote"
},
{
"Name":"thermal-cpufreq-2",
"Type":"CPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote",
- "State2Power":["4406", "3874", "3500", "3052", "2704", "2334", "2176", "1864", "1492", "1362", "1116", "908", "756", "594", "478", "388", "178"]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
},
{
"Name":"thermal-gpufreq-0",
"Type":"GPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote",
- "State2Power":["4599", "3727", "3259", "2378", "2044", "1813", "1449", "1223", "1007", "804", "633", "452"]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
},
{
"Name":"fcc",
diff --git a/thermal_info_config_oriole_WHI_A.json b/thermal_info_config_oriole_WHI_A.json
index fa7398d..1a74ade 100644
--- a/thermal_info_config_oriole_WHI_A.json
+++ b/thermal_info_config_oriole_WHI_A.json
@@ -36,7 +36,6 @@
0.0,
0.0
],
- "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001,
"PollingDelay":60000,
@@ -54,7 +53,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -70,7 +68,6 @@
"NAN",
"NAN"
],
- "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp",
"VrThreshold":"NAN",
"Multiplier":0.001
},
@@ -717,26 +714,22 @@
{
"Name":"thermal-cpufreq-0",
"Type":"CPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote",
- "State2Power":["420", "332", "268", "212", "176", "148", "108", "80", "56", "24"]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote"
},
{
"Name":"thermal-cpufreq-1",
"Type":"CPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote",
- "State2Power":["1216", "1018", "842", "686", "538", "428", "336", "274", "212", "178", "146", "118", "86", "56"]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote"
},
{
"Name":"thermal-cpufreq-2",
"Type":"CPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote",
- "State2Power":["2322", "1992", "1674", "1412", "1168", "936", "766", "590", "474", "394", "310", "162"]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
},
{
"Name":"thermal-gpufreq-0",
"Type":"GPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote",
- "State2Power":["2580", "2033", "1427", "826", "358"]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
},
{
"Name":"tpu_cooling",
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index 6f3b0d0..45c9326 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -19,19 +19,16 @@
{
"Name":"neutral_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/neutral_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
"Name":"gnss_tcxo_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/gnss_tcxo_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
"Name":"qi_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/qi_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
@@ -39,7 +36,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", "32.2", "NAN", "NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
- "TempPath":"/dev/thermal/tz-by-name/quiet_therm/adc_channel/channel_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -47,7 +43,6 @@
{
"Name":"usb_pwr_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
@@ -55,7 +50,6 @@
"Type":"UNKNOWN",
"HotThreshold":["NAN", "40.0", "NAN","NAN", "NAN", "NAN", "NAN"],
"HotHysteresis":[0.0, 0.9, 0.0, 0.0, 0.0, 0.0, 0.0],
- "TempPath":"/dev/thermal/tz-by-name/usb_pwr_therm2/adc_channel/channel_temp",
"Multiplier":0.001,
"PollingDelay":60000,
"PassiveDelay":7000
@@ -63,7 +57,6 @@
{
"Name":"disp_therm",
"Type":"UNKNOWN",
- "TempPath":"/dev/thermal/tz-by-name/disp_therm/adc_channel/channel_temp",
"Multiplier":0.001
},
{
@@ -440,164 +433,6 @@
"Multiplier":0.001
},
{
- "Name":"battery_cycle",
- "Type":"BCL_VOLTAGE",
- "Multiplier":1,
- "Monitor":false
- },
- {
- "Name":"critical-battery-cell",
- "Type":"BCL_VOLTAGE",
- "VirtualSensor":true,
- "Formula":"COUNT_THRESHOLD",
- "TriggerSensor": "vdroop1",
- "Combination":["battery", "battery_cycle", "vdroop1"],
- "Coefficient":["-10000", "400", "1000"],
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", "NAN", 3.00, "NAN"],
- "Multiplier":1,
- "Monitor":true
- },
- {
- "Name":"FLASH_LED_REDUCE",
- "Type":"UNKNOWN",
- "VirtualSensor":true,
- "Formula":"COUNT_THRESHOLD",
- "TriggerSensor": "vdroop1",
- "Combination":["battery", "battery_cycle", "vdroop1"],
- "Coefficient":["-10000", "400", "1000"],
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 3.00, "NAN","NAN"],
- "Multiplier":1,
- "Monitor":true,
- "SendPowerHint":true
- },
- {
- "Name":"soc",
- "Type":"BCL_PERCENTAGE",
- "HotThreshold":["NAN", "NAN", "NAN", 90, "NAN", "NAN", "NAN"],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"batoilo",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 5000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Monitor":true,
- "BindedCdevInfo": [
- {
- "CdevRequest": "thermal-cpufreq-2",
- "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
- },
- {
- "CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 6, 6, 6]
- }
- ]
- },
- {
- "Name":"vdroop1",
- "Type":"BCL_VOLTAGE",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Monitor":true,
- "BindedCdevInfo": [
- {
- "CdevRequest": "thermal-cpufreq-2",
- "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
- },
- {
- "CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 4, 4, 4]
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 3, 3, 3]
- }
- ]
- },
- {
- "Name":"vdroop2",
- "Type":"BCL_VOLTAGE",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1200, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Monitor":true,
- "BindedCdevInfo": [
- {
- "CdevRequest": "thermal-cpufreq-2",
- "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
- },
- {
- "CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 9, 9, 9]
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 6, 6, 6]
- }
- ]
- },
- {
- "Name":"smpl_gm",
- "Type":"BCL_VOLTAGE",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 1100, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Monitor":true,
- "BindedCdevInfo": [
- {
- "CdevRequest": "thermal-cpufreq-2",
- "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
- },
- {
- "CdevRequest": "thermal-gpufreq-0",
- "LimitInfo": [0, 0, 0, 0, 7, 7, 7]
- },
- {
- "CdevRequest": "tpu_cooling",
- "LimitInfo": [0, 0, 0, 0, 5, 5, 5]
- }
- ]
- },
- {
- "Name":"ocp_cpu1",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 7000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"ocp_cpu2",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"ocp_tpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 10500, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
- "Name":"ocp_gpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":["NAN", "NAN", "NAN", "NAN", 12000, "NAN", "NAN"],
- "HotHysteresis":[0.0, 0.0, 0.0, 0.0, 100, 0.0, 0.0],
- "Multiplier":1,
- "Hidden":true
- },
- {
"Name":"TPU",
"Type":"NPU",
"HotThreshold":[
@@ -617,26 +452,22 @@
{
"Name":"thermal-cpufreq-0",
"Type":"CPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote",
- "State2Power":["412", "352", "308", "236", "212", "176", "152", "116", "76", "56", "24"]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-0/user_vote"
},
{
"Name":"thermal-cpufreq-1",
"Type":"CPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote",
- "State2Power":["1198", "1018", "854", "696", "566", "452", "356", "296", "226", "188", "152", "124", "90", "58"]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-1/user_vote"
},
{
"Name":"thermal-cpufreq-2",
"Type":"CPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote",
- "State2Power":["4208", "3692", "3370", "2898", "2562", "2240", "2084", "1780", "1424", "1276", "1042", "858", "714", "560", "448", "364", "166"]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-cpufreq-2/user_vote"
},
{
"Name":"thermal-gpufreq-0",
"Type":"GPU",
- "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote",
- "State2Power":["4371", "3543", "3085", "2293", "1927", "1707", "1394", "1171", "967", "768", "592", "433"]
+ "WritePath":"/dev/thermal/cdev-by-name/thermal-gpufreq-0/user_vote"
},
{
"Name":"fcc",
diff --git a/thermal_info_config_slider.json b/thermal_info_config_slider.json
index 16c795c..6034f03 100644
--- a/thermal_info_config_slider.json
+++ b/thermal_info_config_slider.json
@@ -71,22 +71,6 @@
"Multiplier":0.001
},
{
- "Name":"battery_cycle",
- "Type":"BCL_VOLTAGE",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":1,
- "Monitor":false
- },
- {
"Name":"battery",
"Type":"BATTERY",
"HotThreshold":[
@@ -103,161 +87,6 @@
"Monitor":false
},
{
- "Name":"critical-battery-cell",
- "Type":"BCL_VOLTAGE",
- "VirtualSensor":true,
- "Formula":"COUNT_THRESHOLD",
- "TriggerSensor": "smpl_gm",
- "Combination":[
- "battery",
- "battery_cycle",
- "smpl_gm"
- ],
- "Coefficient":[
- "-10000",
- "400",
- "1400"
- ],
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 3.00,
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":1,
- "Monitor":true
- },
- {
- "Name":"FLASH_LED_REDUCE",
- "Type":"UNKNOWN",
- "VirtualSensor":true,
- "Formula":"COUNT_THRESHOLD",
- "TriggerSensor": "smpl_gm",
- "Combination":[
- "battery",
- "battery_cycle",
- "smpl_gm"
- ],
- "Coefficient":[
- "-10000",
- "400",
- "1400"
- ],
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 3.00,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":1,
- "Monitor":true,
- "SendPowerHint":true
- },
- {
- "Name":"soc",
- "Type":"BCL_PERCENTAGE",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 90,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":1,
- "Monitor":false
- },
- {
- "Name":"smpl_gm",
- "Type":"BCL_VOLTAGE",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 1400,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":1,
- "Monitor":true
- },
- {
- "Name":"ocp_cpu1",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 7,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
- "Name":"ocp_cpu2",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 12,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
- "Name":"ocp_tpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 10.5,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
- "Name":"ocp_gpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 12,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
"Name":"TPU",
"Type":"NPU",
"HotThreshold":[
diff --git a/thermal_info_config_whitefin.json b/thermal_info_config_whitefin.json
index 16c795c..6034f03 100644
--- a/thermal_info_config_whitefin.json
+++ b/thermal_info_config_whitefin.json
@@ -71,22 +71,6 @@
"Multiplier":0.001
},
{
- "Name":"battery_cycle",
- "Type":"BCL_VOLTAGE",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":1,
- "Monitor":false
- },
- {
"Name":"battery",
"Type":"BATTERY",
"HotThreshold":[
@@ -103,161 +87,6 @@
"Monitor":false
},
{
- "Name":"critical-battery-cell",
- "Type":"BCL_VOLTAGE",
- "VirtualSensor":true,
- "Formula":"COUNT_THRESHOLD",
- "TriggerSensor": "smpl_gm",
- "Combination":[
- "battery",
- "battery_cycle",
- "smpl_gm"
- ],
- "Coefficient":[
- "-10000",
- "400",
- "1400"
- ],
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 3.00,
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":1,
- "Monitor":true
- },
- {
- "Name":"FLASH_LED_REDUCE",
- "Type":"UNKNOWN",
- "VirtualSensor":true,
- "Formula":"COUNT_THRESHOLD",
- "TriggerSensor": "smpl_gm",
- "Combination":[
- "battery",
- "battery_cycle",
- "smpl_gm"
- ],
- "Coefficient":[
- "-10000",
- "400",
- "1400"
- ],
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 3.00,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":1,
- "Monitor":true,
- "SendPowerHint":true
- },
- {
- "Name":"soc",
- "Type":"BCL_PERCENTAGE",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 90,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":1,
- "Monitor":false
- },
- {
- "Name":"smpl_gm",
- "Type":"BCL_VOLTAGE",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 1400,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":1,
- "Monitor":true
- },
- {
- "Name":"ocp_cpu1",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 7,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
- "Name":"ocp_cpu2",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 12,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
- "Name":"ocp_tpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 10.5,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
- "Name":"ocp_gpu",
- "Type":"BCL_CURRENT",
- "HotThreshold":[
- "NAN",
- "NAN",
- "NAN",
- "NAN",
- 12,
- "NAN",
- "NAN"
- ],
- "VrThreshold":"NAN",
- "Multiplier":0.001,
- "Monitor":false
- },
- {
"Name":"TPU",
"Type":"NPU",
"HotThreshold":[
diff --git a/whitefin/BoardConfig.mk b/whitefin/BoardConfig.mk
index e28f7bf..27f7c98 100644
--- a/whitefin/BoardConfig.mk
+++ b/whitefin/BoardConfig.mk
@@ -15,9 +15,6 @@
#
TARGET_BOARD_INFO_FILE := device/google/raviole/board-info.txt
TARGET_BOOTLOADER_BOARD_NAME := whitefin
-RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR ?= pdk# Keep this for pdk TODO: b/327119000
-RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR)
-$(call soong_config_set,raviole_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_ORIOLE_DIR))
TARGET_SCREEN_DENSITY := 440
USES_DEVICE_GOOGLE_RAVIOLE := true
@@ -26,3 +23,4 @@
include device/google/gs101/BoardConfig-common.mk
include device/google/gs101/wifi/BoardConfig-wifi.mk
-include vendor/google_devices/gs101/prebuilts/BoardConfigVendor.mk
+include device/google/gs-common/check_current_prebuilt/check_current_prebuilt.mk