commit 9f0d120c15af5223792a50098d9b4b5d736d10a0
author Victor Chong <victor.chong@linaro.org> Sat Apr 23 16:28:31 2016 +0100
committer Victor Chong <victor.chong@linaro.org> Mon Apr 25 17:10:16 2016 +0100
tree 35868094ff2bc7d513b5fe9259a75a92be40bb51
parent a40320b1cf8d2daa42e295ba4659e5561477b606

Add driver to filesystem only if built as module.

Signed-off-by: Victor Chong <victor.chong@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>

qemu.mk

diff --git a/qemu.mk b/qemu.mk
index b308b0f..c41eb39 100644
--- a/qemu.mk
+++ b/qemu.mk
@@ -136,10 +136,12 @@
 	@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 $(LINUX_PATH)/drivers/tee/optee/optee.ko 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@if [ -e $(OPTEE_GENDRV_MODULE) ]; then
+		@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_GENDRV_MODULE) 755 0 0" >> $(GEN_ROOTFS_FILELIST)
+	@fi
 	@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)