From 54da7604d86e2fcddae6cd18edf961da4cbf479c Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Thu, 6 Jun 2019 12:07:37 +0300 Subject: arm: mach-imx: Use busfreq_optee only if OPTEE is enabled This fixes the linking error: arch/arm/mach-imx/busfreq_optee.o: In function `init_freq_optee': busfreq_optee.c:(.text+0x3d8): undefined reference to `imx_smp_wfe_optee' busfreq_optee.c:(.text+0x3dc): undefined reference to `imx_smp_wfe_optee' busfreq_optee.c:(.text+0x3e8): undefined reference to `imx_smp_wfe_optee_end' busfreq_optee.c:(.text+0x3ec): undefined reference to `imx_smp_wfe_optee' busfreq_optee.c:(.text+0x3f0): undefined reference to `imx_smp_wfe_optee_end' busfreq_optee.c:(.text+0x3f4): undefined reference to `imx_smp_wfe_optee' busfreq_optee.c:(.text+0x50c): undefined reference to `imx_smp_wfe_optee' busfreq_optee.c:(.text+0x514): undefined reference to `imx_smp_wfe_optee' make: *** [Makefile:1020: vmlinux] Error 1 Signed-off-by: Oleksandr Suvorov --- arch/arm/mach-imx/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 97af9d698908..9ded0c05e399 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -133,9 +133,11 @@ obj-$(CONFIG_SOC_VF610) += mach-vf610.o obj-$(CONFIG_SOC_LS1021A) += mach-ls1021a.o -ifneq ($(CONFIG_OPTEE)$(CONFIG_SOC_IMX6)$(CONFIG_SOC_IMX7),) +ifneq ($(CONFIG_SOC_IMX6)$(CONFIG_SOC_IMX7),) +ifneq ($(CONFIG_OPTEE),) # Bus frequency by OPTEE OS obj-y += busfreq_optee.o endif +endif obj-y += devices/ -- cgit v1.2.3