fvp: generic driver
Build support for generic driver on FVP.
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
diff --git a/fvp.mk b/fvp.mk
index 86ce0a0..0b36b79 100644
--- a/fvp.mk
+++ b/fvp.mk
@@ -27,9 +27,9 @@
################################################################################
# Targets
################################################################################
-all: arm-tf edk2 linux optee-os optee-client optee-linuxdriver generate-dtb xtest
+all: arm-tf edk2 linux optee-os optee-client xtest
all-clean: arm-tf-clean busybox-clean edk2-clean optee-os-clean \
- optee-client-clean optee-linuxdriver-clean
+ optee-client-clean
-include toolchain.mk
@@ -76,7 +76,7 @@
-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"
+ EDK2_MACROS="-n 6 -D ARM_FOUNDATION_FVP=1 -D ARM_FVP_BOOT_ANDROID_FROM_SEMIHOSTING=1"
endef
edk2: edk2-common
@@ -120,19 +120,6 @@
optee-client-clean: optee-client-clean-common
-OPTEE_LINUXDRIVER_COMMON_FLAGS += ARCH=arm64
-optee-linuxdriver: optee-linuxdriver-common
-
-OPTEE_LINUXDRIVER_CLEAN_COMMON_FLAGS += ARCH=arm64
-optee-linuxdriver-clean: optee-linuxdriver-clean-common
-
-generate-dtb: linux
- $(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
################################################################################
@@ -166,8 +153,7 @@
@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 "file /lib/modules/$(call KERNEL_VERSION)/optee.ko $(LINUX_PATH)/drivers/tee/optee/optee.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 $(ROOTFS_LIBPATH) 755 0 0" >> $(GEN_ROOTFS_FILELIST)
@@ -175,7 +161,7 @@
@echo "slink $(ROOTFS_LIBPATH)/libteec.so.1 libteec.so.1.0 755 0 0" >> $(GEN_ROOTFS_FILELIST)
@echo "slink $(ROOTFS_LIBPATH)/libteec.so libteec.so.1 755 0 0" >> $(GEN_ROOTFS_FILELIST)
-update_rootfs: busybox optee-client optee-linuxdriver xtest filelist-tee
+update_rootfs: busybox optee-client 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
@@ -189,13 +175,14 @@
$(MAKE) run-only
run-only:
- @ln -sf $(LINUX_PATH)/arch/arm64/boot/Image $(FOUNDATION_PATH)
- @ln -sf $(GEN_ROOTFS_PATH)/filesystem.cpio.gz $(FOUNDATION_PATH)
+ @ln -sf $(LINUX_PATH)/arch/arm64/boot/Image $(FOUNDATION_PATH)/kernel
+ @ln -sf $(GEN_ROOTFS_PATH)/filesystem.cpio.gz $(FOUNDATION_PATH)/ramdisk.img
+ @ln -sf $(LINUX_PATH)/arch/arm64/boot/dts/arm/foundation-v8.dtb $(FOUNDATION_PATH)/fdt.dtb
@cd $(FOUNDATION_PATH); \
$(FOUNDATION_PATH)/models/Linux64_GCC-4.7/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
+ --data="$(ARM_TF_PATH)/build/fvp/debug/bl1.bin"@0x0 \
+ --data="$(ARM_TF_PATH)/build/fvp/debug/fip.bin"@0x8000000