diff options
| author | Chris Ring <cring@ti.com> | 2013-10-14 15:32:58 -0700 |
|---|---|---|
| committer | Chris Ring <cring@ti.com> | 2013-10-15 12:16:18 -0700 |
| commit | b3eb9af69c6f27aed17810660ab709978a7ac794 (patch) | |
| tree | 2f134fc1b03af8507ac75425a903b4713994f840 | |
| parent | 0820447553cb1e36a45320684fa548abbf7edde4 (diff) | |
| download | ipc-b3eb9af69c6f27aed17810660ab709978a7ac794.tar.gz | |
Build: Align products.mak variables across OS's
The make variable to indicate a platform is now consistent
between BIOS, QNX and Linux, and only needs to be set once.
Note that this is a compatibility break for consumers (e.g. SDKs)
which automate the consumption/build of IPC. This is consciously
being introduced in a new Major.minor release (3.20) to keep
from breaking 3.00 and 3.10 users.
This resolves SDOCM00103415.
| -rwxr-xr-x | configure | 30 | ||||
| -rw-r--r-- | configure.ac | 26 | ||||
| -rw-r--r-- | ipc-bios.bld | 14 | ||||
| -rw-r--r-- | ipc-qnx.mak | 12 | ||||
| -rw-r--r-- | products.mak | 10 | ||||
| -rw-r--r-- | qnx/Makefile | 6 |
6 files changed, 43 insertions, 55 deletions
@@ -1063,9 +1063,9 @@ Some influential environment variables: CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor - PLATFORM Platform to build. Options are: 'omapl138' 'omap54xx_smp' - 'tci6636' 'tci6638' and 'dra7xx'. If not defined all platforms - will be built. + PLATFORM Platform to build. Options are: 'OMAPL138' 'OMAP54XX' 'TCI6636' + 'TCI6638' and 'DRA7XX'. If not defined all platforms will be + built. CMEM_INSTALL_DIR Installation path directory to the CMEM libraries KERNEL_INSTALL_DIR @@ -16782,27 +16782,27 @@ done # Test platform variable for setting -if test "x$PLATFORM" = "xomapl138"; then +if test "x$PLATFORM" = "xOMAPL138"; then { echo "$as_me:$LINENO: PLATFORM is set to ${PLATFORM}" >&5 echo "$as_me: PLATFORM is set to ${PLATFORM}" >&6;} else - if test "x$PLATFORM" = "xtci6614"; then + if test "x$PLATFORM" = "xTCI6614"; then { echo "$as_me:$LINENO: PLATFORM is set to ${PLATFORM}" >&5 echo "$as_me: PLATFORM is set to ${PLATFORM}" >&6;} else - if test "x$PLATFORM" = "xtci6636"; then + if test "x$PLATFORM" = "xTCI6636"; then { echo "$as_me:$LINENO: PLATFORM is set to ${PLATFORM}" >&5 echo "$as_me: PLATFORM is set to ${PLATFORM}" >&6;} else - if test "x$PLATFORM" = "xtci6638"; then + if test "x$PLATFORM" = "xTCI6638"; then { echo "$as_me:$LINENO: PLATFORM is set to ${PLATFORM}" >&5 echo "$as_me: PLATFORM is set to ${PLATFORM}" >&6;} else - if test "x$PLATFORM" = "xomap54xx_smp"; then + if test "x$PLATFORM" = "xOMAP54XX"; then { echo "$as_me:$LINENO: PLATFORM is set to ${PLATFORM}" >&5 echo "$as_me: PLATFORM is set to ${PLATFORM}" >&6;} else - if test "x$PLATFORM" = "xdra7xx"; then + if test "x$PLATFORM" = "xDRA7XX"; then { echo "$as_me:$LINENO: PLATFORM is set to ${PLATFORM}" >&5 echo "$as_me: PLATFORM is set to ${PLATFORM}" >&6;} else @@ -16851,7 +16851,7 @@ fi # Define specific variables to be used in Makefile.am -if test "x$PLATFORM" = "xomapl138"; then +if test "x$PLATFORM" = "xOMAPL138"; then OMAPL138_TRUE= OMAPL138_FALSE='#' else @@ -16861,7 +16861,7 @@ fi -if test "x$PLATFORM" = "xtci6614"; then +if test "x$PLATFORM" = "xTCI6614"; then TCI6614_TRUE= TCI6614_FALSE='#' else @@ -16871,7 +16871,7 @@ fi -if test "x$PLATFORM" = "xtci6636"; then +if test "x$PLATFORM" = "xTCI6636"; then TCI6636_TRUE= TCI6636_FALSE='#' else @@ -16881,7 +16881,7 @@ fi -if test "x$PLATFORM" = "xtci6638"; then +if test "x$PLATFORM" = "xTCI6638"; then TCI6638_TRUE= TCI6638_FALSE='#' else @@ -16891,7 +16891,7 @@ fi -if test "x$PLATFORM" = "xomap54xx_smp"; then +if test "x$PLATFORM" = "xOMAP54XX"; then OMAP54XX_SMP_TRUE= OMAP54XX_SMP_FALSE='#' else @@ -16901,7 +16901,7 @@ fi -if test "x$PLATFORM" = "xdra7xx"; then +if test "x$PLATFORM" = "xDRA7XX"; then DRA7XX_TRUE= DRA7XX_FALSE='#' else diff --git a/configure.ac b/configure.ac index 355d228..a75b07f 100644 --- a/configure.ac +++ b/configure.ac @@ -67,23 +67,23 @@ AC_SUBST([AM_LDFLAGS]) # Add config variables/options and check them # Note that 6614 isn't documented and, though it may work, is planned for removal -AC_ARG_VAR(PLATFORM, Platform to build. Options are: 'omapl138' 'omap54xx_smp' 'tci6636' 'tci6638' and 'dra7xx'. If not defined all platforms will be built.) +AC_ARG_VAR(PLATFORM, Platform to build. Options are: 'OMAPL138' 'OMAP54XX' 'TCI6636' 'TCI6638' and 'DRA7XX'. If not defined all platforms will be built.) AC_ARG_VAR(CMEM_INSTALL_DIR, Installation path directory to the CMEM libraries) AC_ARG_VAR(KERNEL_INSTALL_DIR, Installation path to the Linux kernel.) AC_ARG_VAR(DRM_PREFIX, Installation location to the DRM library.) # Test platform variable for setting -AS_IF([test "x$PLATFORM" = "xomapl138"], +AS_IF([test "x$PLATFORM" = "xOMAPL138"], [AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])], - [AS_IF([test "x$PLATFORM" = "xtci6614"], + [AS_IF([test "x$PLATFORM" = "xTCI6614"], [AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])], - [AS_IF([test "x$PLATFORM" = "xtci6636"], + [AS_IF([test "x$PLATFORM" = "xTCI6636"], [AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])], - [AS_IF([test "x$PLATFORM" = "xtci6638"], + [AS_IF([test "x$PLATFORM" = "xTCI6638"], [AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])], - [AS_IF([test "x$PLATFORM" = "xomap54xx_smp"], + [AS_IF([test "x$PLATFORM" = "xOMAP54XX"], [AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])], - [AS_IF([test "x$PLATFORM" = "xdra7xx"], + [AS_IF([test "x$PLATFORM" = "xDRA7XX"], [AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])], [AS_IF([test "x$PLATFORM" = "x"], [AC_MSG_NOTICE([PLATFORM is not set. All supported platforms will be built ....])], @@ -101,12 +101,12 @@ AC_SUBST([KERNEL_INSTALL_DIR]) AC_SUBST([DRM_PREFIX]) # Define specific variables to be used in Makefile.am -AM_CONDITIONAL([OMAPL138], [test "x$PLATFORM" = "xomapl138"]) -AM_CONDITIONAL([TCI6614], [test "x$PLATFORM" = "xtci6614"]) -AM_CONDITIONAL([TCI6636], [test "x$PLATFORM" = "xtci6636"]) -AM_CONDITIONAL([TCI6638], [test "x$PLATFORM" = "xtci6638"]) -AM_CONDITIONAL([OMAP54XX_SMP], [test "x$PLATFORM" = "xomap54xx_smp"]) -AM_CONDITIONAL([DRA7XX], [test "x$PLATFORM" = "xdra7xx"]) +AM_CONDITIONAL([OMAPL138], [test "x$PLATFORM" = "xOMAPL138"]) +AM_CONDITIONAL([TCI6614], [test "x$PLATFORM" = "xTCI6614"]) +AM_CONDITIONAL([TCI6636], [test "x$PLATFORM" = "xTCI6636"]) +AM_CONDITIONAL([TCI6638], [test "x$PLATFORM" = "xTCI6638"]) +AM_CONDITIONAL([OMAP54XX_SMP], [test "x$PLATFORM" = "xOMAP54XX"]) +AM_CONDITIONAL([DRA7XX], [test "x$PLATFORM" = "xDRA7XX"]) AM_CONDITIONAL([CMEM], [test "x$CMEM_INSTALL_DIR" != "x"]) AM_CONDITIONAL([KDIR], [test "x$KERNEL_INSTALL_DIR" != "x"]) AM_CONDITIONAL([DRM], [test "x$DRM_PREFIX" != "x"]) diff --git a/ipc-bios.bld b/ipc-bios.bld index b2e455f..d0b3e24 100644 --- a/ipc-bios.bld +++ b/ipc-bios.bld @@ -173,22 +173,22 @@ for (arg = 0; arg < arguments.length; arg++) { /* Add appropriate platforms to build for based on target name */ if (targetName.match(/elf\.C674/)) { - if (platform == 'omapl138') { + if (platform == 'OMAPL138') { target.platforms.$add("ti.platforms.evmOMAPL138:DSP"); } } if (targetName.match(/elf\.C66$/)) { switch (platform) { - case 'tci6636': + case 'TCI6636': target.platforms.$add("ti.platforms.evmTCI6636K2H"); break; - case 'tci6638': + case 'TCI6638': target.platforms.$add("ti.platforms.evmTCI6638K2K"); break; - case 'dra7xx': + case 'DRA7XX': target.platforms.$add("ti.platforms.evmDRA7XX:dsp1"); target.platforms.$add("ti.platforms.evmDRA7XX:dsp2"); break; @@ -200,18 +200,18 @@ for (arg = 0; arg < arguments.length; arg++) { } if (targetName.match(/elf\.C64T/)) { - if (platform == 'omap54xx_smp') { + if (platform == 'OMAP54XX') { target.platforms.$add("ti.platforms.sdp5430:DSP"); } } if (targetName.match(/elf\.M4$/)) { switch (platform) { - case 'omap54xx_smp': + case 'OMAP54XX': target.platforms.$add("ti.platforms.sdp5430:IPU"); break; - case 'dra7xx': + case 'DRA7XX': target.platforms.$add("ti.platforms.evmDRA7XX:ipu2"); target.platforms.$add("ti.platforms.evmDRA7XX:ipu1"); break; diff --git a/ipc-qnx.mak b/ipc-qnx.mak index dfe5590..ca19eb8 100644 --- a/ipc-qnx.mak +++ b/ipc-qnx.mak @@ -48,14 +48,6 @@ ifneq ($(wildcard $(QNX_INSTALL_DIR)),) export LD_LIBRARY_PATH=$(QNX_INSTALL_DIR)/host/linux/x86/usr/lib endif -ifeq ("$(DEVICE)","simvayu") -BUILD_FOR_VIRTIO = true -PLATFORM = vayu -else -BUILD_FOR_VIRTIO = false -PLATFORM = $(DEVICE) -endif - all: .qnx .qnx: .qnx,$(PLATFORM) @@ -66,7 +58,7 @@ all: .qnx @make -C qnx \ IPC_REPO=`pwd` \ PLATFORM=$(*:.qnx,=) \ - BUILD_FOR_VIRTIO=$(BUILD_FOR_VIRTIO) + BUILD_FOR_VIRTIO=false clean: @echo "cleaning Qnx user libraries ..." @@ -81,6 +73,6 @@ install: .install,$(PLATFORM) @make -C qnx \ IPC_REPO=`pwd` \ PLATFORM=$(*:.qnx,=) \ - BUILD_FOR_VIRTIO=$(BUILD_FOR_VIRTIO) \ + BUILD_FOR_VIRTIO=false \ DESTDIR=$(DESTDIR) \ install diff --git a/products.mak b/products.mak index 58418df..6e9467b 100644 --- a/products.mak +++ b/products.mak @@ -39,11 +39,11 @@ # DEPOT ?= _your_depot_folder_ -# Optional: platform to build +# Platform to build for # Supported platforms (choose one): -# omapl138, omap54xx_smp, dra7xx, tci6636, tci6638 +# OMAPL138, OMAP54XX, DRA7XX, TCI6638, TCI6638 # -# Note, this is used for both Linux and BIOS builds +# Note, this is used for Linux, QNX and BIOS builds # PLATFORM ?= @@ -80,10 +80,6 @@ QNX_INSTALL_DIR ?= # DESTDIR ?= -# List of supported devices (choose one): omap5432, vayu, simvayu -# -DEVICE ?= _device_ - #################### IPC Bios #################### # Path to required dependencies for IPC BIOS builds diff --git a/qnx/Makefile b/qnx/Makefile index bdfddc5..d22d50a 100644 --- a/qnx/Makefile +++ b/qnx/Makefile @@ -30,10 +30,10 @@ # 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 endif all: utils ipc3x_dev libs tests |