mirror/u-boot-2016
1
0
Fork 0
mirror of https://git.codelinaro.org/clo/qsdk/oss/boot/u-boot-2016.git synced 2026-02-14 20:09:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "ipq6018: Skip uboot relocation and setup CP15 barrier"

Browse source
This commit is contained in:
Linux Build Service Account 2018-11-21 21:38:09 -08:00 • committed by Gerrit - the friendly Code Review server
commit 39f14a5284
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/cpu/armv7/start.S
View file

@ -48,7 +48,7 @@ save_boot_params_ret:
msr cpsr,r0
/* Setup CP15 barrier */
#if defined (CONFIG_ARCH_IPQ807x) || defined (CONFIG_ARCH_IPQ806x)
#if defined (CONFIG_ARCH_IPQ807x) || defined (CONFIG_ARCH_IPQ806x) || defined (CONFIG_ARCH_IPQ6018)
mrc p15, 0, r0, c1, c0, 0 @Read SCTLR to r0
orr r0, r0, #0x20 @set the cp15 barrier enable bit
mcr p15, 0, r0, c1, c0, 0 @write back to SCTLR

2
arch/arm/lib/cache-cp15.c
View file

@ -62,7 +62,7 @@ void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size,
mmu_page_table_flush((u32)&page_table[start], (u32)&page_table[end]);
}
#if defined(CONFIG_ARCH_IPQ40xx) || defined(CONFIG_ARCH_IPQ807x)
#if defined(CONFIG_ARCH_IPQ40xx) || defined(CONFIG_ARCH_IPQ807x) || defined(CONFIG_ARCH_IPQ6018)
#define UBOOT_CACHE_SETUP 0x100e
#define GEN_CACHE_SETUP 0x101e

2
common/board_f.c
View file

@ -1062,7 +1062,7 @@ void board_init_f(ulong boot_flags)
gd->flags = boot_flags;
gd->have_console = 0;
#if defined(CONFIG_ARCH_IPQ807x) || defined(CONFIG_ARCH_IPQ40xx)
#if defined(CONFIG_ARCH_IPQ807x) || defined(CONFIG_ARCH_IPQ40xx) || defined(CONFIG_ARCH_IPQ6018)
gd->flags |= GD_FLG_SKIP_RELOC;
#endif