dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Lokesh Vutla 2012-10-02 00:17:06 +05:30 committed by Tony Lindgren
parent f583f0f2c7
commit f7a9b8a147
5 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/common.c
View File

@ -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 */

1
arch/arm/mach-omap2/omap-secure.c
View File

@ -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;

7
arch/arm/mach-omap2/omap-secure.h
View File

@ -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 */

3
arch/arm/mach-omap2/omap4-common.c
View File

@ -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;

14
arch/arm/plat-omap/include/plat/omap-secure.h
View File

@ -1,14 +0,0 @@
#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__ */