QNX IPC: Build - Add Vayu Build to the QNX IPC
authorAngela Stegmaier <angelabaker@ti.com>
Mon, 8 Apr 2013 21:18:38 +0000 (16:18 -0500)
committerVW <vwan@ti.com>
Tue, 30 Apr 2013 17:28:03 +0000 (10:28 -0700)
Add the Vayu Build to the QNX IPC and update the build
files to allow specification of the device in the
products.mak file.

Signed-off-by: Angela Stegmaier <angelabaker@ti.com>
ipc-qnx.mak
products.mak
qnx/Makefile
qnx/src/ipc3x_dev/tiler/resmgr/tiler/common.mk
qnx/src/ipc3x_dev/tiler/tiler_pat/common.mk

index 7e2429a15b88c87bd49d8be4787dd053d0e807ca..5ea54ddc57faba16e51f4452bb6c759952f2b2f4 100644 (file)
@@ -50,20 +50,21 @@ endif
 
 all: .qnx
 
-.qnx: .qnx,omap5432
+.qnx: .qnx,$(DEVICE)
 
 .qnx,%: PATH:=$(QNX_PATH):$(PATH)
 .qnx,%:
        @echo "building Qnx user libraries for" $(*:.qnx,=) "..."
        @make -C qnx \
                 IPC_REPO=`pwd` \
-                PLATFORM=$(*:.qnx,=)
+                PLATFORM=$(*:.qnx,=) \
+                BUILD_FOR_VIRTIO=$(BUILD_FOR_VIRTIO)
 
 clean:
        @echo "cleaning Qnx user libraries ..."
        @make -C qnx clean
 
-install: .install,omap5432
+install: .install,$(DEVICE)
 
 .install,%: PATH:=$(QNX_PATH):$(PATH)
 .install,%:
@@ -72,5 +73,6 @@ install: .install,omap5432
        @make -C qnx \
                 IPC_REPO=`pwd` \
                 PLATFORM=$(*:.qnx,=) \
+                BUILD_FOR_VIRTIO=$(BUILD_FOR_VIRTIO) \
                DESTDIR=$(DESTDIR) \
                install
index 5e74c17dbc841b744bfdf830e926e64cdfaa2bf5..c528bae186f04fc4ddf3a7e6f6167d5f96d443a5 100644 (file)
@@ -57,6 +57,19 @@ QNX_INSTALL_DIR ?=
 # Set up destination for target binaries
 DESTDIR ?=
 
+# List of supported devices (choose one): omap5432, vayu
+#
+DEVICE = _device_
+
+# Define the product variables for the device you will be using.
+#
+######## For vayu device ########
+ifeq ("$(DEVICE)","vayu")
+BUILD_FOR_VIRTIO        ?= true
+else
+BUILD_FOR_VIRTIO        ?= false
+endif
+
 #################### IPC Bios ####################
 
 # Set up required dependencies for IPC Bios builds
index cca3e59874da6c1fb5f419354e369dee07b86ac6..dc8d6115a3d8b2d5efe637cfbfc0bff0ccf41b66 100644 (file)
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+ifeq ("$(PLATFORM)","omap5432")
+    SYSLINK_PLATFORM=omap5430
+    TILER_PLATFORM=omap5430
+else ifeq ("$(PLATFORM)","vayu")
+    SYSLINK_PLATFORM=$(PLATFORM)
+    TILER_PLATFORM=$(PLATFORM)
+endif
+
 all:  utils ipc3x_dev libs tests
 
 libs: ipc3x_dev
@@ -45,11 +53,11 @@ tests: libs
 
 ipc3x_dev: utils
        @cd src/ipc3x_dev; \
-            make SYSLINK_PLATFORM=omap5430 TILER_PLATFORM=omap5430 SMP=1
+            make SYSLINK_PLATFORM=$(SYSLINK_PLATFORM) TILER_PLATFORM=$(TILER_PLATFORM) SMP=1 VIRTIO=$(BUILD_FOR_VIRTIO)
 
 install:
-       @cd src/ipc3x_dev; make SYSLINK_PLATFORM=omap5430 \
-               TILER_PLATFORM=omap5430 SMP=1 USE_INSTALL_ROOT=1 \
+       @cd src/ipc3x_dev; make SYSLINK_PLATFORM=$(SYSLINK_PLATFORM) \
+               TILER_PLATFORM=$(TILER_PLATFORM) SMP=1 VIRTIO=$(BUILD_FOR_VIRTIO) USE_INSTALL_ROOT=1 \
                INSTALL_ROOT_nto=$(DESTDIR) install
        @cd src/tests; make USE_INSTALL_ROOT=1 DESTDIR=$(DESTDIR) \
                INSTALL_ROOT_nto=$(DESTDIR) install
@@ -61,4 +69,4 @@ clean:
        @cd src/utils; make clean
        @cd src/tests; make clean
        @cd src/ipc3x_dev; \
-            make clean SYSLINK_PLATFORM=omap5430 TILER_PLATFORM=omap5430 SMP=1
+            make clean SYSLINK_PLATFORM=$(SYSLINK_PLATFORM) TILER_PLATFORM=$(TILER_PLATFORM) SMP=1 VIRTIO=$(BUILD_FOR_VIRTIO)
index 38672de9836ee76c756cbf90e624ba9baf27eda3..893a21026bcc909a4c71aec324f0f6422c28f522 100644 (file)
@@ -57,13 +57,16 @@ endif # ifeq ("$(TILER_PLATFORM)", "omap4430")
 ifeq ("$(TILER_PLATFORM)", "omap5430")
 CCOPTS += -DTILER_PLATFORM_OMAP5
 endif # ifeq ("$(TILER_PLATFORM)", "omap5430")
+ifeq ("$(TILER_PLATFORM)", "vayu")
+CCOPTS += -DTILER_PLATFORM_OMAP5
+endif # ifeq ("$(TILER_PLATFORM)", "vayu")
 
 EXTRA_INCVPATH+=$(PROJECT_ROOT)/public \
                                $(PROJECT_ROOT)/../../tiler_pat
 EXTRA_SRCVPATH+=$(PROJECT_ROOT)/tcm
 
-ifneq ("$(TILER_PLATFORM)", "omap5430")
+ifeq ("$(TILER_PLATFORM)", "omap4430")
 LIBS += login
-endif # ifneq ("$(TILER_PLATFORM)", "omap5430")
+endif # ifneq ("$(TILER_PLATFORM)", "omap4430")
 
 include $(MKFILES_ROOT)/qtargets.mk
index c0cf3e4741223dbf196e280647ca675a396d6178..5281df600c9be3a00f19be757b381cefb4f00dd6 100644 (file)
@@ -55,6 +55,9 @@ endif # ifeq ("$(TILER_PLATFORM)", "omap4430")
 ifeq ("$(TILER_PLATFORM)", "omap5430")
 CCOPTS += -DTILER_PLATFORM_OMAP5
 endif # ifeq ("$(TILER_PLATFORM)", "omap5430")
+ifeq ("$(TILER_PLATFORM)", "vayu")
+CCOPTS += -DTILER_PLATFORM_OMAP5
+endif # ifeq ("$(TILER_PLATFORM)", "vayu")
 
 USEFILE =
 NAME = tiler_pat