GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-06 14:51:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

board_f: Move the extra #ifdef condition into reserve_mmu()

Browse source 
The arch-specific details of the cache being off are best handled inside
the reserve_mmu(). This cleans up the init sequence a little.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Simon Glass 2017-03-31 08:40:29 -06:00 • committed by Tom Rini
parent b56db48615
commit 80d4bcd3ec
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/board_f.c
View file

@ -372,10 +372,10 @@ static int reserve_round_4k(void)
return 0; return 0;
} }
#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF)) && \ #ifdef CONFIG_ARM
defined(CONFIG_ARM)
static int reserve_mmu(void) static int reserve_mmu(void)
{ {
#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF))
/* reserve TLB table */ /* reserve TLB table */
gd->arch.tlb_size = PGTABLE_SIZE; gd->arch.tlb_size = PGTABLE_SIZE;
gd->relocaddr -= gd->arch.tlb_size; gd->relocaddr -= gd->arch.tlb_size;
@ -393,6 +393,7 @@ static int reserve_mmu(void)
* with location within secure ram. * with location within secure ram.
*/ */
gd->arch.tlb_allocated = gd->arch.tlb_addr; gd->arch.tlb_allocated = gd->arch.tlb_addr;
#endif
#endif #endif
return 0; return 0;
@ -897,8 +898,7 @@ static const init_fnc_t init_sequence_f[] = {
reserve_pram, reserve_pram,
#endif #endif
reserve_round_4k, reserve_round_4k,
#if !(defined(CONFIG_SYS_ICACHE_OFF) && defined(CONFIG_SYS_DCACHE_OFF)) && \ #ifdef CONFIG_ARM
defined(CONFIG_ARM)
reserve_mmu, reserve_mmu,
#endif #endif
#ifdef CONFIG_DM_VIDEO #ifdef CONFIG_DM_VIDEO