From 6cb63417271edcd7fc5ecf9085abcc48cb9383ba Mon Sep 17 00:00:00 2001 From: shihchienc Date: Mon, 25 Mar 2024 09:21:20 +0000 Subject: [PATCH 1/8] Enable Thread HAL on KM4CM4TK4 1. Add Thread HAL service 2. Turn on BT property Bug: 318601784 Test: manual Change-Id: I2b1b58e65802394d630f808eab6a951688ef9bcb --- bluetooth/bt_vendor_overlay_caiman.conf | 2 ++ bluetooth/bt_vendor_overlay_komodo.conf | 2 ++ bluetooth/bt_vendor_overlay_tokay.conf | 2 ++ device-caiman.mk | 9 +++++++++ device-komodo.mk | 9 +++++++++ device-tokay.mk | 8 ++++++++ 6 files changed, 32 insertions(+) diff --git a/bluetooth/bt_vendor_overlay_caiman.conf b/bluetooth/bt_vendor_overlay_caiman.conf index 1f5eb93c..c784f0ed 100644 --- a/bluetooth/bt_vendor_overlay_caiman.conf +++ b/bluetooth/bt_vendor_overlay_caiman.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/bluetooth/bt_vendor_overlay_komodo.conf b/bluetooth/bt_vendor_overlay_komodo.conf index 1f5eb93c..c784f0ed 100644 --- a/bluetooth/bt_vendor_overlay_komodo.conf +++ b/bluetooth/bt_vendor_overlay_komodo.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/bluetooth/bt_vendor_overlay_tokay.conf b/bluetooth/bt_vendor_overlay_tokay.conf index 1f5eb93c..c784f0ed 100644 --- a/bluetooth/bt_vendor_overlay_tokay.conf +++ b/bluetooth/bt_vendor_overlay_tokay.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-caiman.mk b/device-caiman.mk index bd6907ff..e5efe3b5 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -415,3 +415,12 @@ PRODUCT_PACKAGES += \ #Component Override for Pixel Troubleshooting App PRODUCT_COPY_FILES += \ device/google/caimito/caiman/caiman-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/caiman-component-overrides.xml + +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.thread_dispatcher.enabled=true + +# Thread HAL +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_PACKAGES += \ + com.google.caimito.hardware.threadnetwork +endif diff --git a/device-komodo.mk b/device-komodo.mk index b0be1045..21761587 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -416,3 +416,12 @@ PRODUCT_PACKAGES += \ #Component Override for Pixel Troubleshooting App PRODUCT_COPY_FILES += \ device/google/caimito/komodo/komodo-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/komodo-component-overrides.xml + +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.thread_dispatcher.enabled=true + +# Thread HAL +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_PACKAGES += \ + com.google.caimito.hardware.threadnetwork +endif diff --git a/device-tokay.mk b/device-tokay.mk index e39489ad..64f3861b 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -380,3 +380,11 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ device/google/caimito/tokay/tokay-component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/tokay-component-overrides.xml +PRODUCT_PRODUCT_PROPERTIES += \ + persist.bluetooth.thread_dispatcher.enabled=true + +# Thread HAL +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +PRODUCT_PACKAGES += \ + com.google.caimito.hardware.threadnetwork +endif From b3683e372e68529fef0a5a5c0121e17a2bd50f98 Mon Sep 17 00:00:00 2001 From: James Huang Date: Sun, 5 May 2024 23:17:26 +0800 Subject: [PATCH 2/8] gps: Update gps: Update GNSS FW 4.15.1_7_P2_R3 + config for P24 Enable Navic (Chip_Configuration_GNSSConstConstraintDef = 0x60FF) Disable 1PPS feature by default (Is1PPSTimeSyncEnable=0) Bug: 336693604 Bug: 321020637 Test: Verify CTS/VTS, sanity test and SST in b/338492673 Change-Id: If23397117be814eec89195090a15e61b28240a10 --- location/caiman/user/gps.cfg | 7 ++++--- location/caiman/userdebug/gps.cfg | 12 +++++++----- location/komodo/user/gps.cfg | 7 ++++--- location/komodo/userdebug/gps.cfg | 12 +++++++----- location/ripcurrent24/user/gps.cfg | 8 +++++--- location/ripcurrent24/userdebug/gps.cfg | 13 ++++++++----- location/ripcurrentpro/user/gps.cfg | 8 +++++--- location/ripcurrentpro/userdebug/gps.cfg | 13 ++++++++----- location/tokay/user/gps.cfg | 7 ++++--- location/tokay/userdebug/gps.cfg | 12 +++++++----- 10 files changed, 59 insertions(+), 40 deletions(-) diff --git a/location/caiman/user/gps.cfg b/location/caiman/user/gps.cfg index cdef97f7..f756cfeb 100644 --- a/location/caiman/user/gps.cfg +++ b/location/caiman/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/caiman/userdebug/gps.cfg b/location/caiman/userdebug/gps.cfg index cd2c428f..523b35b9 100644 --- a/location/caiman/userdebug/gps.cfg +++ b/location/caiman/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/location/komodo/user/gps.cfg b/location/komodo/user/gps.cfg index c678ba6f..189a0986 100644 --- a/location/komodo/user/gps.cfg +++ b/location/komodo/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/komodo/userdebug/gps.cfg b/location/komodo/userdebug/gps.cfg index d4d70cf4..cae080f1 100644 --- a/location/komodo/userdebug/gps.cfg +++ b/location/komodo/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/location/ripcurrent24/user/gps.cfg b/location/ripcurrent24/user/gps.cfg index b0b1821f..9ee0f5cc 100644 --- a/location/ripcurrent24/user/gps.cfg +++ b/location/ripcurrent24/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 @@ -41,6 +42,7 @@ Sif_UseFwXtraInterface=1 Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 +SETCaps_SuplUT1=20 PosReq_Supl2Params_SuplNiUdpPort=7275 GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 diff --git a/location/ripcurrent24/userdebug/gps.cfg b/location/ripcurrent24/userdebug/gps.cfg index 989b98a6..d21c4474 100644 --- a/location/ripcurrent24/userdebug/gps.cfg +++ b/location/ripcurrent24/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 @@ -167,6 +169,7 @@ Sif_UseFwXtraInterface=1 Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 +SETCaps_SuplUT1=20 PosReq_Supl2Params_SuplNiUdpPort=7275 GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 diff --git a/location/ripcurrentpro/user/gps.cfg b/location/ripcurrentpro/user/gps.cfg index b0b1821f..9ee0f5cc 100644 --- a/location/ripcurrentpro/user/gps.cfg +++ b/location/ripcurrentpro/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 @@ -41,6 +42,7 @@ Sif_UseFwXtraInterface=1 Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 +SETCaps_SuplUT1=20 PosReq_Supl2Params_SuplNiUdpPort=7275 GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 diff --git a/location/ripcurrentpro/userdebug/gps.cfg b/location/ripcurrentpro/userdebug/gps.cfg index 989b98a6..d21c4474 100644 --- a/location/ripcurrentpro/userdebug/gps.cfg +++ b/location/ripcurrentpro/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 @@ -167,6 +169,7 @@ Sif_UseFwXtraInterface=1 Agnss_IsGloAidingEnable=0 SETCaps_IsOtdoa=1 SETCaps_IsLpp=1 +SETCaps_SuplUT1=20 PosReq_Supl2Params_SuplNiUdpPort=7275 GlueLayer_LPPCpBitmask=0xFF GlueLayer_IsCpLteNeighborCellEnable=1 diff --git a/location/tokay/user/gps.cfg b/location/tokay/user/gps.cfg index 96dc360c..a4ffcb57 100644 --- a/location/tokay/user/gps.cfg +++ b/location/tokay/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/tokay/userdebug/gps.cfg b/location/tokay/userdebug/gps.cfg index 5911e0c8..dff542f6 100644 --- a/location/tokay/userdebug/gps.cfg +++ b/location/tokay/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 From 6abc8d2bd6b6811426c2071c6427b65419ff4637 Mon Sep 17 00:00:00 2001 From: Jasmine Cha Date: Tue, 7 May 2024 04:10:23 +0000 Subject: [PATCH 3/8] update volume stereo output system sound loudness Bug: 338159946 Bug: 338159502 Test: manual test by hardware team Change-Id: I28ae8309284c599d948d57ca9bc62b7ce2bfef8a signed-off-by: jasmine cha --- .../aidl_config/audio_policy_volumes.xml | 46 +++++++++---------- .../aidl_config/audio_policy_volumes.xml | 46 +++++++++---------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/audio/caiman/aidl_config/audio_policy_volumes.xml b/audio/caiman/aidl_config/audio_policy_volumes.xml index fe0fd2ac..36fc2c7c 100644 --- a/audio/caiman/aidl_config/audio_policy_volumes.xml +++ b/audio/caiman/aidl_config/audio_policy_volumes.xml @@ -52,14 +52,14 @@ volume index from 0 to 100. 100,-1800 - 1,-6600 - 13,-6180 - 29,-5350 - 43,-4650 - 57,-3850 - 71,-3650 - 86,-3250 - 100,-2850 + 1,-5510 + 13,-4890 + 29,-4220 + 43,-3670 + 57,-3010 + 71,-2760 + 86,-2450 + 100,-2110 @@ -184,14 +184,14 @@ volume index from 0 to 100. 100,-1800 - 1,-6600 - 13,-6180 - 29,-5350 - 43,-4650 - 57,-3850 - 71,-3650 - 86,-3250 - 100,-2850 + 1,-5510 + 13,-4890 + 29,-4220 + 43,-3670 + 57,-3010 + 71,-2760 + 86,-2450 + 100,-2110 @@ -207,13 +207,13 @@ volume index from 0 to 100. 1,-6600 - 14,-6000 - 29,-5180 - 43,-4300 - 57,-3950 - 71,-3340 - 85,-2750 - 100,-2300 + 14,-5280 + 29,-4480 + 43,-3820 + 57,-3710 + 71,-3160 + 85,-2480 + 100,-2086 diff --git a/audio/tokay/aidl_config/audio_policy_volumes.xml b/audio/tokay/aidl_config/audio_policy_volumes.xml index fe0fd2ac..36fc2c7c 100644 --- a/audio/tokay/aidl_config/audio_policy_volumes.xml +++ b/audio/tokay/aidl_config/audio_policy_volumes.xml @@ -52,14 +52,14 @@ volume index from 0 to 100. 100,-1800 - 1,-6600 - 13,-6180 - 29,-5350 - 43,-4650 - 57,-3850 - 71,-3650 - 86,-3250 - 100,-2850 + 1,-5510 + 13,-4890 + 29,-4220 + 43,-3670 + 57,-3010 + 71,-2760 + 86,-2450 + 100,-2110 @@ -184,14 +184,14 @@ volume index from 0 to 100. 100,-1800 - 1,-6600 - 13,-6180 - 29,-5350 - 43,-4650 - 57,-3850 - 71,-3650 - 86,-3250 - 100,-2850 + 1,-5510 + 13,-4890 + 29,-4220 + 43,-3670 + 57,-3010 + 71,-2760 + 86,-2450 + 100,-2110 @@ -207,13 +207,13 @@ volume index from 0 to 100. 1,-6600 - 14,-6000 - 29,-5180 - 43,-4300 - 57,-3950 - 71,-3340 - 85,-2750 - 100,-2300 + 14,-5280 + 29,-4480 + 43,-3820 + 57,-3710 + 71,-3160 + 85,-2480 + 100,-2086 From 4958f15db0a5ae11961357bb65fd6eaac97acd19 Mon Sep 17 00:00:00 2001 From: Rick Yiu Date: Tue, 7 May 2024 07:39:47 +0000 Subject: [PATCH 4/8] Revert^2 "Set big core to cpu skip mask by default" This reverts commit b64afc1747e68da4ad8bbbf7bc93a024d5c4e789. Reason for revert: regression fixed Bug: 248621289 Change-Id: Ia3479262bf7188b2abf35f5b5ec5f18b0fe63aff Test: build pass --- perf/powerhint-caiman.json | 37 ++++++++++++++++++++++++++++++- perf/powerhint-komodo.json | 37 ++++++++++++++++++++++++++++++- perf/powerhint-ripcurrentpro.json | 37 ++++++++++++++++++++++++++++++- perf/powerhint-tokay.json | 37 ++++++++++++++++++++++++++++++- 4 files changed, 144 insertions(+), 4 deletions(-) diff --git a/perf/powerhint-caiman.json b/perf/powerhint-caiman.json index 96fc3d46..5c36a43b 100644 --- a/perf/powerhint-caiman.json +++ b/perf/powerhint-caiman.json @@ -221,7 +221,6 @@ "0x0", "0x80" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -865,6 +864,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1012,6 +1017,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1286,6 +1297,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1880,6 +1897,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2300,6 +2323,12 @@ "Duration": 0, "Value": "4-7" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2444,6 +2473,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", diff --git a/perf/powerhint-komodo.json b/perf/powerhint-komodo.json index 5083ecfa..fa2beb7b 100644 --- a/perf/powerhint-komodo.json +++ b/perf/powerhint-komodo.json @@ -221,7 +221,6 @@ "0x0", "0x80" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -865,6 +864,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1012,6 +1017,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1286,6 +1297,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1880,6 +1897,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2300,6 +2323,12 @@ "Duration": 0, "Value": "4-7" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2444,6 +2473,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", diff --git a/perf/powerhint-ripcurrentpro.json b/perf/powerhint-ripcurrentpro.json index d2984619..8513e0be 100644 --- a/perf/powerhint-ripcurrentpro.json +++ b/perf/powerhint-ripcurrentpro.json @@ -274,7 +274,6 @@ "0x0", "0x80" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -854,6 +853,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1001,6 +1006,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1275,6 +1286,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1869,6 +1886,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2289,6 +2312,12 @@ "Duration": 0, "Value": "4-7" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2433,6 +2462,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", diff --git a/perf/powerhint-tokay.json b/perf/powerhint-tokay.json index 96fc3d46..5c36a43b 100644 --- a/perf/powerhint-tokay.json +++ b/perf/powerhint-tokay.json @@ -221,7 +221,6 @@ "0x0", "0x80" ], - "DefaultIndex": 0, "ResetOnInit": true }, { @@ -865,6 +864,12 @@ "Duration": 1000, "Value": "0-3" }, + { + "PowerHint": "LAUNCH", + "Node": "CPUSkipMask", + "Duration": 5000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH", "Node": "ReducePreferIdle", @@ -1012,6 +1017,12 @@ "Duration": 5000, "Value": "1" }, + { + "PowerHint": "LAUNCH_EXTEND", + "Node": "CPUSkipMask", + "Duration": 2000, + "Value": "0x0" + }, { "PowerHint": "LAUNCH_EXTEND", "Node": "CPUBigClusterMaxFreq", @@ -1286,6 +1297,12 @@ "Duration": 0, "Value": "0" }, + { + "PowerHint": "CAMERA_LAUNCH", + "Node": "CPUSkipMask", + "Duration": 1000, + "Value": "0x0" + }, { "PowerHint": "CAMERA_LAUNCH", "Node": "CPU_BIG_TSKIN_BYPASS", @@ -1880,6 +1897,12 @@ "Duration": 0, "Value": "camera" }, + { + "PowerHint": "CAMERA_STREAMING_EXTREME", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_HIGH", "Node": "PowerHALCameraRunning", @@ -2300,6 +2323,12 @@ "Duration": 0, "Value": "4-7" }, + { + "PowerHint": "CAMERA_STREAMING_LOW", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", "Node": "PowerHALCameraRunning", @@ -2444,6 +2473,12 @@ "Duration": 0, "Value": "30" }, + { + "PowerHint": "CAMERA_STREAMING_VIDEO_CALL", + "Node": "CPUSkipMask", + "Duration": 0, + "Value": "0x0" + }, { "PowerHint": "CAMERA_VIDEO_RECORDING", "Type": "MaskHint", From c9075ff47b006c0300ca30a6feca0492d8276066 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Tue, 30 Apr 2024 13:36:47 +0000 Subject: [PATCH 5/8] Switch kernel directory to control by build flag Bug: 337161745 Change-Id: Ie7d2f8623846a72de8dc1a423616e3bccbf1508c --- device-caiman.mk | 9 +++++++-- device-komodo.mk | 9 +++++++-- device-ripcurrent24.mk | 9 +++++++-- device-ripcurrentpro.mk | 9 +++++++-- device-tokay.mk | 9 +++++++-- 5 files changed, 35 insertions(+), 10 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 93e486ed..9275d928 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -14,8 +14,13 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/caimito-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers +ifdef RELEASE_GOOGLE_CAIMAN_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers +endif LOCAL_PATH := device/google/caimito diff --git a/device-komodo.mk b/device-komodo.mk index 5a586c06..4ecd5353 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -14,8 +14,13 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/caimito-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers +ifdef RELEASE_GOOGLE_KOMODO_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers +endif LOCAL_PATH := device/google/caimito diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk index a7b09bed..e29d28a7 100644 --- a/device-ripcurrent24.mk +++ b/device-ripcurrent24.mk @@ -14,8 +14,13 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/caimito-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers +ifdef RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers +endif $(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-ripcurrent24.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk index 858b377a..16bb6519 100644 --- a/device-ripcurrentpro.mk +++ b/device-ripcurrentpro.mk @@ -14,8 +14,13 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/caimito-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers +ifdef RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers +endif USE_SWIFTSHADER := false BOARD_USES_SWIFTSHADER := false diff --git a/device-tokay.mk b/device-tokay.mk index 7212ebea..e85808a8 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -14,8 +14,13 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/caimito-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers +ifdef RELEASE_GOOGLE_TOKAY_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers +endif $(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-tokay.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) From 9191f908ae064bd8f2c07595f07343afbd4566c6 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 3 May 2024 04:06:24 +0000 Subject: [PATCH 6/8] Switch bootloader and radio directory to control by build flag Bug: 337163126 Change-Id: Ic342543ae53517febced03800af196d4c17ba390 --- device-caiman.mk | 10 ++++++++++ device-komodo.mk | 10 ++++++++++ device-ripcurrent24.mk | 10 ++++++++++ device-ripcurrentpro.mk | 10 ++++++++++ device-tokay.mk | 10 ++++++++++ 5 files changed, 50 insertions(+) diff --git a/device-caiman.mk b/device-caiman.mk index 9275d928..ae844ab5 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -14,6 +14,16 @@ # limitations under the License. # +ifdef RELEASE_GOOGLE_CAIMAN_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CAIMAN_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_CAIMAN_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_CAIMAN_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR) +$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR)) + ifdef RELEASE_GOOGLE_CAIMAN_KERNEL_DIR TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR)/kernel-headers diff --git a/device-komodo.mk b/device-komodo.mk index 4ecd5353..75d1a585 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -14,6 +14,16 @@ # limitations under the License. # +ifdef RELEASE_GOOGLE_KOMODO_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_KOMODO_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_KOMODO_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_KOMODO_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR) +$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR)) + ifdef RELEASE_GOOGLE_KOMODO_KERNEL_DIR TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR)/kernel-headers diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk index e29d28a7..b0e6b854 100644 --- a/device-ripcurrent24.mk +++ b/device-ripcurrent24.mk @@ -14,6 +14,16 @@ # limitations under the License. # +ifdef RELEASE_GOOGLE_RIPCURRENT24_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RIPCURRENT24_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_RIPCURRENT24_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_RIPCURRENT24_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR) +$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR)) + ifdef RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR)/kernel-headers diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk index 16bb6519..1b517e6d 100644 --- a/device-ripcurrentpro.mk +++ b/device-ripcurrentpro.mk @@ -14,6 +14,16 @@ # limitations under the License. # +ifdef RELEASE_GOOGLE_RIPCURRENTPRO_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RIPCURRENTPRO_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_RIPCURRENTPRO_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_RIPCURRENTPRO_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR) +$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR)) + ifdef RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR)/kernel-headers diff --git a/device-tokay.mk b/device-tokay.mk index e85808a8..72d2d780 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -14,6 +14,16 @@ # limitations under the License. # +ifdef RELEASE_GOOGLE_TOKAY_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR ?= $(RELEASE_GOOGLE_TOKAY_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_TOKAY_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR ?= $(RELEASE_GOOGLE_TOKAY_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR) +$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR)) + ifdef RELEASE_GOOGLE_TOKAY_KERNEL_DIR TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR)/kernel-headers From 0d4a638cca62ba26a18cd66aad1871dcaf097040 Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Tue, 30 Apr 2024 13:36:47 +0000 Subject: [PATCH 7/8] Switch kernel directory to control by build flag Bug: 337161745 Change-Id: Ie7d2f8623846a72de8dc1a423616e3bccbf1508c Merged-In: I3f1688e6186cec4644f1d9a4cd80537c9672822f --- device-caiman.mk | 9 +++++++-- device-komodo.mk | 9 +++++++-- device-ripcurrent24.mk | 9 +++++++-- device-ripcurrentpro.mk | 9 +++++++-- device-tokay.mk | 9 +++++++-- 5 files changed, 35 insertions(+), 10 deletions(-) diff --git a/device-caiman.mk b/device-caiman.mk index 17d7a5fc..0dbca23d 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -14,8 +14,13 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/caimito-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers +ifdef RELEASE_GOOGLE_CAIMAN_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers +endif LOCAL_PATH := device/google/caimito diff --git a/device-komodo.mk b/device-komodo.mk index 0e5f9691..eca7b6db 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -14,8 +14,13 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/caimito-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers +ifdef RELEASE_GOOGLE_KOMODO_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers +endif LOCAL_PATH := device/google/caimito diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk index 8cf2cfa1..4ee491d0 100644 --- a/device-ripcurrent24.mk +++ b/device-ripcurrent24.mk @@ -14,8 +14,13 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/caimito-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers +ifdef RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers +endif $(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-ripcurrent24.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk index 4c6b4d5e..aeb147f9 100644 --- a/device-ripcurrentpro.mk +++ b/device-ripcurrentpro.mk @@ -14,8 +14,13 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/caimito-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers +ifdef RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers +endif USE_SWIFTSHADER := false BOARD_USES_SWIFTSHADER := false diff --git a/device-tokay.mk b/device-tokay.mk index 7473ccba..8442716c 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -14,8 +14,13 @@ # limitations under the License. # -TARGET_KERNEL_DIR ?= device/google/caimito-kernel -TARGET_BOARD_KERNEL_HEADERS := device/google/caimito-kernel/kernel-headers +ifdef RELEASE_GOOGLE_TOKAY_KERNEL_DIR +TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR) +TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR)/kernel-headers +else +TARGET_KERNEL_DIR ?= device/google/caimito-kernels/6.1/24D1 +TARGET_BOARD_KERNEL_HEADERS ?= device/google/caimito-kernels/6.1/24D1/kernel-headers +endif $(call inherit-product-if-exists, vendor/google_devices/caimito/prebuilts/device-vendor-tokay.mk) $(call inherit-product-if-exists, vendor/google_devices/zumapro/prebuilts/device-vendor.mk) From 498ec2eb2ca2ed795641d09ee17c12db1656ce6e Mon Sep 17 00:00:00 2001 From: Robin Peng Date: Fri, 3 May 2024 04:06:24 +0000 Subject: [PATCH 8/8] Switch bootloader and radio directory to control by build flag Bug: 337163126 Change-Id: Ic342543ae53517febced03800af196d4c17ba390 Merged-In: I3f1688e6186cec4644f1d9a4cd80537c9672822f --- device-caiman.mk | 10 ++++++++++ device-komodo.mk | 10 ++++++++++ device-ripcurrent24.mk | 10 ++++++++++ device-ripcurrentpro.mk | 10 ++++++++++ device-tokay.mk | 10 ++++++++++ 5 files changed, 50 insertions(+) diff --git a/device-caiman.mk b/device-caiman.mk index 0dbca23d..eff9321b 100644 --- a/device-caiman.mk +++ b/device-caiman.mk @@ -14,6 +14,16 @@ # limitations under the License. # +ifdef RELEASE_GOOGLE_CAIMAN_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_CAIMAN_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_CAIMAN_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_CAIMAN_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR) +$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_CAIMAN_DIR)) + ifdef RELEASE_GOOGLE_CAIMAN_KERNEL_DIR TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_CAIMAN_KERNEL_DIR)/kernel-headers diff --git a/device-komodo.mk b/device-komodo.mk index eca7b6db..2a8f957e 100644 --- a/device-komodo.mk +++ b/device-komodo.mk @@ -14,6 +14,16 @@ # limitations under the License. # +ifdef RELEASE_GOOGLE_KOMODO_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_KOMODO_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_KOMODO_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_KOMODO_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR) +$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_KOMODO_DIR)) + ifdef RELEASE_GOOGLE_KOMODO_KERNEL_DIR TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_KOMODO_KERNEL_DIR)/kernel-headers diff --git a/device-ripcurrent24.mk b/device-ripcurrent24.mk index 4ee491d0..998020cc 100644 --- a/device-ripcurrent24.mk +++ b/device-ripcurrent24.mk @@ -14,6 +14,16 @@ # limitations under the License. # +ifdef RELEASE_GOOGLE_RIPCURRENT24_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RIPCURRENT24_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_RIPCURRENT24_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_RIPCURRENT24_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR) +$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENT24_DIR)) + ifdef RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENT24_KERNEL_DIR)/kernel-headers diff --git a/device-ripcurrentpro.mk b/device-ripcurrentpro.mk index aeb147f9..cfbf96f8 100644 --- a/device-ripcurrentpro.mk +++ b/device-ripcurrentpro.mk @@ -14,6 +14,16 @@ # limitations under the License. # +ifdef RELEASE_GOOGLE_RIPCURRENTPRO_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR := $(RELEASE_GOOGLE_RIPCURRENTPRO_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_RIPCURRENTPRO_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR := $(RELEASE_GOOGLE_RIPCURRENTPRO_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR) +$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_RIPCURRENTPRO_DIR)) + ifdef RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_RIPCURRENTPRO_KERNEL_DIR)/kernel-headers diff --git a/device-tokay.mk b/device-tokay.mk index 8442716c..8cfe560f 100644 --- a/device-tokay.mk +++ b/device-tokay.mk @@ -14,6 +14,16 @@ # limitations under the License. # +ifdef RELEASE_GOOGLE_TOKAY_RADIO_DIR +RELEASE_GOOGLE_PRODUCT_RADIO_DIR ?= $(RELEASE_GOOGLE_TOKAY_RADIO_DIR) +endif +ifdef RELEASE_GOOGLE_TOKAY_RADIOCFG_DIR +RELEASE_GOOGLE_PRODUCT_RADIOCFG_DIR ?= $(RELEASE_GOOGLE_TOKAY_RADIOCFG_DIR) +endif +RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR ?= 24D1# Keep this for pdk TODO: b/327119000 +RELEASE_GOOGLE_PRODUCT_BOOTLOADER_DIR := bootloader/$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR) +$(call soong_config_set,caimito_bootloader,prebuilt_dir,$(RELEASE_GOOGLE_BOOTLOADER_TOKAY_DIR)) + ifdef RELEASE_GOOGLE_TOKAY_KERNEL_DIR TARGET_KERNEL_DIR ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR) TARGET_BOARD_KERNEL_HEADERS ?= $(RELEASE_GOOGLE_TOKAY_KERNEL_DIR)/kernel-headers