diff options
| author | Winnie Hsu <whsu@nvidia.com> | 2010-06-24 15:52:34 -0700 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-06-24 16:19:31 -0700 |
| commit | ee67352b7aeeb33bacac631526063cc79cd2e0cf (patch) | |
| tree | a064eda63a0b41ada2811e0ecb20309aa85aedee /arch | |
| parent | 23f2db9ffde83dfc8014f552dd6f08dbc10a0048 (diff) | |
[arm] harmony: Enable DMABOUNCE (EHCI) and MMU_UNSAFE_RESUME in gnu_linux configuration.
Added DMA support for EHCI controller, and re-enable the MMU_UNSAFE_RESUME flag.
Change-Id: Icae0a9769a6ddd0b8ab3a970484c2a8d39caa042
Reviewed-on: http://git-master.nvidia.com/r/3166
Tested-by: Winnie Hsu <whsu@nvidia.com>
Reviewed-by: Gary King <gking@nvidia.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/tegra_harmony_gnu_linux_defconfig | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig index 2f49d067583d..ffa2248df252 100644 --- a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig +++ b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.9 -# Mon Jun 21 15:08:22 2010 +# Thu Jun 24 15:22:58 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -21,6 +21,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CPUFREQ=y CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ZONE_DMA=y CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_ARCH_PROVIDES_UDELAY=y CONFIG_VECTORS_BASE=0xffff0000 @@ -269,6 +270,7 @@ CONFIG_TEGRA_ERRATA_657451=y # CONFIG_ARM_ERRATA_458693 is not set # CONFIG_ARM_ERRATA_460075 is not set CONFIG_ARM_GIC=y +CONFIG_DMABOUNCE=y CONFIG_COMMON_CLKDEV=y # @@ -320,7 +322,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y CONFIG_PAGEFLAGS_EXTENDED=y CONFIG_SPLIT_PTLOCK_CPUS=4 # CONFIG_PHYS_ADDR_T_64BIT is not set -CONFIG_ZONE_DMA_FLAG=0 +CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_HAVE_MLOCK=y @@ -1491,7 +1493,7 @@ CONFIG_USB_TEGRA_OTG=y CONFIG_MMC=y # CONFIG_EMBEDDED_MMC_START_OFFSET is not set # CONFIG_MMC_DEBUG is not set -# CONFIG_MMC_UNSAFE_RESUME is not set +CONFIG_MMC_UNSAFE_RESUME=y # CONFIG_MMC_EMBEDDED_SDIO is not set # CONFIG_MMC_PARANOID_SD_INIT is not set |