There's a stub for optee_set_membase(), but it's only defined when CONFIG_HAVE_OPTEE is disabled. The out-of-line version is only linked when there's either PBL_OPTEE or BOOTM_OPTEE, both of which select HAVE_OPTEE. HAVE_OPTEE can also be selected by OPTEE, which is the option for the driver communicating with OP-TEE. This leads to a linker error with the combination of CONFIG_OPTEE=y, CONFIG_PBL_OPTEE=n and CONFIG_BOOTM_OPTEE=n. Fix this by using CONFIG_HAVE_OPTEE both in header and Makefile. Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx> --- common/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/Makefile b/common/Makefile index 2fc4a703c8c4..96498790b300 100644 --- a/common/Makefile +++ b/common/Makefile @@ -80,8 +80,7 @@ obj-$(CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB) += imx-bbu-nand-fcb.o obj-$(CONFIG_BOOT) += boot.o obj-$(CONFIG_SERIAL_DEV_BUS) += serdev.o obj-$(CONFIG_USBGADGET_START) += usbgadget.o -obj-pbl-$(CONFIG_PBL_OPTEE) += optee.o -obj-$(CONFIG_BOOTM_OPTEE) += optee.o +obj-pbl-$(CONFIG_HAVE_OPTEE) += optee.o obj-$(CONFIG_FASTBOOT_BASE) += fastboot.o ifdef CONFIG_PASSWORD -- 2.39.2
