summaryrefslogtreecommitdiff
path: root/arch/arm/mach-socfpga/board.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-07-26 11:43:26 -0400
committerTom Rini <trini@konsulko.com>2018-07-26 11:43:26 -0400
commitff6bef48529b8c49cad74371cfaa3b2175146c30 (patch)
tree5e9338d60a34587929d72abdea65eb8b60bd63d9 /arch/arm/mach-socfpga/board.c
parentde4b4ef36ff61840eeb7d17be3bc9a4181c243f7 (diff)
parent64eeb1585428b71e29022e22d1aae86b65b9e052 (diff)
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'arch/arm/mach-socfpga/board.c')
-rw-r--r--arch/arm/mach-socfpga/board.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c
index 26d84be6e96..e8c7503fba1 100644
--- a/arch/arm/mach-socfpga/board.c
+++ b/arch/arm/mach-socfpga/board.c
@@ -21,12 +21,14 @@ DECLARE_GLOBAL_DATA_PTR;
void s_init(void) {
#ifndef CONFIG_ARM64
/*
- * Preconfigure ACTLR, make sure Write Full Line of Zeroes is disabled.
+ * Preconfigure ACTLR and CPACR, make sure Write Full Line of Zeroes
+ * is disabled in ACTLR.
* This is optional on CycloneV / ArriaV.
* This is mandatory on Arria10, otherwise Linux refuses to boot.
*/
asm volatile(
"mcr p15, 0, %0, c1, c0, 1\n"
+ "mcr p15, 0, %0, c1, c0, 2\n"
"isb\n"
"dsb\n"
::"r"(0x0));