[lib][trusty][ipc] Rename tipc_dev to tipc_dev_virtio
Add an option to disable standard virtio based TIPC device
is an alternative TIPC device implementation is required.
Change-Id: Ib215ce5c5365f8deb34032b62d3f6ef2d355cade
diff --git a/lib/trusty/include/lib/trusty/tipc_dev.h b/lib/trusty/include/lib/trusty/tipc_virtio_dev.h
similarity index 100%
rename from lib/trusty/include/lib/trusty/tipc_dev.h
rename to lib/trusty/include/lib/trusty/tipc_virtio_dev.h
diff --git a/lib/trusty/rules.mk b/lib/trusty/rules.mk
index a5ca78f..8f667ef 100644
--- a/lib/trusty/rules.mk
+++ b/lib/trusty/rules.mk
@@ -50,12 +50,17 @@
GLOBAL_DEFINES += WITH_WAIT_ANY_SUPPORT=1
endif
+# by default we want to enable virtio TIPC device
+WITH_TRUSTY_VIRTIO_IPC_DEV ?= true
+
+ifeq (true, $(call TOBOOL,$(WITH_TRUSTY_VIRTIO_IPC_DEV)))
MODULE_SRCS += \
$(LOCAL_DIR)/vqueue.c \
$(LOCAL_DIR)/smcall.c \
$(LOCAL_DIR)/trusty_virtio.c \
- $(LOCAL_DIR)/tipc_dev.c \
+ $(LOCAL_DIR)/tipc_virtio_dev.c \
$(LOCAL_DIR)/tipc_dev_ql.c
+endif
ifneq (true,$(call TOBOOL,$(WITH_CUSTOM_TRUSTY_IPC_CONFIG)))
MODULE_SRCS += \
diff --git a/lib/trusty/tipc_config.c b/lib/trusty/tipc_config.c
index 5d7fc8e..bddd6e3 100644
--- a/lib/trusty/tipc_config.c
+++ b/lib/trusty/tipc_config.c
@@ -25,7 +25,7 @@
#include <err.h>
#include <trace.h>
-#include <lib/trusty/tipc_dev.h>
+#include <lib/trusty/tipc_virtio_dev.h>
#include <lk/init.h>
/* Default TIPC device (/dev/trusty-ipc-dev0) */
diff --git a/lib/trusty/tipc_dev.c b/lib/trusty/tipc_virtio_dev.c
similarity index 99%
rename from lib/trusty/tipc_dev.c
rename to lib/trusty/tipc_virtio_dev.c
index ba2b611..89ffcfd 100644
--- a/lib/trusty/tipc_dev.c
+++ b/lib/trusty/tipc_virtio_dev.c
@@ -44,7 +44,7 @@
#include <lib/trusty/handle.h>
#include <lib/trusty/ipc.h>
#include <lib/trusty/ipc_msg.h>
-#include <lib/trusty/tipc_dev.h>
+#include <lib/trusty/tipc_virtio_dev.h>
#define LOCAL_TRACE 0
