Merge "defconfig: Update initial defconfig fragments for Holi"

arch/arm64/configs/vendor/holi_GKI.config

@@ -9,7 +9,6 @@ CONFIG_HVC_DCC_SERIALIZE_SMP=y
 CONFIG_REGULATOR_STUB=m
 CONFIG_REGULATOR_PROXY_CONSUMER=m
 CONFIG_KEYBOARD_GPIO=m
-# CONFIG_IKHEADERS is not set
 CONFIG_EXTCON=m
 CONFIG_SPMI_MSM_PMIC_ARB=m
 CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=m
@@ -28,6 +27,8 @@ CONFIG_USB_DWC3_MSM=m
 CONFIG_USB_EHSET_TEST_FIXTURE=m
 CONFIG_USB_LINK_LAYER_TEST=m
 CONFIG_USB_CONFIGFS_F_DIAG=m
+CONFIG_TYPEC=m
+CONFIG_SDCARD_FS=m
 CONFIG_TYPEC_UCSI=m
 CONFIG_UCSI_QTI_GLINK=m
 CONFIG_INTERCONNECT_QCOM=m
@@ -36,7 +37,10 @@ CONFIG_PHY_QCOM_UFS_QRBTC_SDM845=m
 CONFIG_PHY_QCOM_UFS_V4=m
 CONFIG_SCSI_UFS_QCOM=m
 CONFIG_MSM_CORE_HANG_DETECT=m
+CONFIG_PANIC_ON_OOPS=y
 CONFIG_QCOM_IPCC=m
+CONFIG_QCOM_WATCHDOG=m
+CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y
 CONFIG_QCOM_SCM=m
 CONFIG_QTEE_SHM_BRIDGE=y
 # CONFIG_QCOM_SCM_DOWNLOAD_MODE_DEFAULT is not set
@@ -74,6 +78,7 @@ CONFIG_REGULATOR_REFGEN=m
 CONFIG_COMMON_CLK_QCOM=m
 CONFIG_MSM_GLOBAL_SYNX=m
 CONFIG_MSM_CVP=m
+CONFIG_QCOM_EUD=m
 CONFIG_QRTR=m
 CONFIG_QRTR_SMD=m
 CONFIG_USB_MSM_SSPHY_QMP=m
@@ -102,18 +107,25 @@ CONFIG_MSM_ADSPRPC=m
 CONFIG_MSM_CDSP_LOADER=m
 CONFIG_UIO_MSM_SHAREDMEM=m
 CONFIG_QCOM_SOCINFO=m
+CONFIG_QCOM_PROXY_OF_CONSUMER=m
 CONFIG_BTFM_SLIM=m
 CONFIG_QCOM_KGSL=m
 CONFIG_QCOM_QFPROM=m
 CONFIG_DEVFREQ_GOV_QCOM_GPUBW_MON=m
 CONFIG_DEVFREQ_GOV_QCOM_ADRENO_TZ=m
+CONFIG_CFI_PERMISSIVE=y
 # CONFIG_SND_SOC_WCD9335 is not set
 # CONFIG_SLIM_QCOM_CTRL is not set
 # CONFIG_SLIM_QCOM_NGD_CTRL is not set
 # CONFIG_SLIMBUS_MSM_CTRL is not set
 # CONFIG_SLIMBUS_MSM_NGD is not set
+CONFIG_QSEECOM=m
 CONFIG_USB_ROLE_SWITCH=m
 # CONFIG_QCOM_MINIDUMP is not set
 CONFIG_QCOM_EUD=m
 CONFIG_MSM_RPM_SMD=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=y
+CONFIG_QCOM_QFPROM=m
+CONFIG_HEADER_TEST=y
+CONFIG_HEADERS_INSTALL=y
+CONFIG_KERNEL_HEADER_TEST=y

arch/arm64/configs/vendor/holi_QGKI.config

@@ -1,3 +1,4 @@
+CONFIG_LOCALVERSION="-qgki"
 # CONFIG_TRIM_UNUSED_KSYMS is not set
 CONFIG_QCOM_IOMMU_IO_PGTABLE_QUIRKS=y
 CONFIG_IOMMU_DEBUGFS=y
@@ -22,6 +23,7 @@ CONFIG_REGULATOR_QTI_DEBUG=y
 CONFIG_REGMAP_QTI_DEBUG=y
 CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y
 CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_QCOM_SHOW_RESUME_IRQ=y
 CONFIG_QCOM_SOC_SLEEP_STATS=y
 CONFIG_QCOM_RUN_QUEUE_STATS=y
 CONFIG_QTI_RPM_STATS_LOG=y
@@ -36,6 +38,7 @@ CONFIG_HOTPLUG_SIZE_BITS=29
 CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
 CONFIG_MEMORY_HOTPLUG_MOVABLE_NODE=y
 CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_QCOM_MINIDUMP=y
 CONFIG_QCOM_MEM_OFFLINE=y
 CONFIG_OVERRIDE_MEMORY_LIMIT=y
 CONFIG_VM_EVENT_COUNT_CLEAN_PAGE_RECLAIM=y
@@ -63,13 +66,15 @@ CONFIG_MSM_EXT_DISPLAY=y
 # CONFIG_RADIO_SAA7706H is not set
 # CONFIG_RADIO_TEF6862 is not set
 # CONFIG_RADIO_WL1273 is not set
+CONFIG_DEBUG_FS=y
 CONFIG_QCOM_BIMC_BWMON=y
 CONFIG_ARM_MEMLAT_MON=y
 CONFIG_DEVFREQ_GOV_QCOM_BW_HWMON=y
 CONFIG_DEVFREQ_GOV_MEMLAT=y
 CONFIG_DEVFREQ_SIMPLE_DEV=y
 CONFIG_EDAC_QCOM=y
-CONFIG_EDAC_QCOM_LLCC_PANIC_ON_UE=y
+CONFIG_EDAC_QGKI=y
+CONFIG_MSM_BOOT_STATS=y
 CONFIG_QCOM_DEVFREQ_ICC=y
 CONFIG_QCOM_LLCC_PMU=y
 CONFIG_QTI_TZ_LOG=y

arch/arm64/configs/vendor/holi_debug.config

@@ -1,17 +1,21 @@
+CONFIG_LOCALVERSION="-qgki-debug"
 CONFIG_IOMMU_TLBSYNC_DEBUG=y
 CONFIG_CMA_DEBUGFS=y
 CONFIG_CMA_DEBUG=y
 CONFIG_EDAC_KRYO_ARM64_PANIC_ON_CE=y
-CONFIG_IPC_LOGGING=y
 CONFIG_QMP_DEBUGFS_CLIENT=y
 CONFIG_LKDTM=m
 CONFIG_ATOMIC64_SELFTEST=m
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEBUG_SPINLOCK=y
 CONFIG_TEST_USER_COPY=m
 CONFIG_PAGE_POISONING_ENABLE_DEFAULT=y
 CONFIG_OF_RESERVED_MEM_CHECK=y
 CONFIG_BUG_ON_HW_MEM_ONLINE_FAIL=y
 CONFIG_PANIC_ON_SCHED_BUG=y
 CONFIG_PANIC_ON_RT_THROTTLING=y
+CONFIG_LKDTM=m
+CONFIG_RUNTIME_TESTING_MENU=y
 CONFIG_PREEMPTIRQ_EVENTS=y
 CONFIG_SERIAL_MSM_GENI=y
 CONFIG_SERIAL_MSM_GENI_CONSOLE=y
@@ -29,6 +33,8 @@ CONFIG_SPI_MSM_GENI=y
 CONFIG_MSM_GPI_DMA=y
 CONFIG_MSM_GPI_DMA_DEBUG=y
 CONFIG_EDAC_QCOM_LLCC_PANIC_ON_CE=y
+CONFIG_LOCK_TORTURE_TEST=m
+CONFIG_RCU_TORTURE_TEST=m
 CONFIG_I3C=y
 CONFIG_I3C_MASTER_MSM_GENI=y
 # CONFIG_CDNS_I3C_MASTER is not set
@@ -46,7 +52,6 @@ CONFIG_THERMAL_TSENS=y
 # CONFIG_MSM_JTAGV8 is not set
 CONFIG_SLIMBUS=y
 CONFIG_SLIMBUS_MSM_NGD=y
-CONFIG_QSEECOM=y
 CONFIG_QCOM_SMCINVOKE=y
 # CONFIG_SERIAL_DEV_BUS is not set
 # CONFIG_HVC_DCC is not set
@@ -101,3 +106,4 @@ CONFIG_MSM_REMOTEQDSS=y
 CONFIG_LKDTM=y
 CONFIG_MSM_RPM_SMD=y
 CONFIG_SM_GCC_HOLI=y
+CONFIG_DEBUG_PANIC_ON_OOM=y