Skip to content

Commit d8430df

Browse files
committed
Merge tag 'omap-for-v5.6/soc-build-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc
Randconfig build fix for recent SoC changes for v5.6 We can get build failures if let's say if only am335x SoC is selected. Let's fix this by always building secure-common. * tag 'omap-for-v5.6/soc-build-fix-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Fix undefined reference to omap_secure_init Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Olof Johansson <[email protected]>
2 parents a9eeb0e + c37baa0 commit d8430df

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

arch/arm/mach-omap2/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ hwmod-common = omap_hwmod.o omap_hwmod_reset.o \
1616
clock-common = clock.o
1717
secure-common = omap-smc.o omap-secure.o
1818

19-
obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
19+
obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
2020
obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
2121
obj-$(CONFIG_ARCH_OMAP4) += $(hwmod-common) $(secure-common)
22-
obj-$(CONFIG_SOC_AM33XX) += $(hwmod-common)
23-
obj-$(CONFIG_SOC_OMAP5) += $(hwmod-common) $(secure-common)
22+
obj-$(CONFIG_SOC_AM33XX) += $(hwmod-common) $(secure-common)
23+
obj-$(CONFIG_SOC_OMAP5) += $(hwmod-common) $(secure-common)
2424
obj-$(CONFIG_SOC_AM43XX) += $(hwmod-common) $(secure-common)
2525
obj-$(CONFIG_SOC_DRA7XX) += $(hwmod-common) $(secure-common)
2626

0 commit comments

Comments
 (0)