summaryrefslogtreecommitdiff
path: root/arch/powerpc
diff options
context:
space:
mode:
authorOvidiu Panait <ovidiu.panait@windriver.com>2022-01-01 19:13:28 +0200
committerTom Rini <trini@konsulko.com>2022-01-18 08:31:02 -0500
commit1b212bb9f4bf55f58ed230a444e51204f1fa8b02 (patch)
treed3bdb1340154c1ca56769db037eb58704c54a028 /arch/powerpc
parent78fc0395c01640df0fa9b8be736bf855a0416b56 (diff)
common: board_r: drop initr_addr_map wrapper
Add a return value to init_addr_map and use it directly in the post-relocation init sequence, rather than using a wrapper stub. Reviewed-by: Matthias Brugger <mbrugger@suse.com> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/cpu/mpc85xx/tlb.c4
-rw-r--r--arch/powerpc/include/asm/mmu.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/tlb.c b/arch/powerpc/cpu/mpc85xx/tlb.c
index 973b6fbe4b..aa9b59d487 100644
--- a/arch/powerpc/cpu/mpc85xx/tlb.c
+++ b/arch/powerpc/cpu/mpc85xx/tlb.c
@@ -219,7 +219,7 @@ int find_tlb_idx(void *addr, u8 tlbsel)
}
#ifdef CONFIG_ADDR_MAP
-void init_addr_map(void)
+int init_addr_map(void)
{
int i;
unsigned int num_cam = mfspr(SPRN_TLB1CFG) & 0xfff;
@@ -235,7 +235,7 @@ void init_addr_map(void)
addrmap_set_entry(epn, rpn, TSIZE_TO_BYTES(tsize), i);
}
- return ;
+ return 0;
}
#endif
diff --git a/arch/powerpc/include/asm/mmu.h b/arch/powerpc/include/asm/mmu.h
index 353dc4e874..cb5b26cd77 100644
--- a/arch/powerpc/include/asm/mmu.h
+++ b/arch/powerpc/include/asm/mmu.h
@@ -138,7 +138,7 @@ extern void _tlbie(unsigned long va); /* invalidate a TLB entry */
extern void _tlbia(void); /* invalidate all TLB entries */
#ifdef CONFIG_ADDR_MAP
-extern void init_addr_map(void);
+extern int init_addr_map(void);
#endif
typedef enum {