diff --git a/bluetooth/bt_vendor_overlay.conf b/bluetooth/bt_vendor_overlay.conf index 41e2f19..d565ec0 100644 --- a/bluetooth/bt_vendor_overlay.conf +++ b/bluetooth/bt_vendor_overlay.conf @@ -38,3 +38,5 @@ BtHalBqrEnable = false # The hardware stage with old chip revision is no longer # # supported by BT firmware. HwStageWithOldChipFwNoLongerSupport = EVT1.0-PROTO1.0-PROTO1.1 + +ThreadDispatcherEnabled = true diff --git a/device-comet.mk b/device-comet.mk index 5400edd..64b3fe4 100644 --- a/device-comet.mk +++ b/device-comet.mk @@ -14,8 +14,25 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/comet-kernel -TARGET_BOARD_KERNEL_HEADERS ?= device/google/comet-kernel/kernel-headers +ifdef RELEASE_GOOGLE_COMET_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_COMET_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_COMET_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_COMET_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_COMET_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR) +$(call soong_config_set,comet_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_COMET_DIR)) + + +ifdef RELEASE_GOOGLE_COMET_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_COMET_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/comet-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/comet-kernels/6.1/24D1/kernel-headers +endif + TARGET_RECOVERY_DEFAULT_ROTATION := ROTATION_RIGHT LOCAL_PATH := device/google/comet @@ -433,3 +450,12 @@ endif # Connectivity Resources Overlay PRODUCT_PACKAGES += \ ConnectivityResourcesOverlayCometOverride + +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.thread_dispatcher.enabled=true + +# Thread HAL +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_PACKAGES += \ + com.google.comet.hardware.threadnetwork +endif diff --git a/device_framework_matrix_product.xml b/device_framework_matrix_product.xml index 90d0ac0..89d6ae9 100644 --- a/device_framework_matrix_product.xml +++ b/device_framework_matrix_product.xml @@ -1,7 +1,7 @@ com.google.hardware.pixel.display - 11 + 11-12 IDisplay secondary diff --git a/location/user/gps.cfg b/location/user/gps.cfg index ef1f718..6080ae8 100644 --- a/location/user/gps.cfg +++ b/location/user/gps.cfg @@ -9,6 +9,7 @@ gnss_device_patch_address=0 gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +Is1PPSTimeSyncEnable=0 MaxNtnRefLocAgeSecs=600 GlueLayer_IsPlatformRefTimeEnable=1 chpp_betp_client=1 @@ -23,9 +24,8 @@ ChipCfg_VDR_low_end_Time = 20 Chip_Configuration_AidingConfiguration=0x00020046 Chip_Configuration_RefClkControl=0x24 Chip_Configuration_DCXO_CrystalType=0x11 -Chip_Configuration_FeatureCfg_MTPL = 0 -Chip_Configuration_GNSSConstConstraintDef = 0x60BF -LocTech_Constraints = 0x60BF +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 bdsUsedInUSPolicy=2 sbasUsedInUSPolicy=2 @@ -33,6 +33,7 @@ qzssUsedInUSPolicy=2 navicUsedInUSPolicy=2 Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +Chip_Configuration_FeatureCfg_MTPL = 0 mailboxDisabled=0x0 gnss_rfic_chip_id=55400000 UseRtcForAiding=1 diff --git a/location/userdebug/gps.cfg b/location/userdebug/gps.cfg index 665358c..24da018 100644 --- a/location/userdebug/gps.cfg +++ b/location/userdebug/gps.cfg @@ -24,6 +24,9 @@ gnss_device_patch_file=/vendor/firmware/kepler.bin ism_stream_enable=1 caplay_port_tcp_port=@GNSS_ISM_CAPTURE_PLAYBACK +# Enable/Disable 1PPS Time Sync policy +Is1PPSTimeSyncEnable=0 + MaxNtnRefLocAgeSecs=600 # CHIP_CONFIG_IO_OPT_HOSTIO_VIA_SECONDARY + CHIP_CONFIG_IO_OPT_CPMB_MASK #Chip_Configuration_Io_Options=0x9 @@ -92,12 +95,9 @@ Chip_Configuration_DCXO_CrystalType=0x11 # Range should be 2000 to 3100 #Chip_Configuration_DCXO_InflectionPoint=2855 -# Disable MTPL -Chip_Configuration_FeatureCfg_MTPL = 0 - # L1 + L5 MCW -Chip_Configuration_GNSSConstConstraintDef = 0x60BF -LocTech_Constraints = 0x60BF +Chip_Configuration_GNSSConstConstraintDef = 0x60FF +LocTech_Constraints = 0x60FF Chip_Configuration_RfMiscCtrl = 0x80008001 ### 2C48 L1 only MCW ### @@ -122,6 +122,8 @@ navicUsedInUSPolicy=2 # DFS: 0 = Disabled, 1 = Enabled (default) Chip_Configuration_FeatureCfg_DVS = 1 Chip_Configuration_FeatureCfg_DFS = 1 +# Disable MTPL +Chip_Configuration_FeatureCfg_MTPL = 0 # This is a bitfield that will disable incoming interrupts for mailboxes # AP = 0x1 diff --git a/powerhint-comet.json b/powerhint-comet.json index 3e36677..ef603e5 100644 --- a/powerhint-comet.json +++ b/powerhint-comet.json @@ -221,7 +221,6 @@ "0x0", "0x80" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -764,6 +763,7 @@ "1800000", "1548000", "820000", + "610000", "0" ], "ResetOnInit": true @@ -844,6 +844,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1104,6 +1110,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1265,6 +1277,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1841,6 +1859,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -1851,7 +1875,7 @@ "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "DsuMinFreq", "Duration": 0, - "Value": "820000" + "Value": "610000" }, { "PowerHint": "CAMERA_STREAMING_HIGH", @@ -1943,6 +1967,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_STREAMING_HIGH", + "Node": "CDPreferIdle", + "Duration": 0, + "Value": "0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "AutoPreferIdle", @@ -2225,6 +2255,12 @@ "Duration": 0, "Value": "4-7" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2363,6 +2399,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint",