diff options
| author | Tom Rini <trini@konsulko.com> | 2018-07-13 09:05:05 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-07-13 14:47:04 -0400 |
| commit | 914bb7ea2f9373fa59285ff77a95df73848c8f66 (patch) | |
| tree | f27ecab47f71990f91fbe0daad932ab0c5fce726 /arch/arm/mach-socfpga/board.c | |
| parent | f2df46e5d9388987c2084a39f05f2ad32801b3b0 (diff) | |
| parent | aa529663368e97663d7ec16d6997cb69a2dd8afb (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
- Update SPDX tag in arch/arm/mach-socfpga/spl_a10.c
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'arch/arm/mach-socfpga/board.c')
| -rw-r--r-- | arch/arm/mach-socfpga/board.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c index 189e12a668..26d84be6e9 100644 --- a/arch/arm/mach-socfpga/board.c +++ b/arch/arm/mach-socfpga/board.c @@ -18,7 +18,20 @@ DECLARE_GLOBAL_DATA_PTR; -void s_init(void) {} +void s_init(void) { +#ifndef CONFIG_ARM64 + /* + * Preconfigure ACTLR, make sure Write Full Line of Zeroes is disabled. + * 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" + "isb\n" + "dsb\n" + ::"r"(0x0)); +#endif +} /* * Miscellaneous platform dependent initialisations |