mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-21 07:01:57 +00:00
51827f9a8b
The configuration CONFIG_OPTEE is defined 2 times: 1- in lib/optee/Kconfig for support of OPTEE images loaded by bootm command 2- in drivers/tee/optee/Kconfig for support of OP-TEE driver. It is abnormal to have the same CONFIG define for 2 purpose; and it is difficult to managed correctly their dependencies. Moreover CONFIG_SPL_OPTEE is defined in common/spl/Kconfig to manage OPTEE image load in SPL. This definition causes an issue with the macro CONFIG_IS_ENABLED(OPTEE) to test the availability of the OP-TEE driver. This patch cleans the configuration dependency with: - CONFIG_OPTEE_IMAGE (renamed) => support of OP-TEE image in U-Boot - CONFIG_SPL_OPTEE_IMAGE (renamed) => support of OP-TEE image in SPL - CONFIG_OPTEE (same) => support of OP-TEE driver in U-Boot - CONFIG_OPTEE_LIB (new) => support of OP-TEE library After this patch, the macro have the correct behavior: - CONFIG_IS_ENABLED(OPTEE_IMAGE) => Load of OP-TEE image is supported - CONFIG_IS_ENABLED(OPTEE) => OP-TEE driver is supported Signed-off-by: Patrick Delaunay <patrick.delaunay@foss.st.com>
35 lines
1.3 KiB
Makefile
35 lines
1.3 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0+
|
|
#
|
|
# (C) Copyright 2012
|
|
# Texas Instruments Incorporated - http://www.ti.com/
|
|
# Aneesh V <aneesh@ti.com>
|
|
# Based on common/Makefile.
|
|
#
|
|
|
|
ifdef CONFIG_SPL_BUILD
|
|
obj-$(CONFIG_$(SPL_TPL_)FRAMEWORK) += spl.o
|
|
obj-$(CONFIG_$(SPL_TPL_)BOOTROM_SUPPORT) += spl_bootrom.o
|
|
obj-$(CONFIG_$(SPL_TPL_)LOAD_FIT) += spl_fit.o
|
|
obj-$(CONFIG_$(SPL_TPL_)LEGACY_IMAGE_SUPPORT) += spl_legacy.o
|
|
obj-$(CONFIG_$(SPL_TPL_)NOR_SUPPORT) += spl_nor.o
|
|
obj-$(CONFIG_$(SPL_TPL_)XIP_SUPPORT) += spl_xip.o
|
|
obj-$(CONFIG_$(SPL_TPL_)YMODEM_SUPPORT) += spl_ymodem.o
|
|
ifndef CONFIG_SPL_UBI
|
|
obj-$(CONFIG_$(SPL_TPL_)NAND_SUPPORT) += spl_nand.o
|
|
obj-$(CONFIG_$(SPL_TPL_)ONENAND_SUPPORT) += spl_onenand.o
|
|
endif
|
|
obj-$(CONFIG_$(SPL_TPL_)UBI) += spl_ubi.o
|
|
obj-$(CONFIG_$(SPL_TPL_)NET) += spl_net.o
|
|
obj-$(CONFIG_$(SPL_TPL_)MMC) += spl_mmc.o
|
|
obj-$(CONFIG_$(SPL_TPL_)ATF) += spl_atf.o
|
|
obj-$(CONFIG_$(SPL_TPL_)OPTEE_IMAGE) += spl_optee.o
|
|
obj-$(CONFIG_$(SPL_TPL_)OPENSBI) += spl_opensbi.o
|
|
obj-$(CONFIG_$(SPL_TPL_)USB_STORAGE) += spl_usb.o
|
|
obj-$(CONFIG_$(SPL_TPL_)FS_FAT) += spl_fat.o
|
|
obj-$(CONFIG_$(SPL_TPL_)FS_EXT4) += spl_ext.o
|
|
obj-$(CONFIG_$(SPL_TPL_)SATA) += spl_sata.o
|
|
obj-$(CONFIG_$(SPL_TPL_)DFU) += spl_dfu.o
|
|
obj-$(CONFIG_$(SPL_TPL_)SPI_LOAD) += spl_spi.o
|
|
obj-$(CONFIG_$(SPL_TPL_)RAM_SUPPORT) += spl_ram.o
|
|
obj-$(CONFIG_$(SPL_TPL_)USB_SDP_SUPPORT) += spl_sdp.o
|
|
endif
|