diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-09 01:15:41 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-09 01:15:41 +0300 |
| commit | 5939224ccdcc9244ab82cdbdc9d21eb019f7db6a (patch) | |
| tree | eb31ec5c63ae98da0a9cfb716130196f9db0b867 /arch/arm/configs/gemini_defconfig | |
| parent | eab3540562fb44f830e09492374fcc69a283ce47 (diff) | |
| parent | 1342a6aa4abf6a56e83ce24ce5e84243c365ab4d (diff) | |
| download | linux-5939224ccdcc9244ab82cdbdc9d21eb019f7db6a.tar.xz | |
Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC defconfig updates from Olof Johansson:
"We keep this in a separate branch to avoid cross-branch conflicts, but
most of the material here is fairly boring -- some new drivers turned
on for hardware since they were merged, and some refreshed files due
to time having moved a lot of entries around"
* tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (38 commits)
ARM: configs: at91: enable MMC_SDHCI_OF_AT91 and MICROCHIP_PIT64B
arm64: defconfig: Enable Broadcom's GENET Ethernet controller
ARM: multi_v7_defconfig: Enable devfreq thermal integration
ARM: exynos_defconfig: Enable devfreq thermal integration
ARM: multi_v7_defconfig: Enable NFS v4.1 and v4.2
ARM: exynos_defconfig: Enable NFS v4.1 and v4.2
arm64: defconfig: Enable Actions Semi specific drivers
arm64: defconfig: Enable Broadcom's STB PCIe controller
arm64: defconfig: Enable CONFIG_CLK_IMX8MP by default
ARM: configs: at91: enable config flags for sam9x60 SoC
ARM: configs: at91: use savedefconfig
arm64: defconfig: Enable tegra XUDC support
ARM: defconfig: gemini: Update defconfig
arm64: defconfig: enable CONFIG_ARM_QCOM_CPUFREQ_NVMEM
arm64: defconfig: enable CONFIG_QCOM_CPR
arm64: defconfig: Enable HFPLL
arm64: defconfig: Enable CRYPTO_DEV_FSL_CAAM
ARM: imx_v6_v7_defconfig: Select the TFP410 driver
ARM: imx_v6_v7_defconfig: Enable NFS_V4_1 and NFS_V4_2 support
arm64: defconfig: Enable ATH10K_SNOC
...
Diffstat (limited to 'arch/arm/configs/gemini_defconfig')
| -rw-r--r-- | arch/arm/configs/gemini_defconfig | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/arch/arm/configs/gemini_defconfig b/arch/arm/configs/gemini_defconfig index f012e81a2fe4..d2d5f1cf815f 100644 --- a/arch/arm/configs/gemini_defconfig +++ b/arch/arm/configs/gemini_defconfig @@ -2,28 +2,36 @@ CONFIG_SYSVIPC=y CONFIG_NO_HZ_IDLE=y CONFIG_HIGH_RES_TIMERS=y +CONFIG_PREEMPT=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_USER_NS=y CONFIG_RELAY=y CONFIG_BLK_DEV_INITRD=y -CONFIG_PARTITION_ADVANCED=y CONFIG_ARCH_MULTI_V4=y # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_GEMINI=y -CONFIG_PCI=y -CONFIG_PREEMPT=y CONFIG_AEABI=y CONFIG_HIGHMEM=y -CONFIG_CMA=y CONFIG_CMDLINE="console=ttyS0,115200n8" CONFIG_KEXEC=y -CONFIG_BINFMT_MISC=y CONFIG_PM=y +CONFIG_PARTITION_ADVANCED=y +CONFIG_BINFMT_MISC=y +CONFIG_CMA=y CONFIG_NET=y CONFIG_UNIX=y CONFIG_INET=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_VLAN_FILTERING=y +CONFIG_NET_DSA=y +CONFIG_VLAN_8021Q=y +CONFIG_CFG80211=y +CONFIG_CFG80211_WEXT=y +CONFIG_MAC80211=y +CONFIG_PCI=y CONFIG_DEVTMPFS=y CONFIG_MTD=y +CONFIG_MTD_REDBOOT_PARTS=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y CONFIG_MTD_JEDECPROBE=y @@ -40,10 +48,12 @@ CONFIG_BLK_DEV_SD=y CONFIG_ATA=y CONFIG_PATA_FTIDE010=y CONFIG_NETDEVICES=y +CONFIG_TUN=y +CONFIG_NET_DSA_REALTEK_SMI=y CONFIG_GEMINI_ETHERNET=y CONFIG_MDIO_BITBANG=y CONFIG_MDIO_GPIO=y -CONFIG_REALTEK_PHY=y +CONFIG_MARVELL_PHY=y CONFIG_INPUT_EVDEV=y CONFIG_KEYBOARD_GPIO=y # CONFIG_INPUT_MOUSE is not set @@ -69,7 +79,9 @@ CONFIG_DRM_TVE200=y CONFIG_LOGO=y CONFIG_USB=y CONFIG_USB_MON=y +CONFIG_USB_EHCI_HCD=y CONFIG_USB_FOTG210_HCD=y +CONFIG_USB_UHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y |