* [PATCH] ARM: OMAP2+: Fix undefined reference to omap_secure_init
@ 2020-01-22 17:20 Andrew F. Davis
2020-01-22 18:06 ` Dan Murphy
0 siblings, 1 reply; 3+ messages in thread
From: Andrew F. Davis @ 2020-01-22 17:20 UTC (permalink / raw)
To: Tony Lindgren, Dan Murphy; +Cc: linux-omap, linux-kernel, 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")
Reported-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
arch/arm/mach-omap2/Makefile | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index f07cfda85156..e1135b9d67c6 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -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)
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: OMAP2+: Fix undefined reference to omap_secure_init
2020-01-22 17:20 [PATCH] ARM: OMAP2+: Fix undefined reference to omap_secure_init Andrew F. Davis
@ 2020-01-22 18:06 ` Dan Murphy
2020-01-23 15:50 ` Tony Lindgren
0 siblings, 1 reply; 3+ messages in thread
From: Dan Murphy @ 2020-01-22 18:06 UTC (permalink / raw)
To: Andrew F. Davis, Tony Lindgren; +Cc: linux-omap, linux-kernel
Andrew
On 1/22/20 11:20 AM, Andrew F. Davis wrote:
> 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")
> Reported-by: Dan Murphy <dmurphy@ti.com>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
> arch/arm/mach-omap2/Makefile | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
> index f07cfda85156..e1135b9d67c6 100644
> --- a/arch/arm/mach-omap2/Makefile
> +++ b/arch/arm/mach-omap2/Makefile
> @@ -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)
>
Tested-by: Dan Murphy <dmurphy@ti.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: OMAP2+: Fix undefined reference to omap_secure_init
2020-01-22 18:06 ` Dan Murphy
@ 2020-01-23 15:50 ` Tony Lindgren
0 siblings, 0 replies; 3+ messages in thread
From: Tony Lindgren @ 2020-01-23 15:50 UTC (permalink / raw)
To: Dan Murphy; +Cc: Andrew F. Davis, linux-omap, linux-kernel
* Dan Murphy <dmurphy@ti.com> [200122 18:10]:
> Andrew
>
> On 1/22/20 11:20 AM, Andrew F. Davis wrote:
> > 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")
> > Reported-by: Dan Murphy <dmurphy@ti.com>
> > Signed-off-by: Andrew F. Davis <afd@ti.com>
> > ---
> > arch/arm/mach-omap2/Makefile | 6 +++---
> > 1 file changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
> > index f07cfda85156..e1135b9d67c6 100644
> > --- a/arch/arm/mach-omap2/Makefile
> > +++ b/arch/arm/mach-omap2/Makefile
> > @@ -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)
>
>
> Tested-by: Dan Murphy <dmurphy@ti.com>
Thanks applying into omap-for-v5.6/soc.
Regards,
Tony
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-01-23 15:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-22 17:20 [PATCH] ARM: OMAP2+: Fix undefined reference to omap_secure_init Andrew F. Davis
2020-01-22 18:06 ` Dan Murphy
2020-01-23 15:50 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).