Merge defconfig changes into 'cm-14.1'

NotNoelChannel · Oct 5, 2024 · cd8dd89 · cd8dd89
2 parents f860121 + 62178ea
commit cd8dd89
Show file tree

Hide file tree

Showing 12 changed files with 827 additions and 113 deletions.
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
@@ -14,9 +14,8 @@
 ifneq ($(MACHINE),)
 include $(srctree)/$(MACHINE)/Makefile.boot
 endif
-include $(srctree)/arch/arm/boot/dts/Makefile
 
-include $(srctree)/arch/arm/boot/dts/Makefile
+include $(srctree)/arch/arm/boot/dts/qcom/Makefile
 ifneq ($(DTSSUBDIR),)
 DTSSUBDIR_INCS=$(foreach DIR, $(DTSSUBDIR), $(addsuffix /Makefile, $(addprefix $(srctree)/arch/arm/boot/dts/, $(DIR))))
 include $(DTSSUBDIR_INCS)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
@@ -208,12 +208,6 @@ dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
 	wm8850-w70v2.dtb
 dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb
 
-DTB_NAMES := $(subst $\",,$(CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE_NAMES))
-ifneq ($(DTB_NAMES),)
-DTB_LIST := $(addsuffix .dtb,$(DTB_NAMES))
-else
-DTB_LIST := $(dtb-y)
-endif
 
 targets += dtbs
 targets += $(DTB_LIST)

diff --git a/arch/arm/configs/msm8909-1gb-LMT-perf_defconfig b/arch/arm/configs/msm8909-1gb-LMT-perf_defconfig
@@ -574,3 +574,4 @@ CONFIG_MSM_CORE_CTL_HELPER=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
+CONFIG_UID_CPUTIME=y
diff --git a/arch/arm/configs/msm8909-1gb-perf_defconfig b/arch/arm/configs/msm8909-1gb-perf_defconfig
@@ -58,6 +58,7 @@ CONFIG_SMP=y
 CONFIG_SCHED_MC=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
+CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y
 CONFIG_BALANCE_ANON_FILE_RECLAIM=y
 CONFIG_HIGHMEM=y
 CONFIG_CC_STACKPROTECTOR_REGULAR=y
@@ -314,6 +315,7 @@ CONFIG_SENSORS_LTR553=y
 CONFIG_SENSORS_MPU6050=y
 CONFIG_SENSORS_MMC3416X=y
 CONFIG_SENSORS_AKM8963=y
+CONFIG_SENSORS_AKM09911=y
 CONFIG_SENSORS_BMA2X2=y
 CONFIG_SENSORS_AP3426=y
 CONFIG_SENSORS_HALL=y
@@ -342,6 +344,7 @@ CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_QPNP_PIN=y
 CONFIG_POWER_SUPPLY=y
+CONFIG_SMB358_CHARGER=y
 CONFIG_SMB135X_CHARGER=y
 CONFIG_SMB1360_CHARGER_FG=y
 CONFIG_BATTERY_BCL=y
@@ -566,7 +569,7 @@ CONFIG_QMI_ENCDEC=y
 CONFIG_MSM_BUSPM_DEV=m
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_RADIO_IRIS=y
-CONFIG_RADIO_IRIS_TRANSPORT=m
+CONFIG_RADIO_IRIS_TRANSPORT=y
 CONFIG_MSM_PERFORMANCE=y
 CONFIG_MSM_PERFORMANCE_HOTPLUG_ON=n
 CONFIG_DEVFREQ_SPDM=y
@@ -575,3 +578,4 @@ CONFIG_MSM_CORE_CTL_HELPER=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
+CONFIG_UID_CPUTIME=y
diff --git a/arch/arm/configs/msm8909-1gb_defconfig b/arch/arm/configs/msm8909-1gb_defconfig
@@ -61,6 +61,7 @@ CONFIG_SMP=y
 CONFIG_SCHED_MC=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
+CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y
 CONFIG_BALANCE_ANON_FILE_RECLAIM=y
 CONFIG_HIGHMEM=y
 CONFIG_CC_STACKPROTECTOR_REGULAR=y
@@ -321,6 +322,7 @@ CONFIG_SENSORS_LTR553=y
 CONFIG_SENSORS_MPU6050=y
 CONFIG_SENSORS_MMC3416X=y
 CONFIG_SENSORS_AKM8963=y
+CONFIG_SENSORS_AKM09911=y
 CONFIG_SENSORS_BMA2X2=y
 CONFIG_SENSORS_AP3426=y
 CONFIG_SENSORS_HALL=y
@@ -349,6 +351,7 @@ CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_QPNP_PIN=y
 CONFIG_POWER_SUPPLY=y
+CONFIG_SMB358_CHARGER=y
 CONFIG_SMB135X_CHARGER=y
 CONFIG_SMB1360_CHARGER_FG=y
 CONFIG_BATTERY_BCL=y
@@ -605,7 +608,7 @@ CONFIG_QMI_ENCDEC=y
 CONFIG_MSM_BUSPM_DEV=m
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_RADIO_IRIS=y
-CONFIG_RADIO_IRIS_TRANSPORT=m
+CONFIG_RADIO_IRIS_TRANSPORT=y
 CONFIG_MSM_PERFORMANCE=y
 CONFIG_MSM_PERFORMANCE_HOTPLUG_ON=n
 CONFIG_DEVFREQ_SPDM=y
@@ -614,3 +617,4 @@ CONFIG_MSM_CORE_CTL_HELPER=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
+CONFIG_UID_CPUTIME=y
diff --git a/arch/arm/configs/msm8909-perf_defconfig b/arch/arm/configs/msm8909-perf_defconfig
@@ -328,6 +328,7 @@ CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_QPNP_PIN=y
 CONFIG_POWER_SUPPLY=y
+CONFIG_SMB358_CHARGER=y
 CONFIG_SMB135X_CHARGER=y
 CONFIG_SMB1360_CHARGER_FG=y
 CONFIG_BATTERY_BCL=y
@@ -557,3 +558,4 @@ CONFIG_MSM_CORE_CTL_HELPER=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
+CONFIG_UID_CPUTIME=y
diff --git a/arch/arm/configs/msm8909_defconfig b/arch/arm/configs/msm8909_defconfig
@@ -62,6 +62,7 @@ CONFIG_SCHED_MC=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_KSM=y
+CONFIG_BUILD_ARM_APPENDED_DTB_IMAGE=y
 CONFIG_BALANCE_ANON_FILE_RECLAIM=y
 CONFIG_CC_STACKPROTECTOR_REGULAR=y
 CONFIG_CP_ACCESS=y
@@ -342,6 +343,7 @@ CONFIG_DEBUG_GPIO=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_QPNP_PIN=y
 CONFIG_POWER_SUPPLY=y
+CONFIG_SMB358_CHARGER=y
 CONFIG_SMB135X_CHARGER=y
 CONFIG_SMB1360_CHARGER_FG=y
 CONFIG_BATTERY_BCL=y
@@ -598,7 +600,7 @@ CONFIG_QMI_ENCDEC=y
 CONFIG_MSM_BUSPM_DEV=m
 CONFIG_MEDIA_RADIO_SUPPORT=y
 CONFIG_RADIO_IRIS=y
-CONFIG_RADIO_IRIS_TRANSPORT=m
+CONFIG_RADIO_IRIS_TRANSPORT=y
 CONFIG_MSM_PERFORMANCE=y
 CONFIG_MSM_PERFORMANCE_HOTPLUG_ON=n
 CONFIG_DEVFREQ_SPDM=y
@@ -607,3 +609,4 @@ CONFIG_MSM_CORE_CTL_HELPER=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP=y
 CONFIG_SECCOMP_FILTER=y
+CONFIG_UID_CPUTIME=y