diff options
| author | Tom Rini <trini@konsulko.com> | 2016-08-11 10:45:53 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-08-11 10:45:53 -0400 |
| commit | 28cd88baa3f11cdb52be3b6d0610dcf32c60871a (patch) | |
| tree | 4d6150effe763b043c7e30499c8ec2061df81be1 /include | |
| parent | 2f1eb66e2881a780e622e7fd50b3a497677fd373 (diff) | |
| parent | e8a9293295a1a54f6e43970bed2d3bfd124be02c (diff) | |
| download | u-boot-28cd88baa3f11cdb52be3b6d0610dcf32c60871a.tar.gz u-boot-28cd88baa3f11cdb52be3b6d0610dcf32c60871a.tar.xz u-boot-28cd88baa3f11cdb52be3b6d0610dcf32c60871a.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/uniphier.h | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index e485583f21..950c5353d2 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -1,5 +1,7 @@ /* - * Copyright (C) 2012-2015 Masahiro Yamada <yamada.masahiro@socionext.com> + * Copyright (C) 2012-2015 Panasonic Corporation + * Copyright (C) 2015-2016 Socionext Inc. + * Author: Masahiro Yamada <yamada.masahiro@socionext.com> * * 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 @@ -25,10 +30,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 - -/* Comment out the following to disable L2 cache */ -#define CONFIG_UNIPHIER_L2CACHE_ON +#endif #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO |