diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-07 09:02:28 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-07 09:02:28 -0400 |
| commit | 69bf66ad8c0d53cc5e64d0f4f2e3bc9ad18e61aa (patch) | |
| tree | b89bafeea8ed15b1403edf892964adaa5003255d /arch/arm | |
| parent | 1259567ae3cd4c84acb9db6ab1fadcdcd26968a9 (diff) | |
| parent | 5168d7a6264be30f82c1c074e43c24fcacbb4283 (diff) | |
Merge branch '2020-05-06-master-imports'
- ARM Juno updates
- Assorted bugfixes
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 11 | ||||
| -rw-r--r-- | arch/arm/lib/cache.c | 13 |
2 files changed, 21 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b494bcae95..0d463088a2 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1162,6 +1162,17 @@ config TARGET_VEXPRESS64_JUNO bool "Support Versatile Express Juno Development Platform" select ARM64 select PL01X_SERIAL + select DM + select OF_CONTROL + select OF_BOARD + select CLK + select DM_SERIAL + select ARM_PSCI_FW + select PSCI_RESET + select DM + select BLK + select USB + select DM_USB config TARGET_LS2080A_EMU bool "Support ls2080a_emu" diff --git a/arch/arm/lib/cache.c b/arch/arm/lib/cache.c index 44dde26065..224f2aef14 100644 --- a/arch/arm/lib/cache.c +++ b/arch/arm/lib/cache.c @@ -75,6 +75,15 @@ static unsigned long noncached_start; static unsigned long noncached_end; static unsigned long noncached_next; +void noncached_set_region(void) +{ +#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) + mmu_set_region_dcache_behaviour(noncached_start, + noncached_end - noncached_start, + DCACHE_OFF); +#endif +} + void noncached_init(void) { phys_addr_t start, end; @@ -91,9 +100,7 @@ void noncached_init(void) noncached_end = end; noncached_next = start; -#if !CONFIG_IS_ENABLED(SYS_DCACHE_OFF) - mmu_set_region_dcache_behaviour(noncached_start, size, DCACHE_OFF); -#endif + noncached_set_region(); } phys_addr_t noncached_alloc(size_t size, size_t align) |