Commit d47ebd68 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC defconfig updates from Arnd Bergmann:
 "As usual, a bunch of commits, mostly adding drivers and other options
  to defconfigs after the code was merged through another tree"

* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (32 commits)
  arm64: defconfig: Enable Qualcomm QUSB2 PHY
  arm64: defconfig: Enable the EFI Framebuffer
  arm64: defconfig: Enable Qualcomm GENI based I2C controller
  ARM: multi_v7_defconfig: Make MAX77802 regulator driver built-in
  arm64: defconfig: Enable CPU clock drivers for Qualcomm msm8916
  arm64: defconfig: Add DRM_MSM to defconfigs with ARCH_QCOM
  ARM: multi_v7_defconfig: Add DRM_MSM to defconfigs with ARCH_QCOM
  ARM: qcom_defconfig: Add DRM_MSM to defconfigs with ARCH_QCOM
  ARM: configs: aspeed_g5: Enable AST2600
  ARM: configs: multi_v7: Add ASPEED G6
  arm64: defconfig: Enable SM8150 GCC and pinctrl driver
  arm64: defconfig: Enable CONFIG_ACPI_APEI_PCIEAER
  arm64: defconfig: Enable the DesignWare watchdog
  ARM: multi_v7_defconfig: Enable SPI_STM32_QSPI support
  ARM: imx_v6_v7_defconfig: Enable the PSCI CPUidle driver
  arm64: defconfig: Enable the PSCI CPUidle driver
  arm64: defconfig: Enable Sun4i SPDIF module
  ARM: exynos_defconfig: Enable AHCI-platform SATA driver
  arm64: defconfig: CONFIG_DRM_ETNAVIV=m
  ARM: imx_v6_v7_defconfig: Select the OV5645 camera driver
  ...
parents 399eb9b6 adce1767

arch/arm/configs/aspeed_g4_defconfig

+21 −29
Original line number Diff line number Diff line
@@ -20,20 +20,11 @@ CONFIG_PERF_EVENTS=y 
# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

CONFIG_SLAB_FREELIST_RANDOM=y

CONFIG_JUMP_LABEL=y

CONFIG_STRICT_KERNEL_RWX=y

CONFIG_GCC_PLUGINS=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEBUG_FS is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_MQ_IOSCHED_DEADLINE is not set

# CONFIG_MQ_IOSCHED_KYBER is not set

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_ASPEED=y

CONFIG_MACH_ASPEED_G4=y

CONFIG_VMSPLIT_2G=y

CONFIG_AEABI=y

# CONFIG_COMPACTION is not set

CONFIG_UACCESS_WITH_MEMCPY=y

CONFIG_SECCOMP=y

# CONFIG_ATAGS is not set
@@ -42,7 +33,15 @@ CONFIG_ZBOOT_ROM_BSS=0x0 
CONFIG_ARM_APPENDED_DTB=y

CONFIG_ARM_ATAG_DTB_COMPAT=y

CONFIG_KEXEC=y

CONFIG_FIRMWARE_MEMMAP=y

CONFIG_JUMP_LABEL=y

CONFIG_STRICT_KERNEL_RWX=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEBUG_FS is not set

# CONFIG_MQ_IOSCHED_DEADLINE is not set

# CONFIG_MQ_IOSCHED_KYBER is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_COMPACTION is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET_DIAG=y
@@ -51,18 +50,11 @@ CONFIG_UNIX_DIAG=y 
CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_SYN_COOKIES=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_DIAG is not set

# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET6_XFRM_MODE_TUNNEL is not set

# CONFIG_INET6_XFRM_MODE_BEET is not set

CONFIG_NETFILTER=y

# CONFIG_NETFILTER_ADVANCED is not set

CONFIG_VLAN_8021Q=y

CONFIG_NET_NCSI=y

CONFIG_BPF_STREAM_PARSER=y

# CONFIG_WIRELESS is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -140,7 +132,6 @@ CONFIG_ASPEED_BT_IPMI_BMC=y 
CONFIG_HW_RANDOM_TIMERIOMEM=y

# CONFIG_I2C_COMPAT is not set

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_MUX=y

CONFIG_I2C_MUX_PCA9541=y

CONFIG_I2C_MUX_PCA954x=y

CONFIG_I2C_ASPEED=y
@@ -204,6 +195,7 @@ CONFIG_LEDS_TRIGGERS=y 
CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_LEDS_TRIGGER_DEFAULT_ON=y

CONFIG_EDAC=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_DS1307=y

CONFIG_RTC_DRV_PCF8523=y
@@ -218,13 +210,13 @@ CONFIG_IIO=y 
CONFIG_ASPEED_ADC=y

CONFIG_MAX1363=y

CONFIG_BMP280=y

CONFIG_RAS=y

CONFIG_FSI=y

CONFIG_FSI_MASTER_GPIO=y

CONFIG_FSI_MASTER_HUB=y

CONFIG_FSI_MASTER_AST_CF=y

CONFIG_FSI_SCOM=y

CONFIG_FSI_SBEFIFO=y

CONFIG_FIRMWARE_MEMMAP=y

CONFIG_FANOTIFY=y

CONFIG_OVERLAY_FS=y

CONFIG_TMPFS=y
@@ -237,6 +229,17 @@ CONFIG_SQUASHFS=y 
CONFIG_SQUASHFS_XZ=y

CONFIG_SQUASHFS_ZSTD=y

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

# CONFIG_CRYPTO_ECHAINIV is not set

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_USER_API_HASH=y

# CONFIG_CRYPTO_HW is not set

# CONFIG_XZ_DEC_X86 is not set

# CONFIG_XZ_DEC_POWERPC is not set

# CONFIG_XZ_DEC_IA64 is not set

# CONFIG_XZ_DEC_SPARC is not set

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y
@@ -255,14 +258,3 @@ CONFIG_FUNCTION_TRACER=y 
# CONFIG_RUNTIME_TESTING_MENU is not set

CONFIG_DEBUG_WX=y

CONFIG_DEBUG_USER=y
 
CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

# CONFIG_CRYPTO_ECHAINIV is not set

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_USER_API_HASH=y

# CONFIG_CRYPTO_HW is not set

# CONFIG_XZ_DEC_X86 is not set

# CONFIG_XZ_DEC_POWERPC is not set

# CONFIG_XZ_DEC_IA64 is not set

# CONFIG_XZ_DEC_SPARC is not set

arch/arm/configs/aspeed_g5_defconfig

+38 −30
Original line number Diff line number Diff line
@@ -20,29 +20,33 @@ CONFIG_PERF_EVENTS=y 
# CONFIG_COMPAT_BRK is not set

CONFIG_SLAB=y

CONFIG_SLAB_FREELIST_RANDOM=y

CONFIG_JUMP_LABEL=y

CONFIG_STRICT_KERNEL_RWX=y

CONFIG_GCC_PLUGINS=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEBUG_FS is not set

# CONFIG_IOSCHED_DEADLINE is not set

# CONFIG_MQ_IOSCHED_DEADLINE is not set

# CONFIG_MQ_IOSCHED_KYBER is not set

CONFIG_ARCH_MULTI_V6=y

# CONFIG_ARCH_MULTI_V7 is not set

CONFIG_ARCH_ASPEED=y

CONFIG_MACH_ASPEED_G5=y

CONFIG_MACH_ASPEED_G6=y

# CONFIG_CACHE_L2X0 is not set

CONFIG_SMP=y

# CONFIG_ARM_CPU_TOPOLOGY is not set

CONFIG_VMSPLIT_2G=y

# CONFIG_COMPACTION is not set

CONFIG_NR_CPUS=2

CONFIG_HIGHMEM=y

CONFIG_UACCESS_WITH_MEMCPY=y

CONFIG_SECCOMP=y

# CONFIG_ATAGS is not set

CONFIG_ZBOOT_ROM_TEXT=0x0

CONFIG_ZBOOT_ROM_BSS=0x0

CONFIG_KEXEC=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_KERNEL_MODE_NEON=y

CONFIG_FIRMWARE_MEMMAP=y

CONFIG_JUMP_LABEL=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEBUG_FS is not set

# CONFIG_MQ_IOSCHED_DEADLINE is not set

# CONFIG_MQ_IOSCHED_KYBER is not set

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_SUSPEND is not set

# CONFIG_COMPACTION is not set

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_PACKET_DIAG=y
@@ -50,19 +54,20 @@ CONFIG_UNIX=y 
CONFIG_UNIX_DIAG=y

CONFIG_INET=y

CONFIG_IP_MULTICAST=y

CONFIG_IP_ADVANCED_ROUTER=y

CONFIG_IP_MULTIPLE_TABLES=y

CONFIG_IP_ROUTE_MULTIPATH=y

CONFIG_IP_ROUTE_VERBOSE=y

CONFIG_SYN_COOKIES=y

# CONFIG_INET_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET_XFRM_MODE_TUNNEL is not set

# CONFIG_INET_XFRM_MODE_BEET is not set

# CONFIG_INET_DIAG is not set

# CONFIG_INET6_XFRM_MODE_TRANSPORT is not set

# CONFIG_INET6_XFRM_MODE_TUNNEL is not set

# CONFIG_INET6_XFRM_MODE_BEET is not set

CONFIG_IPV6_ROUTER_PREF=y

CONFIG_IPV6_ROUTE_INFO=y

CONFIG_IPV6_OPTIMISTIC_DAD=y

CONFIG_IPV6_MULTIPLE_TABLES=y

CONFIG_NETFILTER=y

# CONFIG_NETFILTER_ADVANCED is not set

CONFIG_VLAN_8021Q=y

CONFIG_NET_NCSI=y

CONFIG_BPF_STREAM_PARSER=y

# CONFIG_WIRELESS is not set

CONFIG_DEVTMPFS=y

CONFIG_DEVTMPFS_MOUNT=y
@@ -145,6 +150,7 @@ CONFIG_I2C_MUX_PCA9541=y 
CONFIG_I2C_MUX_PCA954x=y

CONFIG_I2C_ASPEED=y

CONFIG_I2C_FSI=y

CONFIG_SPI=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_ASPEED=y
@@ -195,6 +201,10 @@ CONFIG_USB_CONFIGFS_F_LB_SS=y 
CONFIG_USB_CONFIGFS_F_FS=y

CONFIG_USB_CONFIGFS_F_HID=y

CONFIG_USB_CONFIGFS_F_PRINTER=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_OF_ASPEED=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_CLASS_FLASH=y
@@ -228,7 +238,6 @@ CONFIG_FSI_MASTER_HUB=y 
CONFIG_FSI_MASTER_AST_CF=y

CONFIG_FSI_SCOM=y

CONFIG_FSI_SBEFIFO=y

CONFIG_FIRMWARE_MEMMAP=y

CONFIG_FANOTIFY=y

CONFIG_OVERLAY_FS=y

CONFIG_TMPFS=y
@@ -241,6 +250,16 @@ CONFIG_SQUASHFS=y 
CONFIG_SQUASHFS_XZ=y

CONFIG_SQUASHFS_ZSTD=y

# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_USER_API_HASH=y

# CONFIG_CRYPTO_HW is not set

# CONFIG_XZ_DEC_X86 is not set

# CONFIG_XZ_DEC_POWERPC is not set

# CONFIG_XZ_DEC_IA64 is not set

# CONFIG_XZ_DEC_SPARC is not set

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y
@@ -259,14 +278,3 @@ CONFIG_FUNCTION_TRACER=y 
# CONFIG_RUNTIME_TESTING_MENU is not set

CONFIG_DEBUG_WX=y

CONFIG_DEBUG_USER=y
 
CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

# CONFIG_CRYPTO_ECHAINIV is not set

CONFIG_CRYPTO_HMAC=y

CONFIG_CRYPTO_SHA256=y

CONFIG_CRYPTO_USER_API_HASH=y

# CONFIG_CRYPTO_HW is not set

# CONFIG_XZ_DEC_X86 is not set

# CONFIG_XZ_DEC_POWERPC is not set

# CONFIG_XZ_DEC_IA64 is not set

# CONFIG_XZ_DEC_SPARC is not set

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

arch/arm/configs/exynos_defconfig

+4 −1
Original line number Diff line number Diff line
@@ -92,9 +92,12 @@ CONFIG_BLK_DEV_LOOP=y 
CONFIG_BLK_DEV_CRYPTOLOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=8192

CONFIG_SCSI=y

CONFIG_BLK_DEV_SD=y

CONFIG_CHR_DEV_SG=y

CONFIG_ATA=y

# CONFIG_SATA_PMP is not set

CONFIG_SATA_AHCI_PLATFORM=y

# CONFIG_ATA_SFF is not set

CONFIG_MD=y

CONFIG_BLK_DEV_DM=y

CONFIG_DM_CRYPT=m

arch/arm/configs/imx_v6_v7_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ CONFIG_ARM_IMX6Q_CPUFREQ=y 
CONFIG_ARM_IMX_CPUFREQ_DT=y

CONFIG_CPU_IDLE=y

CONFIG_ARM_CPUIDLE=y

CONFIG_ARM_PSCI_CPUIDLE=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_PM_DEBUG=y
@@ -272,6 +273,7 @@ CONFIG_VIDEO_IMX_PXP=y 
CONFIG_VIDEO_ADV7180=m

CONFIG_VIDEO_OV2680=m

CONFIG_VIDEO_OV5640=m

CONFIG_VIDEO_OV5645=m

CONFIG_IMX_IPUV3_CORE=y

CONFIG_DRM=y

CONFIG_DRM_PANEL_LVDS=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE