diff options
| author | Tom Rini <trini@konsulko.com> | 2018-10-16 13:57:23 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-10-16 13:57:23 -0400 |
| commit | d0423c44f1acc68da10da8c16af4d82016479d7b (patch) | |
| tree | b361709388fef7be02c48fe78dfe16c083cb0a04 /arch/arm/cpu | |
| parent | 2364b70c87a8d4ac327a44161df32d2c8e209545 (diff) | |
| parent | b92055064e56207e284ae966dbd7bd407a7b0e8d (diff) | |
Merge git://git.denx.de/u-boot-microblaze
Xilinx changes for v2018.11-rc2-v2
FPGA:
- Fix SPL fpga loading from FIT
ARM64:
- Fix gic accesses in EL2/EL1
Xilinx:
- Add dlc20 board support
- Add Versal board support
- Sync defconfigs
- Enable MP via Kconfig
- Add missing efuse node
- Enable CDC for zcu100
cmd:
- Fix kgdb Kconfig dependency
Diffstat (limited to 'arch/arm/cpu')
| -rw-r--r-- | arch/arm/cpu/armv8/zynqmp/cpu.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/cpu/armv8/zynqmp/cpu.c b/arch/arm/cpu/armv8/zynqmp/cpu.c index 43ba739d2f..4ee8e3f627 100644 --- a/arch/arm/cpu/armv8/zynqmp/cpu.c +++ b/arch/arm/cpu/armv8/zynqmp/cpu.c @@ -104,11 +104,19 @@ u64 get_page_table_size(void) return 0x14000; } +#if defined(CONFIG_SYS_MEM_RSVD_FOR_MMU) || defined(CONFIG_DEFINE_TCM_OCM_MMAP) +void tcm_init(u8 mode) +{ + puts("WARNING: Initializing TCM overwrites TCM content\n"); + initialize_tcm(mode); + memset((void *)ZYNQMP_TCM_BASE_ADDR, 0, ZYNQMP_TCM_SIZE); +} +#endif + #ifdef CONFIG_SYS_MEM_RSVD_FOR_MMU int reserve_mmu(void) { - initialize_tcm(TCM_LOCK); - memset((void *)ZYNQMP_TCM_BASE_ADDR, 0, ZYNQMP_TCM_SIZE); + tcm_init(TCM_LOCK); gd->arch.tlb_size = PGTABLE_SIZE; gd->arch.tlb_addr = ZYNQMP_TCM_BASE_ADDR; |