diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 23:06:35 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-07-11 23:06:35 +0200 |
| commit | 8600fb68cfa8f89e23cf872efb87fec641cc747d (patch) | |
| tree | 60ec7cbf9f2f09fd97f1895cc4b3854414fe1db9 /arch/arm/configs | |
| parent | 8533bae35becc0b18dc5a6c59ead36dee57cfb47 (diff) | |
| parent | 70523b4e57cb6eeb1da7c8ebf19df855221825ad (diff) | |
Merge branch 'renesas-armadillo' into renesas-board
* renesas-armadillo:
ARM: mach-shmobile: armadillo800eva: defconfig Allow use of armhf userspace
ARM: shmobile: armadillo800eva: A3SP domain includes USB
ARM: shmobile: armadillo800eva: A4LC domain includes LCDC
ARM: shmobile: armadillo800eva: USB Func enables external IRQ mode
ARM: mach-shmobile: add fixed voltage regulators to armadillo800eva
ARM: shmobile: use common extra gpio functions on armadillo800eva
ARM: shmobile: armadillo800eva: enable DMAEngine on USB
ARM: shmobile: armadillo800eva: enable DMAEngine on SDHI
ARM: shmobile: armadillo800eva: enable DMAEngine on FSI
ARM: shmobile: armadillo800eva: enable FSI-HDMI sound
ARM: shmobile: armadillo800eva: enable FSI-WM8978 sound
Conflicts:
arch/arm/mach-shmobile/Kconfig
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/armadillo800eva_defconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index df1ce543cd7..7d8718468e0 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig @@ -18,7 +18,7 @@ CONFIG_ARCH_SHMOBILE=y CONFIG_ARCH_R8A7740=y CONFIG_MACH_ARMADILLO800EVA=y # CONFIG_SH_TIMER_TMU is not set -# CONFIG_ARM_THUMB is not set +CONFIG_ARM_THUMB=y CONFIG_CPU_BPREDICT_DISABLE=y # CONFIG_CACHE_L2X0 is not set CONFIG_ARM_ERRATA_430973=y @@ -36,6 +36,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096" CONFIG_CMDLINE_FORCE=y CONFIG_KEXEC=y +CONFIG_VFP=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set # CONFIG_SUSPEND is not set CONFIG_NET=y @@ -119,6 +120,8 @@ CONFIG_USB_ETH=m CONFIG_MMC=y CONFIG_MMC_SDHI=y CONFIG_MMC_SH_MMCIF=y +CONFIG_DMADEVICES=y +CONFIG_SH_DMAE=y CONFIG_UIO=y CONFIG_UIO_PDRV_GENIRQ=y # CONFIG_DNOTIFY is not set |