versal: Move generation of ELF wrapper around tee-raw.bin into optee_os repository

As part of PR #857 it was decided that it would be better to perform the
generation of the ELF wrapper directly within the optee_os/ build system
and to just rely on its availability in build/versal.mk.

Signed-off-by: Joachim Foerster <joachim.foerster@missinglinkelectronics.com>

Author: joft-mle

versal.mk

@@ -429,45 +429,13 @@ endif
 # Boot Image
 ###############################################################################
 
-OPTEE_OS_ELF ?= $(shell dirname $(OPTEE_OS_BIN))/tee.elf
-OPTEE_OS_RAWBIN ?= $(shell dirname $(OPTEE_OS_BIN))/tee-raw.bin
-$(OPTEE_OS_ELF): optee-os-common
-$(OPTEE_OS_RAWBIN): optee-os-common
-
-OPTEE_OS_RAWBIN_OBJ ?= versal/$(shell basename $(OPTEE_OS_RAWBIN)).o
-OPTEE_OS_RAWBIN_ELF ?= versal/$(shell basename $(OPTEE_OS_RAWBIN)).elf
-
-# NOTE: Since we need to reference an ELF file in the .bif file to make PLM
-#       firmware really recognize OP-TEE OS as a SEL-1 binary and provide
-#       matching "handoff" parameters to ATF (API id 0x70b,
-#       get_atf_handoff_params), we wrap the regular tee-raw.bin file in ELF
-#       format with a single .text section and the appropriate entry point.
-#
-#       The tee.elf file cannot be used directly, since OP-TEE OS entry code
-#       (entry_a64.S) depends on a struct boot_embdata placed right at symbol
-#       __data_end. The script gen_tee_bin.py does this placement while crafting
-#       tee-raw.bin (and similarly tee.bin) from tee.elf.
-$(OPTEE_OS_RAWBIN_OBJ): $(OPTEE_OS_RAWBIN)
-	$(subst ",,$(CROSS_COMPILE_S_KERNEL))objcopy \
-		-I binary -O elf64-littleaarch64 -B aarch64 \
-		--rename-section .data=.text \
-		--set-section-flags .text=alloc,code,load,readonly,contents \
-		$< $@
-$(OPTEE_OS_RAWBIN_ELF).load: $(OPTEE_OS_ELF)
-	$(subst ",,$(CROSS_COMPILE_S_KERNEL))nm $< | \
-		awk '/\s_start$$/ {printf "0x%s\n", $$1}' >$@
-$(OPTEE_OS_RAWBIN_ELF): $(OPTEE_OS_RAWBIN_OBJ) $(OPTEE_OS_RAWBIN_ELF).load
-	$(subst ",,$(CROSS_COMPILE_S_KERNEL))ld \
-		-Ttext $(shell cat $(OPTEE_OS_RAWBIN_ELF).load) \
-		-e $(shell cat $(OPTEE_OS_RAWBIN_ELF).load) \
-		$< -o $@
-.PHONY: $(OPTEE_OS_RAWBIN_OBJ) $(OPTEE_OS_RAWBIN_ELF).load $(OPTEE_OS_RAWBIN_ELF)
+OPTEE_OS_RAWBIN_ELF ?= $(shell dirname $(OPTEE_OS_BIN))/tee-raw.bin.elf
 
 BIF_PATH := versal/bootImage-$(PLATFORM).bif
 
 $(BIF_PATH): versal/bootImage-$(OPTEE_OS_PLATFORM).bif.in \
 	$(_PDI_PATH) $(_PLM_PATH) $(_PSM_PATH) $(_DTB_PATH) $(_IUB_BIF_PATH) \
-	$(OPTEE_OS_RAWBIN_ELF)
+	optee-os
 	cp -a $< $@
 # PLM firmware is optional, if already in .pdi file
 ifeq ($(_PLM_PATH),)