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

Commit f7a9b8a1 authored by Lokesh Vutla's avatar Lokesh Vutla Committed by Tony Lindgren
Browse files

ARM: OMAP: Move plat/omap-secure.h locally to mach-omap2 



Moving plat/omap-secure.h locally to mach-omap2/
as part of single zImage work

Signed-off-by: default avatarLokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent f583f0f2

arch/arm/mach-omap2/common.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <linux/platform_data/dsp-omap.h>



#include <plat/clock.h>

#include <plat/omap-secure.h>

#include <plat/vram.h>



#include "soc.h"
@@ -27,6 +26,7 @@ 
#include "common.h"

#include "sdrc.h"

#include "control.h"

#include "omap-secure.h"



/* Global address base setup code */

arch/arm/mach-omap2/omap-secure.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <asm/cacheflush.h>

#include <asm/memblock.h>



#include <plat/omap-secure.h>

#include "omap-secure.h"



static phys_addr_t omap_secure_memblock_base;

arch/arm/mach-omap2/omap-secure.h

+7 −0
Original line number Diff line number Diff line
@@ -52,6 +52,13 @@ extern u32 omap_secure_dispatcher(u32 idx, u32 flag, u32 nargs, 
				u32 arg1, u32 arg2, u32 arg3, u32 arg4);

extern u32 omap_smc2(u32 id, u32 falg, u32 pargs);

extern phys_addr_t omap_secure_ram_mempool_base(void);

extern int omap_secure_ram_reserve_memblock(void);



#ifdef CONFIG_OMAP4_ERRATA_I688

extern int omap_barrier_reserve_memblock(void);

#else

static inline void omap_barrier_reserve_memblock(void)

{ }

#endif

#endif /* __ASSEMBLER__ */

#endif /* OMAP_ARCH_OMAP_SECURE_H */

arch/arm/mach-omap2/omap4-common.c

+1 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ 
#include <asm/mach/map.h>

#include <asm/memblock.h>



#include <plat/omap-secure.h>



#include "../plat-omap/sram.h"



#include "omap-wakeupgen.h"
@@ -35,6 +33,7 @@ 
#include "mmc.h"

#include "hsmmc.h"

#include "omap4-sar-layout.h"

#include "omap-secure.h"



#ifdef CONFIG_CACHE_L2X0

static void __iomem *l2cache_base;

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

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
#ifndef __OMAP_SECURE_H__

#define __OMAP_SECURE_H__



#include <linux/types.h>



extern int omap_secure_ram_reserve_memblock(void);



#ifdef CONFIG_OMAP4_ERRATA_I688

extern int omap_barrier_reserve_memblock(void);

#else

static inline void omap_barrier_reserve_memblock(void)

{ }

#endif

#endif /* __OMAP_SECURE_H__ */