diff options
| author | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2019-06-06 12:07:37 +0300 |
|---|---|---|
| committer | Oleksandr Suvorov <oleksandr.suvorov@toradex.com> | 2019-06-06 12:09:48 +0300 |
| commit | 54da7604d86e2fcddae6cd18edf961da4cbf479c (patch) | |
| tree | 7c0d6f0cb62bf4f6fa014b2c00cb536a2251bc7d | |
| parent | 07f204867fdf469fb124a96361309c92ae45f99c (diff) | |
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 <oleksandr.suvorov@toradex.com>
| -rw-r--r-- | arch/arm/mach-imx/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
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/ |