Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37267675 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'sunxi-defconfig-for-4.1' of... 

Merge tag 'sunxi-defconfig-for-4.1' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux into next/defconfig

Merge "Allwinner defconfig changes for 4.1" from Maxime Ripard:

Nothing really standing out here, just a few options to enable in the defconfigs

* tag 'sunxi-defconfig-for-4.1' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux

:
  ARM: sunxi_defconfig: increase the number of maximum number of CPUs to 8
  ARM: multi_v7_defconfig: Enable CONFIG_PHY_SUN9I_USB
  ARM: sunxi_defconfig: Enable CONFIG_PHY_SUN9I_USB

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents f28ae3ba a198d27c

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -550,6 +550,7 @@ CONFIG_PHY_MIPHY365X=y 
CONFIG_PHY_STIH41X_USB=y

CONFIG_PHY_STIH407_USB=y

CONFIG_PHY_SUN4I_USB=y

CONFIG_PHY_SUN9I_USB=y

CONFIG_EXT4_FS=y

CONFIG_AUTOFS4_FS=y

CONFIG_MSDOS_FS=y

arch/arm/configs/sunxi_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ CONFIG_BLK_DEV_INITRD=y 
CONFIG_PERF_EVENTS=y

CONFIG_ARCH_SUNXI=y

CONFIG_SMP=y

CONFIG_NR_CPUS=8

CONFIG_AEABI=y

CONFIG_HIGHMEM=y

CONFIG_HIGHPTE=y
@@ -106,6 +107,7 @@ CONFIG_RTC_DRV_SUN6I=y 
CONFIG_RTC_DRV_SUNXI=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_PHY_SUN4I_USB=y

CONFIG_PHY_SUN9I_USB=y

CONFIG_EXT4_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y