Commit 1b4fcb85 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'ux500-defconfig-for-arm-soc' of... 

Merge tag 'ux500-defconfig-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes

From Linus Walleij:
Ux500 defconfig changes:
- Update base due to different Kconfig changes
- Select watchdog, MUSB, Ux500 ALSA SoC, various MMC/SD
  features and enable highmem

* tag 'ux500-defconfig-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson

:
  ARM: ux500: Enable HIGHMEM in the u8500 defconfig
  ARM: ux500: Update MMC configs for u8500 defconfig
  ARM: ux500: select SND_SOC_UX500 for ux500
  ARM: ux500: update defconfig base
  ARM: ux500: select WATCHDOG and MUSB for ux500

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 1157d73d cbe89331

arch/arm/configs/u8500_defconfig

+25 −19
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_HIGHMEM=y

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_BLK_DEV_INITRD=y

CONFIG_KALLSYMS_ALL=y

CONFIG_MODULES=y
@@ -9,10 +11,7 @@ CONFIG_MODULE_UNLOAD=y 
CONFIG_ARCH_U8500=y

CONFIG_MACH_HREFV60=y

CONFIG_MACH_SNOWBALL=y

CONFIG_MACH_U5500=y

CONFIG_MACH_UX500_DT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_SMP=y

CONFIG_NR_CPUS=2

CONFIG_PREEMPT=y
@@ -20,6 +19,7 @@ CONFIG_AEABI=y 
CONFIG_CMDLINE="root=/dev/ram0 console=ttyAMA2,115200n8"

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y

CONFIG_CPU_IDLE=y

CONFIG_VFP=y

CONFIG_NEON=y

CONFIG_PM_RUNTIME=y
@@ -36,7 +36,6 @@ CONFIG_CAIF=y 
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_RAM=y

CONFIG_BLK_DEV_RAM_SIZE=65536

CONFIG_AB8500_PWM=y

CONFIG_SENSORS_BH1780=y

CONFIG_NETDEVICES=y

CONFIG_SMSC911X=y
@@ -60,35 +59,39 @@ CONFIG_VT_HW_CONSOLE_BINDING=y 
CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_HW_RANDOM=y

CONFIG_HW_RANDOM_NOMADIK=y

CONFIG_SPI=y

CONFIG_SPI_PL022=y

CONFIG_GPIO_STMPE=y

CONFIG_GPIO_TC3589X=y

# CONFIG_POWER_SUPPLY is not set

# CONFIG_AB8500_BM is not set

# CONFIG_AB8500_BATTERY_THERM_ON_BATCTRL is not set

CONFIG_THERMAL=y

CONFIG_CPU_THERMAL=y

CONFIG_WATCHDOG=y

CONFIG_MFD_STMPE=y

CONFIG_MFD_TC3589X=y

CONFIG_AB5500_CORE=y

CONFIG_AB8500_CORE=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_AB8500=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_GPIO=y

# CONFIG_HID_SUPPORT is not set

CONFIG_USB_GADGET=y

CONFIG_REGULATOR_AB8500=y

CONFIG_SOUND=y

CONFIG_SND=y

CONFIG_SND_SOC=y

CONFIG_SND_SOC_UX500=y

CONFIG_SND_SOC_UX500_MACH_MOP500=y

CONFIG_USB=y

CONFIG_USB_MUSB_HDRC=y

CONFIG_USB_MUSB_UX500=y

CONFIG_USB_PHY=y

CONFIG_AB8500_USB=y

CONFIG_USB_GADGET=y

CONFIG_USB_GADGET_MUSB_HDRC=y

CONFIG_USB_ETH=m

CONFIG_MMC=y

CONFIG_MMC_CLKGATE=y

CONFIG_MMC_UNSAFE_RESUME=y

# CONFIG_MMC_BLOCK_BOUNCE is not set

CONFIG_MMC_ARMMMCI=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_LM3530=y

CONFIG_LEDS_LP5521=y

CONFIG_LEDS_GPIO=y

CONFIG_LEDS_LP5521=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_HEARTBEAT=y

CONFIG_RTC_CLASS=y
@@ -108,7 +111,6 @@ CONFIG_EXT4_FS=y 
CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_CONFIGFS_FS=m

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y
@@ -122,3 +124,7 @@ CONFIG_DEBUG_KERNEL=y 
CONFIG_DEBUG_INFO=y

# CONFIG_FTRACE is not set

CONFIG_DEBUG_USER=y

CONFIG_CRYPTO_DEV_UX500=y

CONFIG_CRYPTO_DEV_UX500_CRYP=y

CONFIG_CRYPTO_DEV_UX500_HASH=y

CONFIG_CRYPTO_DEV_UX500_DEBUG=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE