From 7382d1782648e6e8e5be878e9b9a3cbfd1912001 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Wed, 10 Aug 2016 16:08:45 +0900 Subject: 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 --- include/configs/uniphier.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include') diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index e485583..2606e53 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -27,9 +27,6 @@ #define CONFIG_SYS_CACHELINE_SIZE 32 -/* Comment out the following to disable L2 cache */ -#define CONFIG_UNIPHIER_L2CACHE_ON - #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_MISC_INIT_F -- cgit v1.1 From 8fca073271706f3d856c6554c2b5400ac9c83c10 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Wed, 10 Aug 2016 16:08:46 +0900 Subject: ARM: uniphier: fix CONFIG_SYS_CACHELINE_SIZE when outer cache is on The UniPhier outer cache (L2 cache on ARMv7 SoCs) has 128 byte line length and its tags are also managed per 128 byte line. Signed-off-by: Masahiro Yamada --- include/configs/uniphier.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include') diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 2606e53..9ee125f 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -25,7 +25,11 @@ /* #define CONFIG_SYS_ICACHE_OFF */ /* #define CONFIG_SYS_DCACHE_OFF */ +#ifdef CONFIG_CACHE_UNIPHIER +#define CONFIG_SYS_CACHELINE_SIZE 128 +#else #define CONFIG_SYS_CACHELINE_SIZE 32 +#endif #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -- cgit v1.1 From e8a9293295a1a54f6e43970bed2d3bfd124be02c Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Wed, 10 Aug 2016 16:08:49 +0900 Subject: ARM: uniphier: add PSCI support for UniPhier ARMv7 SoCs Currently, only the CPU_ON function is supported. Signed-off-by: Masahiro Yamada --- include/configs/uniphier.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 9ee125f..950c535 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -1,5 +1,7 @@ /* - * Copyright (C) 2012-2015 Masahiro Yamada + * Copyright (C) 2012-2015 Panasonic Corporation + * Copyright (C) 2015-2016 Socionext Inc. + * Author: Masahiro Yamada * * SPDX-License-Identifier: GPL-2.0+ */ @@ -9,6 +11,9 @@ #ifndef __CONFIG_UNIPHIER_COMMON_H__ #define __CONFIG_UNIPHIER_COMMON_H__ +#define CONFIG_ARMV7_PSCI +#define CONFIG_ARMV7_PSCI_NR_CPUS 4 + #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 #define CONFIG_SMC911X -- cgit v1.1