brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

common: board_r: Drop initr_noncached wrapper

Browse Source 
Add a return value to noncached_init and use it directly in the
post-relocation init sequence, rather than using a wrapper stub.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Ovidiu Panait 2020-11-28 10:43:13 +02:00 committed by Tom Rini
parent b9f6d0f7db
commit 42d0d4223f
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/include/asm/system.h
View File

@ -628,7 +628,18 @@ void mmu_set_region_dcache_behaviour(phys_addr_t start, size_t size,
enum dcache_option option); enum dcache_option option);
#ifdef CONFIG_SYS_NONCACHED_MEMORY #ifdef CONFIG_SYS_NONCACHED_MEMORY
void noncached_init(void); /**
* noncached_init() - Initialize non-cached memory region
*
* Initialize non-cached memory area. This memory region will be typically
* located right below the malloc() area and mapped uncached in the MMU.
*
* It is called during the generic post-relocation init sequence.
*
* Return: 0 if OK
*/
int noncached_init(void);
phys_addr_t noncached_alloc(size_t size, size_t align); phys_addr_t noncached_alloc(size_t size, size_t align);
#endif /* CONFIG_SYS_NONCACHED_MEMORY */ #endif /* CONFIG_SYS_NONCACHED_MEMORY */

4
arch/arm/lib/cache.c
View File

@ -86,7 +86,7 @@ void noncached_set_region(void)
#endif #endif
} }
void noncached_init(void) int noncached_init(void)
{ {
phys_addr_t start, end; phys_addr_t start, end;
size_t size; size_t size;
@ -103,6 +103,8 @@ void noncached_init(void)
noncached_next = start; noncached_next = start;
noncached_set_region(); noncached_set_region();
return 0;
} }
phys_addr_t noncached_alloc(size_t size, size_t align) phys_addr_t noncached_alloc(size_t size, size_t align)

10
common/board_r.c
View File

@ -242,14 +242,6 @@ static int initr_malloc(void)
return 0; return 0;
} }
#ifdef CONFIG_SYS_NONCACHED_MEMORY
static int initr_noncached(void)
{
noncached_init();
return 0;
}
#endif
static int initr_of_live(void) static int initr_of_live(void)
{ {
if (CONFIG_IS_ENABLED(OF_LIVE)) { if (CONFIG_IS_ENABLED(OF_LIVE)) {
@ -668,7 +660,7 @@ static init_fnc_t init_sequence_r[] = {
console_record_init, console_record_init,
#endif #endif
#ifdef CONFIG_SYS_NONCACHED_MEMORY #ifdef CONFIG_SYS_NONCACHED_MEMORY
initr_noncached, noncached_init,
#endif #endif
initr_of_live, initr_of_live,
#ifdef CONFIG_DM #ifdef CONFIG_DM