Initial commit with helper makefiles for OP-TEE

This is the first commit containing helper makefiles to be able to build
OP-TEE easily regardless of previous knowledge of OP-TEE.

To use this particular git and the makefiles, you should have installed
the environment according to the instructions at:
  https://github.com/OP-TEE/manifest/blob/master/README.md

In this commit there are support for building OP-TEE for:
 - QEMU (default)
 - FVP
 - Hikey

More targets will be added later on.

Signed-off-by: Joakim Bech <joakim.bech@linaro.org>
Tested-by: Joakim Bech <joakim.bech@linaro.org> (QEMU, FVP)
Tested-by: Victor Chong <victor.chong@linaro.org> (Hikey)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..89ff7b0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+*.swp
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e674ca4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+Contains the necessary build files to handle OP-TEE for various setups, for now,
+please see
+[manifest/README.md](https://github.com/OP-TEE/manifest/blob/master/README.md)
+and [OP-TEE/README.md](https://github.com/OP-TEE/optee_os/blob/master/README.md) for instructions.
diff --git a/fvp.mk b/fvp.mk
new file mode 100644
index 0000000..ba78cbd
--- /dev/null
+++ b/fvp.mk
@@ -0,0 +1,232 @@
+BASH := $(shell which bash)
+ROOT ?= $(subst /build/,,$(shell pwd)/)
+
+################################################################################
+# Paths to git projects and various binaries
+################################################################################
+ARM_TF_PATH			?= $(ROOT)/arm-trusted-firmware
+
+EDK2_PATH 			?= $(ROOT)/edk2
+EDK2_BIN 			?= $(EDK2_PATH)/Build/ArmVExpress-FVP-AArch64/RELEASE_GCC49/FV/FVP_AARCH64_EFI.fd
+
+LINUX_PATH 			?= $(ROOT)/linux
+
+OPTEE_OS_PATH 			?= $(ROOT)/optee_os
+OPTEE_OS_BIN 			?= $(OPTEE_OS_PATH)/out/arm-plat-vexpress/core/tee.bin
+
+OPTEE_CLIENT_PATH 		?= $(ROOT)/optee_client
+OPTEE_CLIENT_EXPORT		?= $(OPTEE_CLIENT_PATH)/out/export
+OPTEE_LINUXDRIVER_PATH 		?= $(ROOT)/optee_linuxdriver
+
+OPTEE_TEST_PATH 		?= $(ROOT)/optee_test
+OPTEE_TEST_OUT_PATH 		?= $(ROOT)/out/optee_test
+
+GEN_ROOTFS_PATH 		?= $(ROOT)/gen_rootfs
+GEN_ROOTFS_FILELIST 		?= $(GEN_ROOTFS_PATH)/filelist-tee.txt
+
+FOUNDATION_PATH			?= $(ROOT)/Foundation_Platformpkg
+
+################################################################################
+# defines, macros, configuration etc
+################################################################################
+define KERNEL_VERSION
+$(shell cd $(LINUX_PATH) && make kernelversion)
+endef
+
+CCACHE ?= $(shell which ccache) # Don't remove this comment (space is needed)
+
+################################################################################
+# Targets
+################################################################################
+all: arm-tf edk2 linux optee-os optee-client optee-linuxdriver generate-dtb xtest
+all-clean: arm-tf-clean busybox-clean edk2-clean optee-os-clean \
+	optee-client-clean optee-linuxdriver-clean
+
+
+-include toolchain.mk
+
+################################################################################
+# ARM Trusted Firmware
+################################################################################
+arm-tf: optee-os edk2
+	CFLAGS="-O0 -gdwarf-2" \
+	CROSS_COMPILE="$(CCACHE)$(AARCH64_NONE_CROSS_COMPILE)" \
+	BL32=$(OPTEE_OS_BIN) \
+	BL33=$(EDK2_BIN) \
+	make -C $(ARM_TF_PATH) \
+	       -j`getconf _NPROCESSORS_ONLN` \
+	       DEBUG=0 \
+	       FVP_TSP_RAM_LOCATION=tdram \
+	       FVP_SHARED_DATA_LOCATION=tdram \
+	       PLAT=fvp \
+	       SPD=opteed \
+	       all fip
+
+arm-tf-clean:
+	make -C $(ARM_TF_PATH) clean
+
+################################################################################
+# Busybox
+################################################################################
+busybox:
+	@if [ ! -d "$(GEN_ROOTFS_PATH)/build" ]; then \
+		cd $(GEN_ROOTFS_PATH); \
+		CC_DIR=$(AARCH64_PATH) \
+		PATH=${PATH}:$(LINUX_PATH)/usr \
+		$(GEN_ROOTFS_PATH)/generate-cpio-rootfs.sh fvp-aarch64; \
+	fi
+
+busybox-clean:
+	cd $(GEN_ROOTFS_PATH); \
+		$(GEN_ROOTFS_PATH)/generate-cpio-rootfs.sh fvp-aarch64 clean
+
+################################################################################
+# EDK2 / Tianocore
+################################################################################
+# Make sure edksetup.sh only will be called once and that we don't rebuild
+# BaseTools again and again.
+$(EDK2_PATH)/Conf/target.txt:
+	cd $(EDK2_PATH); $(BASH) edksetup.sh; \
+		make -C $(EDK2_PATH)/BaseTools clean; \
+		make -C $(EDK2_PATH)/BaseTools;  \
+
+define edk2-common
+	GCC49_AARCH64_PREFIX=$(AARCH64_NONE_CROSS_COMPILE) \
+	     make -C $(EDK2_PATH) \
+	     -f ArmPlatformPkg/Scripts/Makefile EDK2_ARCH=AARCH64 \
+	     EDK2_DSC=ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc \
+	     EDK2_TOOLCHAIN=GCC49 EDK2_BUILD=RELEASE \
+	     EDK2_MACROS="-n 6 -D ARM_FOUNDATION_FVP=1"
+endef
+
+edk2: $(EDK2_PATH)/Conf/target.txt
+	$(call edk2-common)
+
+edk2-clean:
+	$(call edk2-common) clean
+	cd $(EDK2_PATH); \
+		make -C BaseTools clean
+
+################################################################################
+# Linux kernel
+################################################################################
+$(LINUX_PATH)/.config:
+	# Temporary fix until we have the driver integrated in the kernel
+	sed -i '/config ARM64$$/a select DMA_SHARED_BUFFER' $(LINUX_PATH)/arch/arm64/Kconfig;
+	make -C $(LINUX_PATH) ARCH=arm64 defconfig
+
+linux-defconfig: $(LINUX_PATH)/.config
+
+linux: linux-defconfig
+	make -C $(LINUX_PATH) \
+		CROSS_COMPILE="$(CCACHE)$(AARCH64_NONE_CROSS_COMPILE)" \
+		LOCALVERSION= \
+		ARCH=arm64 \
+		-j`getconf _NPROCESSORS_ONLN`
+
+################################################################################
+# OP-TEE
+################################################################################
+optee-os:
+	make -C $(OPTEE_OS_PATH) \
+		CROSS_COMPILE="$(CCACHE)$(AARCH32_CROSS_COMPILE)" \
+		PLATFORM=vexpress \
+		PLATFORM_FLAVOR=fvp \
+		CFG_TEE_CORE_LOG_LEVEL=3 \
+		DEBUG=1 \
+		-j`getconf _NPROCESSORS_ONLN`
+
+optee-os-clean:
+	make -C $(OPTEE_OS_PATH) \
+		PLATFORM=vexpress \
+		PLATFORM_FLAVOR=fvp \
+		clean
+
+optee-client:
+	make -C $(OPTEE_CLIENT_PATH) \
+		CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+		-j`getconf _NPROCESSORS_ONLN`
+
+optee-client-clean:
+	make -C $(OPTEE_CLIENT_PATH) clean
+
+optee-linuxdriver: linux
+	make -C $(LINUX_PATH) \
+		V=0 \
+		ARCH=arm64 \
+		CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+		LOCALVERSION= \
+		M=$(OPTEE_LINUXDRIVER_PATH) modules
+
+optee-linuxdriver-clean:
+	make -C $(LINUX_PATH) \
+		M=$(OPTEE_LINUXDRIVER_PATH) clean
+
+generate-dtb:
+	$(LINUX_PATH)/scripts/dtc/dtc \
+		-O dtb \
+		-o $(FOUNDATION_PATH)/fdt.dtb \
+		-b 0 \
+		-i . $(OPTEE_LINUXDRIVER_PATH)/fdts/fvp-foundation-gicv2-psci.dts
+
+################################################################################
+# xtest / optee_test
+################################################################################
+xtest: optee-os optee-client
+	@if [ -d "$(OPTEE_TEST_PATH)" ]; then \
+		make -C $(OPTEE_TEST_PATH) \
+		-j`getconf _NPROCESSORS_ONLN` \
+		CROSS_COMPILE_HOST="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+		CROSS_COMPILE_TA="$(CCACHE)$(AARCH32_CROSS_COMPILE)" \
+		TA_DEV_KIT_DIR=$(OPTEE_OS_PATH)/out/arm-plat-vexpress/export-user_ta \
+		O=$(OPTEE_TEST_OUT_PATH); \
+	fi
+
+################################################################################
+# Root FS
+################################################################################
+.PHONY: filelist-tee
+filelist-tee:
+	@echo "# xtest / optee_test" > $(GEN_ROOTFS_FILELIST)
+	@find $(OPTEE_TEST_OUT_PATH) -type f -name "xtest" | sed 's/\(.*\)/file \/bin\/xtest \1 755 0 0/g' >> $(GEN_ROOTFS_FILELIST)
+	@echo "# TAs" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /lib/optee_armtz 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@find $(OPTEE_TEST_OUT_PATH) -name "*.ta" | \
+		sed 's/\(.*\)\/\(.*\)/file \/lib\/optee_armtz\/\2 \1\/\2 444 0 0/g' >> $(GEN_ROOTFS_FILELIST)
+	@echo "# Secure storage dig" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /data 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /data/tee 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "# OP-TEE device" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /lib/modules 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /lib/modules/$(call KERNEL_VERSION) 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /lib/modules/$(call KERNEL_VERSION)/optee.ko $(OPTEE_LINUXDRIVER_PATH)/core/optee.ko 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /lib/modules/$(call KERNEL_VERSION)/optee_armtz.ko $(OPTEE_LINUXDRIVER_PATH)/armtz/optee_armtz.ko 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "# OP-TEE Client" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /bin/tee-supplicant $(OPTEE_CLIENT_EXPORT)/bin/tee-supplicant 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /lib/aarch64-linux-gnu 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /lib/aarch64-linux-gnu/libteec.so.1.0 $(OPTEE_CLIENT_EXPORT)/lib/libteec.so.1.0 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "slink /lib/aarch64-linux-gnu/libteec.so.1 libteec.so.1.0 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "slink /lib/aarch64-linux-gnu/libteec.so libteec.so.1 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+
+update_rootfs: busybox optee-client optee-linuxdriver xtest filelist-tee
+	cat $(GEN_ROOTFS_PATH)/filelist-final.txt $(GEN_ROOTFS_PATH)/filelist-tee.txt > $(GEN_ROOTFS_PATH)/filelist.tmp
+	cd $(GEN_ROOTFS_PATH); \
+	        $(LINUX_PATH)/usr/gen_init_cpio $(GEN_ROOTFS_PATH)/filelist.tmp | gzip > $(GEN_ROOTFS_PATH)/filesystem.cpio.gz
+
+################################################################################
+# Run targets
+################################################################################
+# This target enforces updating root fs etc
+run: | update_rootfs run-only
+
+run-only:
+	@ln -sf $(LINUX_PATH)/arch/arm64/boot/Image $(FOUNDATION_PATH)
+	@ln -sf $(GEN_ROOTFS_PATH)/filesystem.cpio.gz $(FOUNDATION_PATH)
+	@cd $(FOUNDATION_PATH); \
+	$(FOUNDATION_PATH)/models/Linux64_GCC-4.1/Foundation_Platform \
+	--cores=4 \
+	--secure-memory \
+	--visualization \
+	--gicv3 \
+	--data="$(ARM_TF_PATH)/build/fvp/release/bl1.bin"@0x0 \
+	--data="$(ARM_TF_PATH)/build/fvp/release/fip.bin"@0x8000000
diff --git a/hikey.mk b/hikey.mk
new file mode 100644
index 0000000..2ee96e7
--- /dev/null
+++ b/hikey.mk
@@ -0,0 +1,423 @@
+BASH := $(shell which bash)
+ROOT ?= $(subst /build/,,$(shell pwd)/)
+DEBUG = 0
+
+################################################################################
+# Paths to git projects and various binaries
+################################################################################
+ARM_TF_PATH			?= $(ROOT)/arm-trusted-firmware
+ifeq ($(DEBUG),1)
+ARM_TF_BUILD			?= debug
+else
+ARM_TF_BUILD			?= release
+# In case user types something like 'make DEBUG=nonsensical ..',
+# we default to release build
+DEBUG				= 0
+endif
+
+EDK2_PATH 			?= $(ROOT)/edk2
+ifeq ($(DEBUG),1)
+EDK2_BIN 			?= $(EDK2_PATH)/Build/HiKey/DEBUG_GCC49/FV/BL33_AP_UEFI.fd
+EDK2_BUILD			?= DEBUG
+else
+EDK2_BIN 			?= $(EDK2_PATH)/Build/HiKey/RELEASE_GCC49/FV/BL33_AP_UEFI.fd
+EDK2_BUILD			?= RELEASE
+endif
+
+LINUX_PATH 			?= $(ROOT)/linux
+LINUX_CONFIG_ADDLIST		?= $(LINUX_PATH)/kernel.config
+
+OPTEE_OS_PATH 			?= $(ROOT)/optee_os
+OPTEE_OS_BIN 			?= $(OPTEE_OS_PATH)/out/arm-plat-hikey/core/tee.bin
+
+OPTEE_CLIENT_PATH 		?= $(ROOT)/optee_client
+OPTEE_CLIENT_EXPORT             ?= $(OPTEE_CLIENT_PATH)/out/export
+OPTEE_LINUXDRIVER_PATH 		?= $(ROOT)/optee_linuxdriver
+
+OPTEE_TEST_PATH 		?= $(ROOT)/optee_test
+OPTEE_TEST_OUT_PATH 		?= $(ROOT)/out/optee_test
+
+GEN_ROOTFS_PATH 		?= $(ROOT)/gen_rootfs
+GEN_ROOTFS_FILELIST 		?= $(GEN_ROOTFS_PATH)/filelist-tee.txt
+
+MCUIMAGE_BIN			?=$(ROOT)/out/mcuimage.bin
+USBNETSH_PATH			?=$(ROOT)/out/usbnet.sh
+STRACE_PATH			?=$(ROOT)/strace
+BOOT_IMG			?=$(ROOT)/out/boot-fat.uefi.img
+LLOADER_PATH			?=$(ROOT)/l-loader
+
+################################################################################
+# defines, macros, configuration etc
+################################################################################
+define KERNEL_VERSION
+$(shell cd $(LINUX_PATH) && make kernelversion)
+endef
+
+CCACHE ?= $(shell which ccache) # Don't remove this comment (space is needed)
+
+################################################################################
+# Targets
+################################################################################
+all: mcuimage arm-tf edk2 linux optee-os optee-client optee-linuxdriver xtest strace update_rootfs boot-img lloader
+
+clean: arm-tf-clean busybox-clean edk2-clean linux-clean optee-os-clean optee-client-clean optee-linuxdriver-clean xtest-clean strace-clean update_rootfs_clean boot-img-clean lloader-clean
+
+cleaner: clean mcuimage-cleaner busybox-cleaner linux-cleaner strace-cleaner
+
+-include toolchain.mk
+
+################################################################################
+# MCU Image
+################################################################################
+mcuimage:
+	@if [ ! -f "$(MCUIMAGE_BIN)" ]; then \
+		curl https://builds.96boards.org/releases/hikey/linaro/binaries/latest/mcuimage.bin -o $(MCUIMAGE_BIN); \
+	fi
+
+mcuimage-cleaner:
+	rm -f $(MCUIMAGE_BIN)
+
+################################################################################
+# ARM Trusted Firmware
+################################################################################
+arm-tf: mcuimage optee-os edk2
+	CFLAGS="-O0 -gdwarf-2" \
+	CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+	BL32=$(OPTEE_OS_BIN) \
+	BL33=$(EDK2_BIN) \
+	NEED_BL30=yes \
+	BL30=$(MCUIMAGE_BIN) \
+	make -C $(ARM_TF_PATH) \
+	       -j`getconf _NPROCESSORS_ONLN` \
+	       DEBUG=$(DEBUG) \
+	       PLAT=hikey \
+	       SPD=opteed \
+	       all fip
+
+arm-tf-clean:
+	CFLAGS="-O0 -gdwarf-2" \
+        CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+        BL32=$(OPTEE_OS_BIN) \
+        BL33=$(EDK2_BIN) \
+        NEED_BL30=yes \
+        BL30=$(MCUIMAGE_BIN) \
+        make -C $(ARM_TF_PATH) \
+               -j`getconf _NPROCESSORS_ONLN` \
+               DEBUG=$(DEBUG) \
+               PLAT=hikey \
+               SPD=opteed \
+               clean
+
+################################################################################
+# Busybox
+################################################################################
+busybox:
+	@if [ ! -d "$(GEN_ROOTFS_PATH)/build" ]; then \
+		cd $(GEN_ROOTFS_PATH); \
+		CC_DIR=$(AARCH64_PATH) \
+		$(GEN_ROOTFS_PATH)/generate-cpio-rootfs.sh hikey nocpio; \
+	fi
+
+busybox-clean:
+	cd $(GEN_ROOTFS_PATH); \
+	$(GEN_ROOTFS_PATH)/generate-cpio-rootfs.sh hikey clean
+
+busybox-cleaner:
+	rm -rf $(GEN_ROOTFS_PATH)/build
+	rm -rf $(GEN_ROOTFS_PATH)/filelist-final.txt
+
+################################################################################
+# EDK2 / Tianocore
+################################################################################
+# Make sure edksetup.sh only will be called once and that we don't rebuild
+# BaseTools again and again.
+$(EDK2_PATH)/Conf/target.txt:
+	set -e; \
+	cd $(EDK2_PATH); $(BASH) edksetup.sh; \
+	make -C $(EDK2_PATH)/BaseTools clean; \
+	make -C $(EDK2_PATH)/BaseTools; \
+
+define edk2-common
+	GCC49_AARCH64_PREFIX=$(AARCH64_CROSS_COMPILE) \
+	make -C $(EDK2_PATH) \
+		-f HisiPkg/HiKeyPkg/Makefile EDK2_ARCH=AARCH64 \
+		EDK2_DSC=HisiPkg/HiKeyPkg/HiKey.dsc \
+		EDK2_TOOLCHAIN=GCC49 EDK2_BUILD=$(EDK2_BUILD)
+endef
+
+edk2: $(EDK2_PATH)/Conf/target.txt
+	@if [ ! -f "$(EDK2_BIN)" ]; then \
+		set -e; \
+		cd $(EDK2_PATH); \
+		$(BASH) edksetup.sh; \
+		$(call edk2-common); \
+	fi
+
+edk2-clean:
+	set -e; \
+	cd $(EDK2_PATH); \
+	$(BASH) edksetup.sh; \
+	$(call edk2-common) clean; \
+	make -C $(EDK2_PATH)/BaseTools clean;
+
+################################################################################
+# Linux kernel
+################################################################################
+$(LINUX_PATH)/.config:
+	echo "# This file is merged with the kernel's default configuration" > $(LINUX_CONFIG_ADDLIST)
+	echo "# Disabling BTRFS gets rid of the RAID6 performance tests at boot time." >> $(LINUX_CONFIG_ADDLIST)
+	echo "# This shaves off a few seconds." >> $(LINUX_CONFIG_ADDLIST)
+	echo "CONFIG_USB_NET_DM9601=y" >> $(LINUX_CONFIG_ADDLIST)
+	echo "# CONFIG_BTRFS_FS is not set" >> $(LINUX_CONFIG_ADDLIST)
+	echo "" >> $(LINUX_CONFIG_ADDLIST)
+	echo "# Enable ftrace as per https://github.com/OP-TEE/optee_os/blob/master/documentation/debug.md#2-ftrace" >> $(LINUX_CONFIG_ADDLIST)
+	echo "CONFIG_GENERIC_TRACER=y" >> $(LINUX_CONFIG_ADDLIST)
+	echo "CONFIG_FTRACE=y" >> $(LINUX_CONFIG_ADDLIST)
+	echo "CONFIG_FUNCTION_TRACER=y" >> $(LINUX_CONFIG_ADDLIST)
+	echo "CONFIG_FUNCTION_GRAPH_TRACER=y" >> $(LINUX_CONFIG_ADDLIST)
+	echo "CONFIG_FTRACE_SYSCALLS=y" >> $(LINUX_CONFIG_ADDLIST)
+	echo "CONFIG_BRANCH_PROFILE_NONE=y" >> $(LINUX_CONFIG_ADDLIST)
+	echo "CONFIG_STACK_TRACER=y" >> $(LINUX_CONFIG_ADDLIST)
+	echo "CONFIG_DYNAMIC_FTRACE=y" >> $(LINUX_CONFIG_ADDLIST)
+	echo "CONFIG_FUNCTION_PROFILER=y" >> $(LINUX_CONFIG_ADDLIST)
+	echo "CONFIG_FTRACE_MCOUNT_RECORD=y" >> $(LINUX_CONFIG_ADDLIST)
+	cd $(LINUX_PATH); \
+	LOCALVERSION= \
+	CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+	ARCH=arm64 scripts/kconfig/merge_config.sh \
+    		arch/arm64/configs/defconfig $(LINUX_CONFIG_ADDLIST);
+
+linux-defconfig: $(LINUX_PATH)/.config
+
+linux-gen_init_cpio: linux-defconfig
+	make -C $(LINUX_PATH)/usr \
+		CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+		ARCH=arm64 \
+		LOCALVERSION= \
+		gen_init_cpio
+
+linux: linux-defconfig
+	make -C $(LINUX_PATH) \
+		CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+		ARCH=arm64 \
+		LOCALVERSION= \
+		-j`getconf _NPROCESSORS_ONLN` \
+		Image modules dtbs
+
+linux-defconfig-clean:
+	@if [ -f "$(LINUX_PATH)/.config" ]; then \
+		rm $(LINUX_PATH)/.config; \
+	fi
+	@if [ -f "$(LINUX_CONFIG_ADDLIST)" ]; then \
+		rm $(LINUX_CONFIG_ADDLIST); \
+	fi
+
+linux-clean: linux-defconfig-clean
+	make -C $(LINUX_PATH) \
+		CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+		ARCH=arm64 \
+		LOCALVERSION= \
+		-j`getconf _NPROCESSORS_ONLN` \
+		clean
+
+linux-cleaner: linux-defconfig-clean
+	make -C $(LINUX_PATH) \
+		CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+		ARCH=arm64 \
+		LOCALVERSION= \
+		-j`getconf _NPROCESSORS_ONLN` \
+		distclean
+
+################################################################################
+# OP-TEE
+################################################################################
+optee-os:
+	make -C $(OPTEE_OS_PATH) \
+		CROSS_COMPILE="$(CCACHE)$(AARCH32_CROSS_COMPILE)" \
+		CROSS_COMPILE_core="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+		CFG_ARM64_core=y \
+		PLATFORM=hikey \
+		CFG_TEE_CORE_LOG_LEVEL=3 \
+		DEBUG=$(DEBUG) \
+		-j`getconf _NPROCESSORS_ONLN`
+
+optee-os-clean:
+	make -C $(OPTEE_OS_PATH) \
+                CFG_ARM64_core=y \
+                PLATFORM=hikey \
+		clean
+
+optee-client:
+	make -C $(OPTEE_CLIENT_PATH) \
+		CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+		-j`getconf _NPROCESSORS_ONLN`
+
+optee-client-clean:
+	make -C $(OPTEE_CLIENT_PATH) clean
+
+optee-linuxdriver: linux
+	make -C $(LINUX_PATH) \
+		V=0 \
+		ARCH=arm64 \
+		CROSS_COMPILE="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+		LOCALVERSION= \
+		M=$(OPTEE_LINUXDRIVER_PATH) modules
+
+optee-linuxdriver-clean:
+	make -C $(LINUX_PATH) \
+                M=$(OPTEE_LINUXDRIVER_PATH) clean
+
+################################################################################
+# xtest / optee_test
+################################################################################
+xtest: optee-os optee-client
+	@if [ -d "$(OPTEE_TEST_PATH)" ]; then \
+		make -C $(OPTEE_TEST_PATH) \
+		-j`getconf _NPROCESSORS_ONLN` \
+		CROSS_COMPILE_HOST="$(CCACHE)$(AARCH64_CROSS_COMPILE)" \
+		CROSS_COMPILE_TA="$(CCACHE)$(AARCH32_CROSS_COMPILE)" \
+		TA_DEV_KIT_DIR=$(OPTEE_OS_PATH)/out/arm-plat-hikey/export-user_ta \
+		O=$(OPTEE_TEST_OUT_PATH); \
+	fi
+
+xtest-clean:
+	@if [ -d "$(OPTEE_TEST_PATH)" ]; then \
+		rm -rf $(OPTEE_TEST_OUT_PATH); \
+	fi
+
+################################################################################
+# strace
+################################################################################
+strace:
+	@if [ ! -f $(STRACE_PATH)/strace ]; then \
+		cd $(STRACE_PATH); \
+		./bootstrap; \
+		./configure --host=aarch64-linux-gnu CC="$(CCACHE)$(AARCH64_CROSS_COMPILE)gcc" LD=$(AARCH64_CROSS_COMPILE)ld; \
+		CC="$(CCACHE)$(AARCH64_CROSS_COMPILE)gcc" LD=$(AARCH64_CROSS_COMPILE)ld \
+			make -C $(STRACE_PATH); \
+	fi
+
+strace-clean:
+	@if [ -f $(STRACE_PATH)/strace ]; then \
+		CC="$(CCACHE)$(AARCH64_CROSS_COMPILE)gcc" LD=$(AARCH64_CROSS_COMPILE)ld \
+			make -C $(STRACE_PATH) clean; \
+	fi
+
+strace-cleaner:
+	rm -f $(STRACE_PATH)/Makefile $(STRACE_PATH)/configure
+
+################################################################################
+# Root FS
+################################################################################
+.PHONY: filelist-tee
+filelist-tee: xtest strace
+	@if [ ! -f "$(USBNETSH_PATH)" ]; then \
+		echo "#!/bin/sh" > $(USBNETSH_PATH); \
+		echo "#" >> $(USBNETSH_PATH); \
+		echo "# Script to bring eth0 up and start DHCP client" >> $(USBNETSH_PATH); \
+		echo "# Run it after plugging a USB ethernet adapter, for instance" >> $(USBNETSH_PATH); \
+		echo "" >> $(USBNETSH_PATH); \
+		echo "ip link set eth0 up" >> $(USBNETSH_PATH); \
+		echo "udhcpc -i eth0 -s /etc/udhcp/simple.script" >> $(USBNETSH_PATH); \
+	fi
+
+	@echo "# Files to add to filesystem.cpio.gz" > $(GEN_ROOTFS_FILELIST)
+	@echo "# Syntax: same as gen_rootfs/filelist.txt" >> $(GEN_ROOTFS_FILELIST)
+	@echo "" >> $(GEN_ROOTFS_FILELIST)
+
+	@echo "# Script called by udhcpc (DHCP client) to update the network configuration" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /etc/udhcp 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /etc/udhcp/simple.script $(GEN_ROOTFS_PATH)/busybox/examples/udhcp/simple.script 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "" >> $(GEN_ROOTFS_FILELIST)
+
+	@echo "# Run this manually after plugging a USB to ethernet adapter" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /usbnet.sh $(USBNETSH_PATH) 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "" >> $(GEN_ROOTFS_FILELIST)
+
+	@echo "# xtest / optee_test" >> $(GEN_ROOTFS_FILELIST)
+	@find $(OPTEE_TEST_OUT_PATH) -type f -name "xtest" | sed 's/\(.*\)/file \/bin\/xtest \1 755 0 0/g' >> $(GEN_ROOTFS_FILELIST)
+	@echo "" >> $(GEN_ROOTFS_FILELIST)
+
+	@echo "# TAs" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /lib/optee_armtz 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@find $(OPTEE_TEST_OUT_PATH) -name "*.ta" | \
+		sed 's/\(.*\)\/\(.*\)/file \/lib\/optee_armtz\/\2 \1\/\2 444 0 0/g' >> $(GEN_ROOTFS_FILELIST)
+	@echo "" >> $(GEN_ROOTFS_FILELIST)
+
+	@echo "# Secure storage dig" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /data 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /data/tee 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "" >> $(GEN_ROOTFS_FILELIST)
+
+	@echo "# OP-TEE device" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /lib/modules 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /lib/modules/$(call KERNEL_VERSION) 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /lib/modules/$(call KERNEL_VERSION)/optee.ko $(OPTEE_LINUXDRIVER_PATH)/core/optee.ko 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /lib/modules/$(call KERNEL_VERSION)/optee_armtz.ko $(OPTEE_LINUXDRIVER_PATH)/armtz/optee_armtz.ko 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "" >> $(GEN_ROOTFS_FILELIST)
+
+	@echo "# OP-TEE Client" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /bin/tee-supplicant $(OPTEE_CLIENT_EXPORT)/bin/tee-supplicant 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /lib/aarch64-linux-gnu 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /lib/aarch64-linux-gnu/libteec.so.1.0 $(OPTEE_CLIENT_EXPORT)/lib/libteec.so.1.0 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "slink /lib/aarch64-linux-gnu/libteec.so.1 libteec.so.1.0 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "slink /lib/aarch64-linux-gnu/libteec.so libteec.so.1 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "" >> $(GEN_ROOTFS_FILELIST)
+
+	@echo "# strace tool" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /bin/strace $(STRACE_PATH)/strace 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+
+update_rootfs: busybox optee-client optee-linuxdriver filelist-tee linux-gen_init_cpio
+	cat $(GEN_ROOTFS_PATH)/filelist-final.txt | sed '/fbtest/d' > $(GEN_ROOTFS_PATH)/filelist-all.txt
+	cat $(GEN_ROOTFS_PATH)/filelist-all.txt $(GEN_ROOTFS_PATH)/filelist-tee.txt > $(GEN_ROOTFS_PATH)/filelist.tmp
+	cd $(GEN_ROOTFS_PATH); \
+	        $(LINUX_PATH)/usr/gen_init_cpio $(GEN_ROOTFS_PATH)/filelist.tmp | gzip > $(GEN_ROOTFS_PATH)/filesystem.cpio.gz
+
+update_rootfs_clean:
+	cd $(GEN_ROOTFS_PATH); \
+	rm -f $(GEN_ROOTFS_PATH)/filesystem.cpio.gz $(GEN_ROOTFS_PATH)/filelist.tmp $(GEN_ROOTFS_PATH)/filelist-tee.txt $(GEN_ROOTFS_PATH)/filelist-all.txt; \
+	if [ -f "$(USBNETSH_PATH)" ]; then rm $(USBNETSH_PATH); fi;
+
+################################################################################
+# Boot Image
+################################################################################
+boot-img: linux update_rootfs
+	sudo -p "[sudo] Password:" true
+	if [ -d .tmpbootimg ] ; then sudo rm -rf .tmpbootimg ; fi
+	mkdir -p .tmpbootimg
+	dd if=/dev/zero of=$(BOOT_IMG) bs=512 count=131072 status=none
+	sudo mkfs.fat -n "BOOT IMG" $(BOOT_IMG) >/dev/null
+	sudo mount -o loop,rw,sync $(BOOT_IMG) .tmpbootimg
+	sudo cp $(LINUX_PATH)/arch/arm64/boot/Image $(LINUX_PATH)/arch/arm64/boot/dts/hi6220-hikey.dtb .tmpbootimg/
+	sudo cp $(GEN_ROOTFS_PATH)/filesystem.cpio.gz .tmpbootimg/initrd.img
+	sudo cp $(EDK2_PATH)/Build/HiKey/$(EDK2_BUILD)_GCC49/AARCH64/AndroidFastbootApp.efi .tmpbootimg/fastboot.efi
+	sudo umount .tmpbootimg
+	sudo rm -rf .tmpbootimg
+
+boot-img-clean:
+	rm -f $(BOOT_IMG)
+
+################################################################################
+# l-loader
+################################################################################
+lloader: arm-tf
+	if [ ! -h "$(LLOADER_PATH)/bl1.bin" ]; then \
+		ln -s $(ARM_TF_PATH)/build/hikey/$(ARM_TF_BUILD)/bl1.bin $(LLOADER_PATH)/bl1.bin; \
+	fi
+	make -C $(LLOADER_PATH) BL1=$(ARM_TF_PATH)/build/hikey/$(ARM_TF_BUILD)/bl1.bin CROSS_COMPILE="$(CCACHE)$(AARCH32_CROSS_COMPILE)"
+
+lloader-clean:
+	if [ -h "$(LLOADER_PATH)/bl1.bin" ]; then \
+		unlink $(LLOADER_PATH)/bl1.bin; \
+	fi
+	make -C $(LLOADER_PATH) clean;
+	if [ -f "$(LLOADER_PATH)/ptable.img" ]; then \
+		rm -f $(LLOADER_PATH)/ptable.img; \
+		rm -f $(LLOADER_PATH)/prm_ptable.img; \
+		rm -f $(LLOADER_PATH)/sec_ptable.img; \
+	fi
+	if [ -f "$(LLOADER_PATH)/l-loader" ]; then \
+		rm -f $(LLOADER_PATH)/l-loader; \
+		rm -f $(LLOADER_PATH)/temp.bin; \
+		rm -f $(LLOADER_PATH)/temp; \
+	fi
diff --git a/qemu.mk b/qemu.mk
new file mode 100644
index 0000000..7609aa3
--- /dev/null
+++ b/qemu.mk
@@ -0,0 +1,238 @@
+BASH := $(shell which bash)
+ROOT ?= $(subst /build/,,$(shell pwd)/)
+
+################################################################################
+# Paths to git projects and various binaries
+################################################################################
+LINUX_PATH 			?= $(ROOT)/linux
+
+OPTEE_OS_PATH 			?= $(ROOT)/optee_os
+OPTEE_OS_BIN 			?= $(OPTEE_OS_PATH)/out/arm-plat-vexpress/core/tee.bin
+
+OPTEE_CLIENT_PATH 		?= $(ROOT)/optee_client
+OPTEE_CLIENT_EXPORT		?= $(OPTEE_CLIENT_PATH)/out/export
+OPTEE_LINUXDRIVER_PATH 		?= $(ROOT)/optee_linuxdriver
+
+OPTEE_TEST_PATH 		?= $(ROOT)/optee_test
+OPTEE_TEST_OUT_PATH 		?= $(ROOT)/out/optee_test
+
+GEN_ROOTFS_PATH 		?= $(ROOT)/gen_rootfs
+GEN_ROOTFS_FILELIST 		?= $(GEN_ROOTFS_PATH)/filelist-tee.txt
+
+BIOS_QEMU_PATH			?= $(ROOT)/bios_qemu_tz_arm
+
+QEMU_PATH			?= $(ROOT)/qemu
+
+SOC_TERM_PATH			?= $(ROOT)/soc_term
+
+################################################################################
+# defines, macros, configuration etc
+################################################################################
+define KERNEL_VERSION
+$(shell cd $(LINUX_PATH) && make kernelversion)
+endef
+
+CCACHE ?= $(shell which ccache) # Don't remove this comment (space is needed)
+
+################################################################################
+# Targets
+################################################################################
+all: bios-qemu linux optee-os optee-client optee-linuxdriver qemu soc-term xtest
+all-clean: bios-qemu-clean busybox-clean linux-clean optee-os-clean \
+	optee-client-clean optee-linuxdriver-clean qemu-clean soc-term-clean
+
+-include toolchain.mk
+
+################################################################################
+# QEMU
+################################################################################
+define bios-qemu-common
+	make -C $(BIOS_QEMU_PATH) \
+		CROSS_COMPILE="$(CCACHE)$(AARCH32_CROSS_COMPILE)" \
+		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: linux update_rootfs optee-os
+	$(call bios-qemu-common)
+
+bios-qemu-clean:
+	$(call bios-qemu-common) clean
+
+qemu:
+	cd $(QEMU_PATH); ./configure --target-list=arm-softmmu --cc="$(CCACHE)gcc"
+	make -C $(QEMU_PATH) \
+		-j`getconf _NPROCESSORS_ONLN`
+
+qemu-clean:
+	make -C $(QEMU_PATH) distclean
+
+################################################################################
+# Busybox
+################################################################################
+busybox:
+	@if [ ! -d "$(GEN_ROOTFS_PATH)/build" ]; then \
+		cd $(GEN_ROOTFS_PATH); \
+			CC_DIR=$(AARCH32_PATH) \
+			PATH=${PATH}:$(LINUX_PATH)/usr \
+			$(GEN_ROOTFS_PATH)/generate-cpio-rootfs.sh vexpress; \
+	fi
+
+busybox-clean:
+	cd $(GEN_ROOTFS_PATH); \
+		$(GEN_ROOTFS_PATH)/generate-cpio-rootfs.sh vexpress clean
+
+
+################################################################################
+# Linux kernel
+################################################################################
+$(LINUX_PATH)/.config:
+	# Temporary fix until we have the driver integrated in the kernel
+	sed -i '/config ARM$$/a select DMA_SHARED_BUFFER' $(LINUX_PATH)/arch/arm/Kconfig;
+	make -C $(LINUX_PATH) ARCH=arm vexpress_defconfig
+
+linux-defconfig: $(LINUX_PATH)/.config
+
+linux: linux-defconfig
+	make -C $(LINUX_PATH) \
+		CROSS_COMPILE="$(CCACHE)$(AARCH32_CROSS_COMPILE)" \
+		LOCALVERSION= \
+		ARCH=arm \
+		-j`getconf _NPROCESSORS_ONLN`
+
+linux-clean:
+	make -C $(LINUX_PATH) \
+		CROSS_COMPILE="$(CCACHE)$(AARCH32_CROSS_COMPILE)" \
+		mrproper
+
+################################################################################
+# OP-TEE
+################################################################################
+optee-os:
+	make -C $(OPTEE_OS_PATH) \
+		CROSS_COMPILE="$(CCACHE)$(AARCH32_CROSS_COMPILE)" \
+		PLATFORM=vexpress \
+		PLATFORM_FLAVOR=qemu_virt \
+		CFG_TEE_CORE_LOG_LEVEL=3 \
+		DEBUG=1 \
+		-j`getconf _NPROCESSORS_ONLN`
+
+optee-os-clean:
+	make -C $(OPTEE_OS_PATH) \
+		PLATFORM=vexpress \
+		PLATFORM_FLAVOR=qemu_virt \
+		clean
+
+optee-client:
+	make -C $(OPTEE_CLIENT_PATH) \
+		CROSS_COMPILE="$(CCACHE)$(AARCH32_CROSS_COMPILE)" \
+		-j`getconf _NPROCESSORS_ONLN`
+
+optee-client-clean:
+	make -C $(OPTEE_CLIENT_PATH) clean
+
+optee-linuxdriver: linux
+	make -C $(LINUX_PATH) \
+		V=0 \
+		ARCH=arm \
+		CROSS_COMPILE="$(CCACHE)$(AARCH32_CROSS_COMPILE)" \
+		LOCALVERSION= \
+		M=$(OPTEE_LINUXDRIVER_PATH) modules
+
+optee-linuxdriver-clean:
+	make -C $(LINUX_PATH) \
+		M=$(OPTEE_LINUXDRIVER_PATH) clean
+
+################################################################################
+# Soc-term
+################################################################################
+soc-term:
+	make -C $(SOC_TERM_PATH)
+
+soc-term-clean:
+	make -C $(SOC_TERM_PATH) clean
+
+################################################################################
+# xtest / optee_test
+################################################################################
+xtest: optee-os optee-client
+	@if [ -d "$(OPTEE_TEST_PATH)" ]; then \
+		make -C $(OPTEE_TEST_PATH) \
+		-j`getconf _NPROCESSORS_ONLN` \
+		CROSS_COMPILE_HOST="$(CCACHE)$(AARCH32_CROSS_COMPILE)" \
+		CROSS_COMPILE_TA="$(CCACHE)$(AARCH32_CROSS_COMPILE)" \
+		TA_DEV_KIT_DIR=$(OPTEE_OS_PATH)/out/arm-plat-vexpress/export-user_ta \
+		O=$(OPTEE_TEST_OUT_PATH); \
+	fi
+
+################################################################################
+# Root FS
+################################################################################
+.PHONY: filelist-tee
+filelist-tee:
+	@echo "# xtest / optee_test" > $(GEN_ROOTFS_FILELIST)
+	@find $(OPTEE_TEST_OUT_PATH) -type f -name "xtest" | sed 's/\(.*\)/file \/bin\/xtest \1 755 0 0/g' >> $(GEN_ROOTFS_FILELIST)
+	@echo "# TAs" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /lib/optee_armtz 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@find $(OPTEE_TEST_OUT_PATH) -name "*.ta" | \
+		sed 's/\(.*\)\/\(.*\)/file \/lib\/optee_armtz\/\2 \1\/\2 444 0 0/g' >> $(GEN_ROOTFS_FILELIST)
+	@echo "# Secure storage dig" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /data 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /data/tee 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "# OP-TEE device" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /lib/modules 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /lib/modules/$(call KERNEL_VERSION) 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /lib/modules/$(call KERNEL_VERSION)/optee.ko $(OPTEE_LINUXDRIVER_PATH)/core/optee.ko 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /lib/modules/$(call KERNEL_VERSION)/optee_armtz.ko $(OPTEE_LINUXDRIVER_PATH)/armtz/optee_armtz.ko 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "# OP-TEE Client" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /bin/tee-supplicant $(OPTEE_CLIENT_EXPORT)/bin/tee-supplicant 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "dir /lib/arm-linux-gnueabihf 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "file /lib/arm-linux-gnueabihf/libteec.so.1.0 $(OPTEE_CLIENT_EXPORT)/lib/libteec.so.1.0 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "slink /lib/arm-linux-gnueabihf/libteec.so.1 libteec.so.1.0 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@echo "slink /lib/arm-linux-gnueabihf/libteec.so libteec.so.1 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+
+update_rootfs: busybox optee-client optee-linuxdriver xtest filelist-tee
+	cat $(GEN_ROOTFS_PATH)/filelist-final.txt $(GEN_ROOTFS_PATH)/filelist-tee.txt > $(GEN_ROOTFS_PATH)/filelist.tmp
+	cd $(GEN_ROOTFS_PATH); \
+		$(LINUX_PATH)/usr/gen_init_cpio $(GEN_ROOTFS_PATH)/filelist.tmp | gzip > $(GEN_ROOTFS_PATH)/filesystem.cpio.gz
+
+################################################################################
+# Run targets
+################################################################################
+define run-help
+	@echo "Run QEMU"
+	@echo QEMU is now waiting to start the execution
+	@echo Start execution with either a \'c\' followed by \<enter\> in the QEMU console or
+	@echo attach a debugger and continue from there.
+	@echo
+	@echo To run xtest paste the following on the serial 0 prompt
+	@echo modprobe optee_armtz
+	@echo sleep 0.1
+	@echo tee-supplicant\&
+	@echo sleep 0.1
+	@echo xtest
+	@echo
+	@echo To run a single test case replace the xtest command with for instance
+	@echo xtest 2001
+endef
+
+.PHONY: run
+# This target enforces updating root fs etc
+run: | bios-qemu run-only
+
+.PHONY: run-only
+run-only:
+	$(call run-help)
+	@gnome-terminal -e "$(BASH) -c '$(SOC_TERM_PATH)/soc_term 54320; exec /bin/bash -i'" --title="Normal world"
+	@gnome-terminal -e "$(BASH) -c '$(SOC_TERM_PATH)/soc_term 54321; exec /bin/bash -i'" --title="Secure world"
+	@sleep 1
+	$(QEMU_PATH)/arm-softmmu/qemu-system-arm \
+		-nographic \
+		-serial tcp:localhost:54320 -serial tcp:localhost:54321 \
+		-s -S -machine virt -cpu cortex-a15 \
+		-m 1057 \
+		-bios $(ROOT)/out/bios-qemu/bios.bin
+
diff --git a/toolchain.mk b/toolchain.mk
new file mode 100644
index 0000000..c6a17df
--- /dev/null
+++ b/toolchain.mk
@@ -0,0 +1,34 @@
+################################################################################
+# Toolchains
+################################################################################
+ROOT				?= ${HOME}/devel/optee
+TOOLCHAIN_ROOT 			?= $(ROOT)/toolchains
+
+AARCH32_PATH 			?= $(TOOLCHAIN_ROOT)/aarch32
+AARCH32_CROSS_COMPILE 		?= $(AARCH32_PATH)/bin/arm-linux-gnueabihf-
+AARCH32_GCC_VERSION 		?= gcc-linaro-arm-linux-gnueabihf-4.9-2014.08_linux
+SRC_AARCH32_GCC 		?= http://releases.linaro.org/14.08/components/toolchain/binaries/${AARCH32_GCC_VERSION}.tar.xz
+
+AARCH64_PATH 			?= $(TOOLCHAIN_ROOT)/aarch64
+AARCH64_CROSS_COMPILE 		?= $(AARCH64_PATH)/bin/aarch64-linux-gnu-
+AARCH64_GCC_VERSION 		?= gcc-linaro-aarch64-linux-gnu-4.9-2014.08_linux
+SRC_AARCH64_GCC 		?= http://releases.linaro.org/14.08/components/toolchain/binaries/${AARCH64_GCC_VERSION}.tar.xz
+
+AARCH64_NONE_PATH 		?= $(TOOLCHAIN_ROOT)/aarch64-none-elf
+AARCH64_NONE_CROSS_COMPILE 	?= $(AARCH64_NONE_PATH)/bin/aarch64-none-elf-
+AARCH64_NONE_GCC_VERSION 	?= gcc-linaro-aarch64-none-elf-4.9-2014.07_linux
+SRC_AARCH64_NONE_GCC 		?= http://releases.linaro.org/14.07/components/toolchain/binaries/${AARCH64_NONE_GCC_VERSION}.tar.xz
+
+toolchains:
+	mkdir -p $(AARCH32_PATH)
+	curl $(SRC_AARCH32_GCC) -o $(TOOLCHAIN_ROOT)/$(AARCH32_GCC_VERSION).tar.xz
+	tar xf $(TOOLCHAIN_ROOT)/$(AARCH32_GCC_VERSION).tar.xz -C $(AARCH32_PATH) --strip-components=1
+
+	mkdir -p $(AARCH64_PATH)
+	curl $(SRC_AARCH64_GCC) -o $(TOOLCHAIN_ROOT)/$(AARCH64_GCC_VERSION).tar.xz
+	tar xf $(TOOLCHAIN_ROOT)/$(AARCH64_GCC_VERSION).tar.xz -C $(AARCH64_PATH) --strip-components=1
+
+	mkdir -p $(AARCH64_NONE_PATH)
+	curl $(SRC_AARCH64_NONE_GCC) -o $(TOOLCHAIN_ROOT)/$(AARCH64_NONE_GCC_VERSION).tar.xz
+	tar xf $(TOOLCHAIN_ROOT)/$(AARCH64_NONE_GCC_VERSION).tar.xz -C $(AARCH64_NONE_PATH) --strip-components=1
+