Skip to contentSkip to conversation

ARM: OMAP2: Fix the OMAP2 only build break seen with 2011+ ARM tool-chains

PATCH New Santosh Shilimkar 2 participants 2 messages Feb 6, 2012 – Feb 8, 2012

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: OMAP2: Fix the OMAP2 only build break seen with 2011+ ARM tool-chains

With the latest Sourcery G++ Lite 2011.03-41 and latest linaro tool-chains OMAP2 only build breaks with below error.

arch/arm/mach-omap2/omap-smc.S: Assembler messages:
arch/arm/mach-omap2/omap-smc.S:30: Error: selected processor does not support ARM mode smc #0' arch/arm/mach-omap2/omap-smc.S:53: Error: selected processor does not support ARM mode smc #0' arch/arm/mach-omap2/omap-smc.S:61: Error: selected processor does not support ARM mode smc #0' arch/arm/mach-omap2/omap-smc.S:69: Error: selected processor does not support ARM mode smc #0' arch/arm/mach-omap2/omap-smc.S:77: Error: selected processor does not support ARM mode `smc #0' make[1]: *** [arch/arm/mach-omap2/omap-smc.o] Error 1

OMAP2 devices doesn't have the security support but the security support was getting built because of OMAP2PLUS. Don't build security code for OMAP2 devices.

While at it, fix the secure-common line in the Makefile to use tabs instead of spaces.

---
 arch/arm/mach-omap2/Makefile                  |    4 ++--
 arch/arm/plat-omap/include/plat/omap-secure.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/Makefile +2 -2
index fc9b238..bd76394 100644
@@ -11,9 +11,9 @@ hwmod-common				= omap_hwmod.o \
 					  omap_hwmod_common_data.o
 clock-common				= clock.o clock_common_data.o \
 					  clkt_dpll.o clkt_clksel.o
-secure-common                          = omap-smc.o omap-secure.o
+secure-common				= omap-smc.o omap-secure.o
 
-obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
+obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
 obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
 obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common)
 
arch/arm/plat-omap/include/plat/omap-secure.h +1 -1
index 0f14fb7..8c7994c 100644
@@ -3,7 +3,7 @@
 
 #include <linux/types.h>
 
-#ifdef CONFIG_ARCH_OMAP2PLUS
+#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)
Signature · 1 line
1.7.4.1
maintainer
#1 lore raw

PATCH 1/1 ARM: OMAP2: Fix the OMAP2 only build break seen with 2011+ ARM tool-chains

Quoted 15 lines · Santosh Shilimkar

With the latest Sourcery G++ Lite 2011.03-41 and latest linaro tool-chains OMAP2 only build breaks with below error.

arch/arm/mach-omap2/omap-smc.S: Assembler messages:
arch/arm/mach-omap2/omap-smc.S:30: Error: selected processor does not support ARM mode smc #0' arch/arm/mach-omap2/omap-smc.S:53: Error: selected processor does not support ARM mode smc #0' arch/arm/mach-omap2/omap-smc.S:61: Error: selected processor does not support ARM mode smc #0' arch/arm/mach-omap2/omap-smc.S:69: Error: selected processor does not support ARM mode smc #0' arch/arm/mach-omap2/omap-smc.S:77: Error: selected processor does not support ARM mode `smc #0' make[1]: *** [arch/arm/mach-omap2/omap-smc.o] Error 1

OMAP2 devices doesn't have the security support but the security support was getting built because of OMAP2PLUS. Don't build security code for OMAP2 devices.

Quoted 5 lines

While at it, fix the secure-common line in the Makefile to use tabs instead of spaces.

Thanks, applying into fixes.

Regards,

Tony