diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-08-10 16:08:45 +0900 |
|---|---|---|
| committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2016-08-11 17:49:38 +0900 |
| commit | 7382d1782648e6e8e5be878e9b9a3cbfd1912001 (patch) | |
| tree | a533d5881cd38431d34ff0ed1dd5364253bd13e6 /arch | |
| parent | 95646e1d756151ce469d0d1eb6144b4ff050b843 (diff) | |
| download | u-boot-imx-7382d1782648e6e8e5be878e9b9a3cbfd1912001.zip u-boot-imx-7382d1782648e6e8e5be878e9b9a3cbfd1912001.tar.gz u-boot-imx-7382d1782648e6e8e5be878e9b9a3cbfd1912001.tar.bz2 | |
ARM: uniphier: move (and rename) CONFIG_UNIPHIER_L2CACHE_ON to Kconfig
Move this option to Kconfig, renaming it into CONFIG_CACHE_UNIPHIER.
The new option name makes sense enough, and the same as Linux has.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-uniphier/Kconfig | 7 | ||||
| -rw-r--r-- | arch/arm/mach-uniphier/arm32/cache-uniphier.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig index e39ced6..a558073 100644 --- a/arch/arm/mach-uniphier/Kconfig +++ b/arch/arm/mach-uniphier/Kconfig @@ -70,6 +70,13 @@ config ARCH_UNIPHIER_LD6B depends on ARCH_UNIPHIER_PRO5_PXS2_LD6B default y +config CACHE_UNIPHIER + bool "Enable the UniPhier L2 cache controller" + depends on ARCH_UNIPHIER_32BIT + default y + help + This option allows to use the UniPhier System Cache as L2 cache. + config MICRO_SUPPORT_CARD bool "Use Micro Support Card" help diff --git a/arch/arm/mach-uniphier/arm32/cache-uniphier.c b/arch/arm/mach-uniphier/arm32/cache-uniphier.c index 77a0b78..da9488e 100644 --- a/arch/arm/mach-uniphier/arm32/cache-uniphier.c +++ b/arch/arm/mach-uniphier/arm32/cache-uniphier.c @@ -206,7 +206,7 @@ void uniphier_cache_disable(void) uniphier_cache_endisable(0); } -#ifdef CONFIG_UNIPHIER_L2CACHE_ON +#ifdef CONFIG_CACHE_UNIPHIER void v7_outer_cache_flush_all(void) { uniphier_cache_maint_all(UNIPHIER_SSCOQM_CM_FLUSH); |