move the change from private-util to project-celadon

Tracked-On: OAM-112399 Signed-off-by: Qi Zhang <[email protected]>
projectceladon · Sep 27, 2023 · 5df8ac0 · 5df8ac0
1 parent 4986aa5
commit 5df8ac0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/celadon_ivi/BoardConfig.mk b/celadon_ivi/BoardConfig.mk
@@ -219,10 +219,12 @@ else
 BOARD_KERNEL_CMDLINE += androidboot.hardware=$(TARGET_DEVICE)
 endif
 
+BOARD_KERNEL_CMDLINE += \
+        silentmode=normal
 
 
 BOARD_KERNEL_CMDLINE += \
-       intel_pstate=passive
+       intel_pstate=active
 
 BOARD_KERNEL_CMDLINE += \
       snd-hda-intel.model=dell-headset-multi

diff --git a/celadon_ivi/config-lts/linux-intel-lts2021/debug_diffconfig b/celadon_ivi/config-lts/linux-intel-lts2021/debug_diffconfig
@@ -71,3 +71,7 @@ CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
 CONFIG_DYNAMIC_FTRACE=y
 CONFIG_TRACING_EVENTS_GPIO=y
 CONFIG_FTRACE_MCOUNT_RECORD=y
+
+CONFIG_INTEL_SOCPERF=y
+CONFIG_SOCPERF=m
+CONFIG_INTEL_SOCWATCH=m
diff --git a/celadon_ivi/config-lts/linux-intel-lts2021/x86_64_defconfig b/celadon_ivi/config-lts/linux-intel-lts2021/x86_64_defconfig
@@ -483,6 +483,7 @@ CONFIG_PM_DEBUG=y
 CONFIG_PM_ADVANCED_DEBUG=y
 # CONFIG_PM_TEST_SUSPEND is not set
 CONFIG_PM_SLEEP_DEBUG=y
+CONFIG_PM_SILENTMODE=y
 # CONFIG_DPM_WATCHDOG is not set
 CONFIG_PM_TRACE=y
 CONFIG_PM_TRACE_RTC=y
@@ -7584,3 +7585,11 @@ CONFIG_ARCH_USE_MEMTEST=y
 # CONFIG_MEMTEST is not set
 # end of Kernel Testing and Coverage
 # end of Kernel hacking
+#
+#
+# socwatch driver
+#
+# CONFIG_INTEL_SOCPERF is not set
+# CONFIG_INTEL_SOCWATCH is not set
+# end of socwatch driver
+#
diff --git a/celadon_ivi/mixins.spec b/celadon_ivi/mixins.spec
@@ -7,7 +7,7 @@ mixinsrel: false
 product.mk: device.mk
 
 [groups]
-kernel: gmin64(useprebuilt=false,src_path=kernel/linux-intel-lts2021, loglevel=7, interactive_governor=false, relative_sleepstates=false, modules_in_bootimg=false, external_modules=,debug_modules=, use_bcmdhd=false, use_iwlwifi=false, extmod_platform=bxt, iwl_defconfig=, cfg_path=config-lts/linux-intel-lts2021, more_modules=true, chromium_src_path=kernel/lts2019-chromium, chromium_cfg_path=config-lts/lts2019-chromium, lts2020_yocto_src_path=kernel/lts2020-yocto, lts2020_yocto_cfg_path=config-lts/lts2020-yocto, lts2020_chromium_src_path=kernel/lts2020-chromium, lts2020_chromium_cfg_path=config-lts/lts2020-chromium, linux_intel_lts2021_src_path=kernel/linux-intel-lts2021, linux_intel_lts2021_cfg_path=config-lts/linux-intel-lts2021)
+kernel: gmin64(useprebuilt=false,src_path=kernel/linux-intel-lts2021, loglevel=7, interactive_governor=false, relative_sleepstates=false, modules_in_bootimg=false, external_modules=,debug_modules=, use_bcmdhd=false, use_iwlwifi=false, extmod_platform=bxt, iwl_defconfig=, cfg_path=config-lts/linux-intel-lts2021, more_modules=true, chromium_src_path=kernel/lts2019-chromium, chromium_cfg_path=config-lts/lts2019-chromium, lts2020_yocto_src_path=kernel/lts2020-yocto, lts2020_yocto_cfg_path=config-lts/lts2020-yocto, lts2020_chromium_src_path=kernel/lts2020-chromium, lts2020_chromium_cfg_path=config-lts/lts2020-chromium, linux_intel_lts2021_src_path=kernel/linux-intel-lts2021, linux_intel_lts2021_cfg_path=config-lts/linux-intel-lts2021, pmsilent_mode=normal, schedutil=false)
 disk-bus: auto
 boot-arch: project-celadon(fw_sbl=true,fastboot=efi,ignore_rsci=true,disable_watchdog=true,watchdog_parameters=10 30,verity_warning=false,txe_bind_root_of_trust=false,bootloader_block_size=4096,verity_mode=false,disk_encryption=false,file_encryption=true,metadata_encryption=true,fsverity=true,target=celadon_ivi,ignore_not_applicable_reset=true,self_usb_device_mode_protocol=true,usb_storage=true,live_boot=true,userdata_checkpoint=true)
 sepolicy: enforcing