diff --git a/fvp.mk b/fvp.mk
index f24dbdd43f7de4456594ae00834027391163a9d8..510ee4ee9629961a358c7fb8320f176120b34a7f 100644
--- a/fvp.mk
+++ b/fvp.mk
@@ -150,12 +150,12 @@ filelist-tee:
 	@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)
-	@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
+	@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 $(ROOTFS_LIBPATH) 755 0 0" >> $(GEN_ROOTFS_FILELIST)
diff --git a/hikey.mk b/hikey.mk
index bb2f3fb12aceeed3271df1af5ef3f9c7106fef27..a403cdfe647e380f013ea129024fc7b2442f2b10 100644
--- a/hikey.mk
+++ b/hikey.mk
@@ -273,12 +273,12 @@ filelist-all: busybox
 	find $(OPTEE_TEST_OUT_PATH) -type f -name "xtest" | sed 's/\(.*\)/file \/bin\/xtest \1 755 0 0/g' >> $(GEN_ROOTFS_PATH)/filelist-all.txt; \
 	find $(OPTEE_TEST_OUT_PATH) -name "*.ta" | \
 		sed 's/\(.*\)\/\(.*\)/file \/lib\/optee_armtz\/\2 \1\/\2 444 0 0/g' >> $(GEN_ROOTFS_PATH)/filelist-all.txt
-	@if [ -e $(OPTEE_GENDRV_MODULE) ]; then
-		@echo "# OP-TEE device" >> $(GEN_ROOTFS_PATH)/filelist-all.txt
-		@echo "dir /lib/modules 755 0 0" >> $(GEN_ROOTFS_PATH)/filelist-all.txt
-		@echo "dir /lib/modules/$(call KERNEL_VERSION) 755 0 0" >> $(GEN_ROOTFS_PATH)/filelist-all.txt
-		@echo "file /lib/modules/$(call KERNEL_VERSION)/optee.ko $(OPTEE_GENDRV_MODULE) 755 0 0" >> $(GEN_ROOTFS_PATH)/filelist-all.txt
-	@fi
+	@if [ -e $(OPTEE_GENDRV_MODULE) ]; then \
+		echo "# OP-TEE device" >> $(GEN_ROOTFS_PATH)/filelist-all.txt; \
+		echo "dir /lib/modules 755 0 0" >> $(GEN_ROOTFS_PATH)/filelist-all.txt; \
+		echo "dir /lib/modules/$(call KERNEL_VERSION) 755 0 0" >> $(GEN_ROOTFS_PATH)/filelist-all.txt; \
+		echo "file /lib/modules/$(call KERNEL_VERSION)/optee.ko $(OPTEE_GENDRV_MODULE) 755 0 0" >> $(GEN_ROOTFS_PATH)/filelist-all.txt; \
+	fi
 
 update_rootfs: optee-client xtest aes-perf sha-perf strace filelist-all linux-gen_init_cpio
 	cd $(GEN_ROOTFS_PATH); \
diff --git a/juno.mk b/juno.mk
index 22f836f58d3dc91202daca962f97493585b8304c..217201f54037af3cee262304ede58b5b65be9e59 100644
--- a/juno.mk
+++ b/juno.mk
@@ -142,12 +142,12 @@ filelist-tee:
 	@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)
-	@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
+	@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/aarch64-linux-gnu 755 0 0" >> $(GEN_ROOTFS_FILELIST)
diff --git a/mediatek.mk b/mediatek.mk
index 3ad0af446a20242cc8fc1001c99e0b39d905ddf9..72416ec690335b89ec4f8cec718e9e825c324344 100644
--- a/mediatek.mk
+++ b/mediatek.mk
@@ -117,12 +117,12 @@ filelist-tee:
 	@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)
-	@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
+	@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/aarch64-linux-gnu 755 0 0" >> $(GEN_ROOTFS_FILELIST)
diff --git a/qemu.mk b/qemu.mk
index c41eb394cf3511c20673a5eb950c0354723bd065..2fa18d5bbbe5179c50017cb02816c8f932e3f808 100644
--- a/qemu.mk
+++ b/qemu.mk
@@ -136,12 +136,12 @@ filelist-tee: xtest
 	@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)
-	@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
+	@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)