Merge branch 'ipc-3.23-next' into ipc-next

[ipc/ipcdev.git] / qnx / Makefile

diff --git a/qnx/Makefile b/qnx/Makefile
index bdfddc573b4ba91e524d2a46e3af6e9a01a6ec52..59fdf66f69f654362fd75b1bc85cdf6213cb0175 100644 (file)
--- a/qnx/Makefile
+++ b/qnx/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2013, Texas Instruments Incorporated
+# Copyright (c) 2013-2014, Texas Instruments Incorporated
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -30,10 +30,14 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-ifeq ("$(PLATFORM)","omap5432")
+ifeq ("$(PLATFORM)","OMAP54XX")
     SYSLINK_PLATFORM=omap5430
-else ifeq ("$(PLATFORM)","vayu")
-    SYSLINK_PLATFORM=$(PLATFORM)
+else ifeq ("$(PLATFORM)","DRA7XX")
+    SYSLINK_PLATFORM=vayu
+else ifeq ("$(PLATFORM)","")
+    $(error Empty PLATFORM variable.  Did you forget to set in it products.mak?)
+else
+    $(error Unsupported platform: $(PLATFORM))
 endif
 
 all:  utils ipc3x_dev libs tests
@@ -50,11 +54,11 @@ tests: libs
 
 ipc3x_dev: utils
        @cd src/ipc3x_dev; \
-            make SYSLINK_PLATFORM=$(SYSLINK_PLATFORM) SMP=1 VIRTIO=$(BUILD_FOR_VIRTIO)
+            make SYSLINK_PLATFORM=$(SYSLINK_PLATFORM) SMP=1 QNX_CFLAGS=$(QNX_CFLAGS)
 
 install:
        @cd src/ipc3x_dev; make SYSLINK_PLATFORM=$(SYSLINK_PLATFORM) \
-               SMP=1 VIRTIO=$(BUILD_FOR_VIRTIO) USE_INSTALL_ROOT=1 \
+               SMP=1 USE_INSTALL_ROOT=1 \
                INSTALL_ROOT_nto=$(DESTDIR) install
        @cd src/mm; make USE_INSTALL_ROOT=1 DESTDIR=$(DESTDIR) \
                INSTALL_ROOT_nto=$(DESTDIR) install
@@ -73,4 +77,4 @@ clean:
        @cd src/utils; make clean
        @cd src/tests; make clean
        @cd src/ipc3x_dev; \
-       make clean SYSLINK_PLATFORM=$(SYSLINK_PLATFORM) SMP=1 VIRTIO=$(BUILD_FOR_VIRTIO)
+       make clean SYSLINK_PLATFORM=$(SYSLINK_PLATFORM) SMP=1