diff options
| author | Jon Mayo <jmayo@nvidia.com> | 2010-11-02 13:48:41 -0700 |
|---|---|---|
| committer | Niket Sirsi <nsirsi@nvidia.com> | 2010-11-04 09:52:33 -0800 |
| commit | 9ab8a403297057ad72054563da39825c8a7d3ad7 (patch) | |
| tree | 15aedc54cc58c73ce596d3bdb5adfe4526edf2d2 /arch/arm | |
| parent | a7e991c39be9ae27bce0ec8c96235c1863ebb9b4 (diff) | |
[arm/tegra] enable SWP/SWPB emulation
enable SWP emulation for 5 defconfigs.
Bug 753223
Change-Id: I92137877cc50b6648541d6b6cd685fe670d7104b
Reviewed-on: http://git-master/r/10092
Reviewed-by: Jonathan Mayo <jmayo@nvidia.com>
Tested-by: Jonathan Mayo <jmayo@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>
Diffstat (limited to 'arch/arm')
5 files changed, 14 insertions, 6 deletions
diff --git a/arch/arm/configs/tegra_harmony_android_defconfig b/arch/arm/configs/tegra_harmony_android_defconfig index 7b8874321e96..e4d7afbb8689 100755 --- a/arch/arm/configs/tegra_harmony_android_defconfig +++ b/arch/arm/configs/tegra_harmony_android_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.9 -# Thu Oct 28 11:00:46 2010 +# Tue Nov 2 13:24:28 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -212,6 +212,7 @@ CONFIG_MACH_TEGRA_GENERIC=y CONFIG_MACH_HARMONY=y CONFIG_MACH_VENTANA=y CONFIG_TEGRA_ODM_KIT=y +CONFIG_ARM_ERRATA_742230=y CONFIG_TEGRA_DEBUG_UART_NONE=y # CONFIG_TEGRA_DEBUG_UARTA is not set # CONFIG_TEGRA_DEBUG_UARTB is not set @@ -261,6 +262,7 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_ARM_THUMB=y # CONFIG_ARM_THUMBEE is not set +CONFIG_SWP_EMULATE=y # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set @@ -2154,7 +2156,8 @@ CONFIG_KEYS=y # CONFIG_SECURITY_FILE_CAPABILITIES is not set CONFIG_CRYPTO=y -## Crypto core or helper +# +# Crypto core or helper # CONFIG_CRYPTO_FIPS=y CONFIG_CRYPTO_ALGAPI=y diff --git a/arch/arm/configs/tegra_harmony_gnu_linux_defconfig b/arch/arm/configs/tegra_harmony_gnu_linux_defconfig index 9fc3392499b8..37ecba0b361c 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 -# Fri Oct 22 12:38:12 2010 +# Tue Nov 2 13:24:43 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -213,6 +213,7 @@ CONFIG_MACH_TEGRA_GENERIC=y CONFIG_MACH_HARMONY=y CONFIG_MACH_VENTANA=y CONFIG_TEGRA_ODM_KIT=y +CONFIG_ARM_ERRATA_742230=y CONFIG_TEGRA_DEBUG_UART_NONE=y # CONFIG_TEGRA_DEBUG_UARTA is not set # CONFIG_TEGRA_DEBUG_UARTB is not set @@ -260,6 +261,7 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_ARM_THUMB=y # CONFIG_ARM_THUMBEE is not set +CONFIG_SWP_EMULATE=y # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set diff --git a/arch/arm/configs/tegra_ventana_android_defconfig b/arch/arm/configs/tegra_ventana_android_defconfig index ff339a6f3799..a7212d138d07 100755 --- a/arch/arm/configs/tegra_ventana_android_defconfig +++ b/arch/arm/configs/tegra_ventana_android_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.9 -# Tue Oct 19 16:21:04 2010 +# Tue Nov 2 13:24:38 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -260,6 +260,7 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_ARM_THUMB=y # CONFIG_ARM_THUMBEE is not set +CONFIG_SWP_EMULATE=y # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set diff --git a/arch/arm/configs/tegra_whistler_android_defconfig b/arch/arm/configs/tegra_whistler_android_defconfig index 6b16cb0fb5ea..093f539b1d1c 100755 --- a/arch/arm/configs/tegra_whistler_android_defconfig +++ b/arch/arm/configs/tegra_whistler_android_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.9 -# Thu Oct 28 13:09:24 2010 +# Tue Nov 2 13:24:47 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -261,6 +261,7 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_ARM_THUMB=y # CONFIG_ARM_THUMBEE is not set +CONFIG_SWP_EMULATE=y # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set diff --git a/arch/arm/configs/tegra_whistler_gnu_linux_defconfig b/arch/arm/configs/tegra_whistler_gnu_linux_defconfig index f849c48eb307..0dbcf2ffe6ff 100644 --- a/arch/arm/configs/tegra_whistler_gnu_linux_defconfig +++ b/arch/arm/configs/tegra_whistler_gnu_linux_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32.9 -# Wed Aug 18 15:15:15 2010 +# Tue Nov 2 13:24:33 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -257,6 +257,7 @@ CONFIG_CPU_CP15_MMU=y # CONFIG_ARM_THUMB=y CONFIG_ARM_THUMBEE=y +CONFIG_SWP_EMULATE=y # CONFIG_CPU_ICACHE_DISABLE is not set # CONFIG_CPU_DCACHE_DISABLE is not set # CONFIG_CPU_BPREDICT_DISABLE is not set |