From f583f0f2c720e4ac7d2ffd65996717bf0345a3e5 Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Tue, 2 Oct 2012 00:17:05 +0530 Subject: ARM: OMAP2+: Move omap_reserve() locally to mach-omap2 omap_reserve() callback is defned only for mach-omap2. So, moving definition of omap_reserve() to mach-omap2. This helps is moving plat/omap_secure.h local to mach-omap2 Signed-off-by: Lokesh Vutla Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/common.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'arch/arm/mach-omap2/common.c') diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 17950c6e130b..4ce0d63e941b 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c @@ -16,8 +16,11 @@ #include #include #include +#include #include +#include +#include #include "soc.h" #include "iomap.h" @@ -200,3 +203,20 @@ void __init omap5_map_io(void) omap5_map_common_io(); } #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; +} + +void __init omap_reserve(void) +{ + omap_vram_reserve_sdram_memblock(); + omap_dsp_reserve_sdram_memblock(); + omap_secure_ram_reserve_memblock(); + omap_barrier_reserve_memblock(); +} -- cgit v1.2.3 From f7a9b8a147cc10c7181cf0ca7b2b06cebf950140 Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Tue, 2 Oct 2012 00:17:06 +0530 Subject: 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 Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-omap2/common.c') diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index 4ce0d63e941b..b0f21b7d3760 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c @@ -19,7 +19,6 @@ #include #include -#include #include #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 */ -- cgit v1.2.3 From a135eaae524acba1509a3b19c97fae556e4da7cd Mon Sep 17 00:00:00 2001 From: Paul Walmsley Date: Thu, 27 Sep 2012 10:33:34 -0600 Subject: ARM: OMAP: remove plat/clock.h Remove arch/arm/plat-omap/include/plat/clock.h by merging it into arch/arm/mach-omap1/clock.h and arch/arm/mach-omap2/clock.h. The goal here is to facilitate ARM single image kernels by removing includes via the "plat/" symlink. Signed-off-by: Paul Walmsley [tony@atomide.com: fixed to remove duplicate clock.h includes] Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-omap2/common.c') diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c index b0f21b7d3760..34fb5b95859b 100644 --- a/arch/arm/mach-omap2/common.c +++ b/arch/arm/mach-omap2/common.c @@ -18,12 +18,12 @@ #include #include -#include #include #include "soc.h" #include "iomap.h" #include "common.h" +#include "clock.h" #include "sdrc.h" #include "control.h" #include "omap-secure.h" -- cgit v1.2.3