mirrors/u-boot
1
0
Fork 0
mirror of https://source.denx.de/u-boot/u-boot.git synced 2025-10-02 19:22:00 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://git.denx.de/u-boot-sh

Browse Source
This commit is contained in:
Tom Rini 2018-12-10 07:15:55 -05:00
commit 7504e9e75f
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/mach-rmobile/cpu_info.c
View File

@ -7,8 +7,6 @@
#include <asm/io.h> #include <asm/io.h>
#include <linux/ctype.h> #include <linux/ctype.h>
/* R-Car Gen3 caches are enabled in memmap-gen3.c */
#ifndef CONFIG_RCAR_GEN3
#ifdef CONFIG_ARCH_CPU_INIT #ifdef CONFIG_ARCH_CPU_INIT
int arch_cpu_init(void) int arch_cpu_init(void)
{ {
@ -17,6 +15,8 @@ int arch_cpu_init(void)
} }
#endif #endif
/* R-Car Gen3 D-cache is enabled in memmap-gen3.c */
#ifndef CONFIG_RCAR_GEN3
#ifndef CONFIG_SYS_DCACHE_OFF #ifndef CONFIG_SYS_DCACHE_OFF
void enable_caches(void) void enable_caches(void)
{ {

24
arch/arm/mach-rmobile/memmap-gen3.c
View File

@ -21,7 +21,13 @@ static struct mm_region gen3_mem_map[GEN3_NR_REGIONS] = {
}, { }, {
.virt = 0x40000000UL, .virt = 0x40000000UL,
.phys = 0x40000000UL, .phys = 0x40000000UL,
.size = 0x80000000UL, .size = 0x03F00000UL,
.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
PTE_BLOCK_INNER_SHARE
}, {
.virt = 0x47E00000UL,
.phys = 0x47E00000UL,
.size = 0x78200000UL,
.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
PTE_BLOCK_INNER_SHARE PTE_BLOCK_INNER_SHARE
}, { }, {
@ -76,8 +82,16 @@ void enable_caches(void)
/* Mark memory reserved by ATF as cacheable too. */ /* Mark memory reserved by ATF as cacheable too. */
if (start == 0x48000000) { if (start == 0x48000000) {
start = 0x40000000ULL; /* Unmark protection area (0x43F00000 to 0x47DFFFFF) */
size += 0x08000000ULL; gen3_mem_map[i].virt = 0x40000000ULL;
gen3_mem_map[i].phys = 0x40000000ULL;
gen3_mem_map[i].size = 0x03F00000ULL;
gen3_mem_map[i].attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
PTE_BLOCK_INNER_SHARE;
i++;
start = 0x47E00000ULL;
size += 0x00200000ULL;
} }
gen3_mem_map[i].virt = start; gen3_mem_map[i].virt = start;
@ -126,6 +140,8 @@ void enable_caches(void)
gen3_mem_map[i].attrs = 0; gen3_mem_map[i].attrs = 0;
} }
icache_enable(); if (!icache_status())
icache_enable();
dcache_enable(); dcache_enable();
} }