Commit 912ef02d authored by Grant Likely's avatar Grant Likely
Browse files

Reorganize StMM and Optee configuration to pull from U-Boot



Instead of configuring optee and stmm build in this tool, use the U-Boot
configuration to decide whether or not to build U-Boot and StandaloneMM.
Signed-off-by: Grant Likely's avatarGrant Likely <grant.likely@arm.com>
parent 6dc700c3
...@@ -5,16 +5,10 @@ OPTEE_PLATFORM := vexpress-qemu_armv8a ...@@ -5,16 +5,10 @@ OPTEE_PLATFORM := vexpress-qemu_armv8a
UBOOT_EXTRA_CONFIGS += scripts/qemu_arm64_tfa.config UBOOT_EXTRA_CONFIGS += scripts/qemu_arm64_tfa.config
FLASH_IMAGE := nor_flash.bin FLASH_IMAGE := nor_flash.bin
#USE_STMM := y
USE_OPTEE := y
ifneq ($(CONFIG_TFABOOT)$(CONFIG_POSITION_INDEPENDENT),yy) ifneq ($(CONFIG_TFABOOT)$(CONFIG_POSITION_INDEPENDENT),yy)
tweakconfig: tweakconfig:
echo "CONFIG_POSITION_INDEPENDENT=y" >> $(UBOOT_OUTPUT)/.config echo "CONFIG_POSITION_INDEPENDENT=y" >> $(UBOOT_OUTPUT)/.config
echo "CONFIG_TFABOOT=y" >> $(UBOOT_OUTPUT)/.config echo "CONFIG_TFABOOT=y" >> $(UBOOT_OUTPUT)/.config
ifeq ($(USE_OPTEE),y)
echo "CONFIG_OPTEE=y" >> $(UBOOT_OUTPUT)/.config
endif
$(MAKE) -C $(UBOOT_PATH) $(UBOOT_EXTRA) olddefconfig $(MAKE) -C $(UBOOT_PATH) $(UBOOT_EXTRA) olddefconfig
u-boot/all u-boot/u-boot.bin: tweakconfig u-boot/all u-boot/u-boot.bin: tweakconfig
......
...@@ -153,11 +153,11 @@ info: ...@@ -153,11 +153,11 @@ info:
@echo ' CONFIG_SYS_SOC=$(subst ",,$(CONFIG_SYS_SOC))' @echo ' CONFIG_SYS_SOC=$(subst ",,$(CONFIG_SYS_SOC))'
@echo ' CONFIG_SYS_BOARD=$(subst ",,$(CONFIG_SYS_BOARD))' @echo ' CONFIG_SYS_BOARD=$(subst ",,$(CONFIG_SYS_BOARD))'
@echo ' CONFIG_SYS_CONFIG_NAME=$(subst ",,$(CONFIG_SYS_CONFIG_NAME))' @echo ' CONFIG_SYS_CONFIG_NAME=$(subst ",,$(CONFIG_SYS_CONFIG_NAME))'
@echo ' CONFIG_OPTEE=$(subst ",,$(CONFIG_OPTEE))'
@echo ' CONFIG_EFI_MM_COMM_TEE=$(subst ",,$(CONFIG_EFI_MM_COMM_TEE))'
@echo 'Derived Config:' @echo 'Derived Config:'
@echo ' TFA_PLAT=$(TFA_PLAT)' @echo ' TFA_PLAT=$(TFA_PLAT)'
@echo ' FLASH_IMAGE=$(FLASH_IMAGE)' @echo ' FLASH_IMAGE=$(FLASH_IMAGE)'
@echo " USE_OPTEE=$(USE_OPTEE) # Build OPTEE if 'y'"
@echo " USE_STMM=$(USE_STMM) # Builds Standalone MM if 'y'"
@echo 'Included platform configuration files:' @echo 'Included platform configuration files:'
@$(foreach inc, $(wildcard $(INCLUDE_MK)), echo ' $(inc)';) @$(foreach inc, $(wildcard $(INCLUDE_MK)), echo ' $(inc)';)
else else
...@@ -168,7 +168,7 @@ ifeq ($(TFA_PLAT),) ...@@ -168,7 +168,7 @@ ifeq ($(TFA_PLAT),)
$(info ) $(info )
$(error Invalid configuration) $(error Invalid configuration)
endif endif
ifeq ($(USE_OPTEE)_$(OPTEE_PLATFORM),y_) ifeq ($(CONFIG_OPTEE)$(OPTEE_PLATFORM),y)
$(info OPTEE is enabled, but $$OPTEE_PLATFORM is not set. Either the platform is not) $(info OPTEE is enabled, but $$OPTEE_PLATFORM is not set. Either the platform is not)
$(info yet supported, or there is a bug. Use \'make info\' to see the current) $(info yet supported, or there is a bug. Use \'make info\' to see the current)
$(info configuration) $(info configuration)
...@@ -177,9 +177,10 @@ ifeq ($(USE_OPTEE)_$(OPTEE_PLATFORM),y_) ...@@ -177,9 +177,10 @@ ifeq ($(USE_OPTEE)_$(OPTEE_PLATFORM),y_)
endif endif
endif endif
ifeq ($(CONFIG_OPTEE),y)
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Standalone-MM build configuration # Standalone-MM build configuration
ifeq ($(USE_STMM),y) ifeq ($(CONFIG_EFI_MM_COMM_TEE),y)
# EDK2 Environmental variables; easiest to export these # EDK2 Environmental variables; easiest to export these
export WORKSPACE=$(CURDIR) export WORKSPACE=$(CURDIR)
...@@ -198,11 +199,10 @@ edk2/BaseTools: ...@@ -198,11 +199,10 @@ edk2/BaseTools:
stmm/all: edk2/BaseTools stmm/all: edk2/BaseTools
source $(EDK2_PATH)/edksetup.sh && build -p $(ACTIVE_PLATFORM) -b DEBUG -a AARCH64 -t GCC5 -D DO_X86EMU=TRUE source $(EDK2_PATH)/edksetup.sh && build -p $(ACTIVE_PLATFORM) -b DEBUG -a AARCH64 -t GCC5 -D DO_X86EMU=TRUE
endif # ifeq($(USE_STMM),y) endif # ifeq($(CONFIG_EFI_MM_COMM_TEE),y)
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# OP-TEE build configuration # OP-TEE build configuration
ifeq ($(USE_OPTEE),y)
OPTEE_EXTRA += ARCH=arm OPTEE_EXTRA += ARCH=arm
OPTEE_EXTRA += CROSS_COMPILE32=arm-linux-gnueabihf- OPTEE_EXTRA += CROSS_COMPILE32=arm-linux-gnueabihf-
OPTEE_EXTRA += PLATFORM=$(OPTEE_PLATFORM) OPTEE_EXTRA += PLATFORM=$(OPTEE_PLATFORM)
...@@ -229,7 +229,7 @@ tfa/all tfa/fip: optee/all ...@@ -229,7 +229,7 @@ tfa/all tfa/fip: optee/all
optee/%: optee/%:
${MAKE} -C ${OPTEE_PATH} ${OPTEE_EXTRA} $* ${MAKE} -C ${OPTEE_PATH} ${OPTEE_EXTRA} $*
endif # ifeq($(USE_OPTEE),y) endif # ifeq($(CONFIG_OPTEE),y)
# Default Trusted Firmware configuration settings # Default Trusted Firmware configuration settings
TFA_EXTRA += PLAT=$(TFA_PLAT) TFA_EXTRA += PLAT=$(TFA_PLAT)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment