dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 01:02:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

common: board_r: drop initr_addr_map wrapper

Browse Source 
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>
This commit is contained in:
Ovidiu Panait
2022-01-01 19:13:28 +02:00
committed by Tom Rini
parent 78fc0395c0
commit 1b212bb9f4
5 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/mmu.h
View File

@@ -3,6 +3,6 @@
#ifndef __ASM_ARM_MMU_H #ifndef __ASM_ARM_MMU_H
#define __ASM_ARM_MMU_H #define __ASM_ARM_MMU_H
void init_addr_map(void); int init_addr_map(void);
#endif #endif

4
arch/arm/mach-bcm283x/init.c
View File

@@ -152,7 +152,7 @@ int mach_cpu_init(void)
#include <addr_map.h> #include <addr_map.h>
#include <asm/system.h> #include <asm/system.h>
void init_addr_map(void) int init_addr_map(void)
{ {
mmu_set_region_dcache_behaviour_phys(BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT, mmu_set_region_dcache_behaviour_phys(BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT,
BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS, BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS,
@@ -165,6 +165,8 @@ void init_addr_map(void)
addrmap_set_entry(BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT, addrmap_set_entry(BCM2711_RPI4_PCIE_XHCI_MMIO_VIRT,
BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS, BCM2711_RPI4_PCIE_XHCI_MMIO_PHYS,
BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE, 1); BCM2711_RPI4_PCIE_XHCI_MMIO_SIZE, 1);
return 0;
} }
#endif #endif

4
arch/powerpc/cpu/mpc85xx/tlb.c
View File

@@ -219,7 +219,7 @@ int find_tlb_idx(void *addr, u8 tlbsel)
} }
#ifdef CONFIG_ADDR_MAP #ifdef CONFIG_ADDR_MAP
void init_addr_map(void) int init_addr_map(void)
{ {
int i; int i;
unsigned int num_cam = mfspr(SPRN_TLB1CFG) & 0xfff; 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); addrmap_set_entry(epn, rpn, TSIZE_TO_BYTES(tsize), i);
} }
return ; return 0;
} }
#endif #endif

2
arch/powerpc/include/asm/mmu.h
View File

@@ -138,7 +138,7 @@ extern void _tlbie(unsigned long va); /* invalidate a TLB entry */
extern void _tlbia(void); /* invalidate all TLB entries */ extern void _tlbia(void); /* invalidate all TLB entries */
#ifdef CONFIG_ADDR_MAP #ifdef CONFIG_ADDR_MAP
extern void init_addr_map(void); extern int init_addr_map(void);
#endif #endif
typedef enum { typedef enum {

11
common/board_r.c
View File

@@ -186,15 +186,6 @@ __weak int arch_initr_trap(void)
return 0; return 0;
} }
#ifdef CONFIG_ADDR_MAP
static int initr_addr_map(void)
{
init_addr_map();
return 0;
}
#endif
#if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500) #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500)
static int initr_unlock_ram_in_cache(void) static int initr_unlock_ram_in_cache(void)
{ {
@@ -646,7 +637,7 @@ static init_fnc_t init_sequence_r[] = {
initr_dm, initr_dm,
#endif #endif
#ifdef CONFIG_ADDR_MAP #ifdef CONFIG_ADDR_MAP
initr_addr_map, init_addr_map,
#endif #endif
#if defined(CONFIG_ARM) || defined(CONFIG_NDS32) || defined(CONFIG_RISCV) || \ #if defined(CONFIG_ARM) || defined(CONFIG_NDS32) || defined(CONFIG_RISCV) || \
defined(CONFIG_SANDBOX) defined(CONFIG_SANDBOX)