[v2] ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds

Message ID 20171206214916.2856657-1-arnd@arndb.de
State New
Headers show
  • [v2] ARM: omap2: hide omap3_save_secure_ram on non-OMAP3 builds
Related show

Commit Message

Arnd Bergmann Dec. 6, 2017, 9:48 p.m.
In configurations without CONFIG_OMAP3 but with secure RAM support,
we now run into a link failure:

arch/arm/mach-omap2/omap-secure.o: In function `omap3_save_secure_ram':
omap-secure.c:(.text+0x130): undefined reference to `save_secure_ram_context'

The omap3_save_secure_ram() function is only called from the OMAP34xx
power management code, so we can simply hide that function in the
appropriate #ifdef.

Fixes: d09220a887f7 ("ARM: OMAP2+: Fix SRAM virt to phys translation for save_secure_ram_context")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

v2: also check for CONFIG_PM

 arch/arm/mach-omap2/omap-secure.c | 2 ++
 1 file changed, 2 insertions(+)


To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


diff --git a/arch/arm/mach-omap2/omap-secure.c b/arch/arm/mach-omap2/omap-secure.c
index f9303dc631e4..55b967758bb3 100644
--- a/arch/arm/mach-omap2/omap-secure.c
+++ b/arch/arm/mach-omap2/omap-secure.c
@@ -72,6 +72,7 @@  phys_addr_t omap_secure_ram_mempool_base(void)
 	return omap_secure_memblock_base;
+#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM)
 u32 omap3_save_secure_ram(void __iomem *addr, int size)
 	u32 ret;
@@ -90,6 +91,7 @@  u32 omap3_save_secure_ram(void __iomem *addr, int size)
 	return ret;
  * rx51_secure_dispatcher: Routine to dispatch secure PPA API calls