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

Commit 0e83c71c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'prima2-defconfig-for-4.2' of... 

Merge tag 'prima2-defconfig-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/defconfig

Merge "CSR prima2_defconfig fixes for 4.2" from Barry Song:

enable SiRFSoC device drivers in CSR prima2_defconfig

make savedefconfig at first, then enable
1. sdhci driver
2. onkey
3. rtc
4. hwspinlock
for prima2_defconfig

* tag 'prima2-defconfig-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux

:
  ARM: prima2_defconfig: enable build for hwspinlock
  ARM: prima2_defconfig: enable build for RTC
  ARM: prima2_defconfig: enable build for misc input
  ARM: prima2_defconfig: enable build for SiRFSoC SDHC host
  ARM: prima2_defconfig: fix the outdated defconfig

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 97de17fd 764c2225

arch/arm/configs/prima2_defconfig

+7 −5
Original line number Diff line number Diff line 
CONFIG_EXPERIMENTAL=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_RELAY=y
@@ -11,14 +10,12 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_BSD_DISKLABEL=y

CONFIG_SOLARIS_X86_PARTITION=y

CONFIG_ARCH_SIRF=y

# CONFIG_SWP_EMULATE is not set

CONFIG_SMP=y

CONFIG_SCHED_MC=y

CONFIG_PREEMPT=y

CONFIG_AEABI=y

CONFIG_KEXEC=y

CONFIG_BINFMT_MISC=y

CONFIG_PM=y

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y
@@ -29,6 +26,7 @@ CONFIG_CHR_DEV_SG=y 
CONFIG_INPUT_EVDEV=y

# CONFIG_INPUT_MOUSE is not set

CONFIG_INPUT_TOUCHSCREEN=y

CONFIG_INPUT_MISC=y

CONFIG_SERIAL_SIRFSOC=y

CONFIG_SERIAL_SIRFSOC_CONSOLE=y

CONFIG_HW_RANDOM=y
@@ -45,10 +43,14 @@ CONFIG_USB_MASS_STORAGE=m 
CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_MMC_SDHCI_SIRF=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_SIRFSOC=y

CONFIG_DMADEVICES=y

CONFIG_DMADEVICES_DEBUG=y

CONFIG_DMADEVICES_VDEBUG=y

CONFIG_SIRF_DMA=y

CONFIG_HWSPINLOCK_SIRF=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_MSDOS_FS=y
@@ -60,12 +62,12 @@ CONFIG_ROMFS_FS=y 
CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ASCII=y

CONFIG_NLS_ISO8859_1=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_SECTION_MISMATCH=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

# CONFIG_DEBUG_PREEMPT is not set

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_SPINLOCK=y

CONFIG_DEBUG_MUTEXES=y

CONFIG_DEBUG_INFO=y

CONFIG_CRC_CCITT=y