Merge tag 'tags/bcm2835-defconfig-next-2019-08-15' into defconfig/next (c474106e) · Commits · 戴 / test

arch/arm/configs/bcm2835_defconfig

+9 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,14 @@ CONFIG_CMA=y
		CONFIG_SECCOMP=y
		CONFIG_KEXEC=y
		CONFIG_CRASH_DUMP=y
		CONFIG_CPU_FREQ=y
		CONFIG_CPU_FREQ_STAT=y
		CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE=y
		CONFIG_CPU_FREQ_GOV_POWERSAVE=y
		CONFIG_CPU_FREQ_GOV_USERSPACE=y
		CONFIG_CPU_FREQ_GOV_ONDEMAND=y
		CONFIG_CPUFREQ_DT=y
		CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
		CONFIG_VFP=y
		# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
		# CONFIG_SUSPEND is not set
		@@ -132,6 +140,7 @@ CONFIG_DMA_BCM2835=y
		CONFIG_STAGING=y
		CONFIG_SND_BCM2835=m
		CONFIG_VIDEO_BCM2835=m
		CONFIG_CLK_RASPBERRYPI=y
		CONFIG_MAILBOX=y
		CONFIG_BCM2835_MBOX=y
		# CONFIG_IOMMU_SUPPORT is not set

+2 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
		CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
		CONFIG_CPUFREQ_DT=y
		CONFIG_ARM_IMX6Q_CPUFREQ=y
		CONFIG_ARM_RASPBERRYPI_CPUFREQ=y
		CONFIG_QORIQ_CPUFREQ=y
		CONFIG_CPU_IDLE=y
		CONFIG_ARM_CPUIDLE=y
		@@ -902,6 +903,7 @@ CONFIG_STAGING_BOARD=y
		CONFIG_COMMON_CLK_MAX77686=y
		CONFIG_COMMON_CLK_RK808=m
		CONFIG_COMMON_CLK_S2MPS11=m
		CONFIG_CLK_RASPBERRYPI=y
		CONFIG_COMMON_CLK_QCOM=y
		CONFIG_QCOM_CLK_RPM=y
		CONFIG_APQ_MMCC_8084=y