Skip to contentSkip to conversation

ARM: OMAP2+: Fix undefined reference to omap_secure_init

PATCH In review Andrew F. Davis 3 participants 3 messages Jan 22, 2020 – Jan 23, 2020

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

PATCH 1/1 ARM: OMAP2+: Fix undefined reference to omap_secure_init

omap_secure_init() is now called from all OMAP2+ platforms during their init_early() call. This function is in omap-secure.o so include that in the build for these platforms.

Fixes db711893eac8 ("ARM: OMAP2+: Add omap_secure_init callback hook for secure initialization")
---
 arch/arm/mach-omap2/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/Makefile +3 -3
index f07cfda85156..e1135b9d67c6 100644
@@ -16,11 +16,11 @@ hwmod-common				= omap_hwmod.o omap_hwmod_reset.o \
 clock-common				= clock.o
 secure-common				= omap-smc.o omap-secure.o
 
-obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
+obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
 obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
 obj-$(CONFIG_ARCH_OMAP4) += $(hwmod-common) $(secure-common)
-obj-$(CONFIG_SOC_AM33XX) += $(hwmod-common)
-obj-$(CONFIG_SOC_OMAP5)	 += $(hwmod-common) $(secure-common)
+obj-$(CONFIG_SOC_AM33XX) += $(hwmod-common) $(secure-common)
+obj-$(CONFIG_SOC_OMAP5)  += $(hwmod-common) $(secure-common)
 obj-$(CONFIG_SOC_AM43XX) += $(hwmod-common) $(secure-common)
 obj-$(CONFIG_SOC_DRA7XX) += $(hwmod-common) $(secure-common)
 
Signature · 1 line
2.17.1
Tested-by on v1 1/1
#1 lore raw

Andrew

Quoted 20 lines · Andrew F. Davis

omap_secure_init() is now called from all OMAP2+ platforms during their init_early() call. This function is in omap-secure.o so include that in the build for these platforms.

Fixes db711893eac8 ("ARM: OMAP2+: Add omap_secure_init callback hook for secure initialization")
---
  arch/arm/mach-omap2/Makefile | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/Makefile +0 -1
index f07cfda85156..e1135b9d67c6 100644
@@ -16,11 +16,11 @@ hwmod-common				= omap_hwmod.o omap_hwmod_reset.o \
  clock-common				= clock.o
  secure-common				= omap-smc.o omap-secure.o
 
-obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)

arch/arm/mach-omap2/Makefile hwmod-common = omap_hwmod.o omap_hwmod_reset.o \ · line 26

Quoted 10 lines
arch/arm/mach-omap2/Makefile +3 -2
+obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
  obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
  obj-$(CONFIG_ARCH_OMAP4) += $(hwmod-common) $(secure-common)
-obj-$(CONFIG_SOC_AM33XX) += $(hwmod-common)
-obj-$(CONFIG_SOC_OMAP5)	 += $(hwmod-common) $(secure-common)
+obj-$(CONFIG_SOC_AM33XX) += $(hwmod-common) $(secure-common)
+obj-$(CONFIG_SOC_OMAP5)  += $(hwmod-common) $(secure-common)
  obj-$(CONFIG_SOC_AM43XX) += $(hwmod-common) $(secure-common)
  obj-$(CONFIG_SOC_DRA7XX) += $(hwmod-common) $(secure-common)
 
maintainer
#2 lore raw
Quoted 26 lines · Dan Murphy

Andrew

Quoted 23 lines · Andrew F. Davis

omap_secure_init() is now called from all OMAP2+ platforms during their init_early() call. This function is in omap-secure.o so include that in the build for these platforms.

Fixes db711893eac8 ("ARM: OMAP2+: Add omap_secure_init callback hook for secure initialization")
---
  arch/arm/mach-omap2/Makefile | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-omap2/Makefile +1 -2
index f07cfda85156..e1135b9d67c6 100644
@@ -16,11 +16,11 @@ hwmod-common				= omap_hwmod.o omap_hwmod_reset.o \
  clock-common				= clock.o
  secure-common				= omap-smc.o omap-secure.o
-obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
+obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
  obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
  obj-$(CONFIG_ARCH_OMAP4) += $(hwmod-common) $(secure-common)
-obj-$(CONFIG_SOC_AM33XX) += $(hwmod-common)
Quoted 8 lines

arch/arm/mach-omap2/Makefile hwmod-common = omap_hwmod.o omap_hwmod_reset.o \ · line 25

Quoted 5 lines
arch/arm/mach-omap2/Makefile +2 -1
-obj-$(CONFIG_SOC_OMAP5)	 += $(hwmod-common) $(secure-common)
+obj-$(CONFIG_SOC_AM33XX) += $(hwmod-common) $(secure-common)
+obj-$(CONFIG_SOC_OMAP5)  += $(hwmod-common) $(secure-common)
  obj-$(CONFIG_SOC_AM43XX) += $(hwmod-common) $(secure-common)
  obj-$(CONFIG_SOC_DRA7XX) += $(hwmod-common) $(secure-common)

Thanks applying into omap-for-v5.6/soc.

Regards,

Tony