qemu: bios load OP-TEE image v2
Bios loads OP-TEE image v2 binaries instead of the v1 format.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
diff --git a/qemu.mk b/qemu.mk
index bbab849..13c1d3b 100644
--- a/qemu.mk
+++ b/qemu.mk
@@ -15,6 +15,7 @@
################################################################################
BIOS_QEMU_PATH ?= $(ROOT)/bios_qemu_tz_arm
QEMU_PATH ?= $(ROOT)/qemu
+BINARIES_PATH ?= $(ROOT)/out/bin
SOC_TERM_PATH ?= $(ROOT)/soc_term
@@ -41,13 +42,17 @@
+$(MAKE) -C $(BIOS_QEMU_PATH) \
CROSS_COMPILE=$(CROSS_COMPILE_NS_USER) \
O=$(ROOT)/out/bios-qemu \
- BIOS_NSEC_BLOB=$(LINUX_PATH)/arch/arm/boot/zImage \
- BIOS_NSEC_ROOTFS=$(GEN_ROOTFS_PATH)/filesystem.cpio.gz \
- BIOS_SECURE_BLOB=$(OPTEE_OS_BIN) \
PLATFORM_FLAVOR=virt
endef
bios-qemu: update_rootfs optee-os
+ mkdir -p $(BINARIES_PATH)
+ ln -sf $(OPTEE_OS_HEADER_V2_BIN) $(BINARIES_PATH)
+ ln -sf $(OPTEE_OS_PAGER_V2_BIN) $(BINARIES_PATH)
+ ln -sf $(OPTEE_OS_PAGEABLE_V2_BIN) $(BINARIES_PATH)
+ ln -sf $(LINUX_PATH)/arch/arm/boot/zImage $(BINARIES_PATH)
+ ln -sf $(GEN_ROOTFS_PATH)/filesystem.cpio.gz \
+ $(BINARIES_PATH)/rootfs.cpio.gz
$(call bios-qemu-common)
bios-qemu-clean:
@@ -164,13 +169,14 @@
$(call launch-terminal,54320,"Normal World")
$(call launch-terminal,54321,"Secure World")
$(call wait-for-ports,54320,54321)
- $(QEMU_PATH)/arm-softmmu/qemu-system-arm \
+ (cd $(BINARIES_PATH) && $(QEMU_PATH)/arm-softmmu/qemu-system-arm \
-nographic \
-serial tcp:localhost:54320 -serial tcp:localhost:54321 \
-s -S -machine virt -machine secure=on -cpu cortex-a15 \
+ -d unimp -semihosting-config enable,target=native \
-m 1057 \
-bios $(ROOT)/out/bios-qemu/bios.bin \
- $(QEMU_EXTRA_ARGS)
+ $(QEMU_EXTRA_ARGS) )
ifneq ($(filter check,$(MAKECMDGOALS)),)