Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e799840a authored by R Sricharan's avatar R Sricharan Committed by Santosh Shilimkar
Browse files

ARM: OMAP2+: Move stubbed secure_sram_reserve function to a common.c and call it __weak 



omap_secure_ram_reserve_memblock is stubbed for OMAP1,2 only builds using a
 ifdef check. But this results in adding CONFIG_ARCH_OMAPxx checks for
future socs that use the real function. So move this to common.c file and
call it __weak.

Signed-off-by: default avatarR Sricharan <r.sricharan@ti.com>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
parent fb584511

arch/arm/plat-omap/common.c

+9 −0
Original line number Diff line number Diff line
@@ -77,3 +77,12 @@ void __init omap_init_consistent_dma_size(void) 
	init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20);

#endif

}



/*

 * Stub function for OMAP2 so that common files

 * continue to build when custom builds are used

 */

int __weak omap_secure_ram_reserve_memblock(void)

{

	return 0;

}

arch/arm/plat-omap/include/plat/omap-secure.h

+0 −5
Original line number Diff line number Diff line
@@ -3,12 +3,7 @@ 


#include <linux/types.h>



#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)

extern int omap_secure_ram_reserve_memblock(void);

#else

static inline void omap_secure_ram_reserve_memblock(void)

{ }

#endif



#ifdef CONFIG_OMAP4_ERRATA_I688

extern int omap_barrier_reserve_memblock(void);