qemu: generic driver
Build support for generic driver on QEMU.
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
diff --git a/kconfigs/qemu.conf b/kconfigs/qemu.conf
index c808aac..1976bb4 100644
--- a/kconfigs/qemu.conf
+++ b/kconfigs/qemu.conf
@@ -1,4 +1,4 @@
-CONFIG_DRM=y
-### These two lines prevent random failures of "make check" in Travis CI
+CONFIG_TEE=y
+CONFIG_OPTEE=y
+### This prevents random failures of "make check" in Travis CI
CONFIG_PREEMPT=y
-# CONFIG_JFFS2_FS is not set
diff --git a/qemu.mk b/qemu.mk
index 445662f..e597735 100644
--- a/qemu.mk
+++ b/qemu.mk
@@ -25,8 +25,7 @@
################################################################################
all: bios-qemu qemu soc-term
all-clean: bios-qemu-clean busybox-clean linux-clean optee-os-clean \
- optee-client-clean optee-linuxdriver-clean qemu-clean soc-term-clean \
- check-clean
+ optee-client-clean qemu-clean soc-term-clean check-clean
-include toolchain.mk
@@ -105,12 +104,6 @@
optee-client-clean: optee-client-clean-common
-OPTEE_LINUXDRIVER_COMMON_FLAGS += ARCH=arm
-optee-linuxdriver: optee-linuxdriver-common
-
-OPTEE_LINUXDRIVER_CLEAN_COMMON_FLAGS += ARCH=arm
-optee-linuxdriver-clean: optee-linuxdriver-clean-common
-
################################################################################
# Soc-term
################################################################################
@@ -146,8 +139,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 /lib/arm-linux-gnueabihf 755 0 0" >> $(GEN_ROOTFS_FILELIST)
@@ -155,7 +147,7 @@
@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 filelist-tee
+update_rootfs: busybox optee-client 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