summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0820447)
raw | patch | inline | side by side (parent: 0820447)
author | Chris Ring <cring@ti.com> | |
Mon, 14 Oct 2013 22:32:58 +0000 (15:32 -0700) | ||
committer | Chris Ring <cring@ti.com> | |
Tue, 15 Oct 2013 19:16:18 +0000 (12:16 -0700) |
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.
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.
configure | patch | blob | history | |
configure.ac | patch | blob | history | |
ipc-bios.bld | patch | blob | history | |
ipc-qnx.mak | patch | blob | history | |
products.mak | patch | blob | history | |
qnx/Makefile | patch | blob | history |
diff --git a/configure b/configure
index 6996fa7e10ad5c381402937fc1e991c4bf3808a4..9bfe94b0048470244ce7b340cbf49bebd27feefc 100755 (executable)
--- a/configure
+++ b/configure
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
# 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
# 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
-if test "x$PLATFORM" = "xtci6614"; then
+if test "x$PLATFORM" = "xTCI6614"; then
TCI6614_TRUE=
TCI6614_FALSE='#'
else
-if test "x$PLATFORM" = "xtci6636"; then
+if test "x$PLATFORM" = "xTCI6636"; then
TCI6636_TRUE=
TCI6636_FALSE='#'
else
-if test "x$PLATFORM" = "xtci6638"; then
+if test "x$PLATFORM" = "xTCI6638"; then
TCI6638_TRUE=
TCI6638_FALSE='#'
else
-if test "x$PLATFORM" = "xomap54xx_smp"; then
+if test "x$PLATFORM" = "xOMAP54XX"; then
OMAP54XX_SMP_TRUE=
OMAP54XX_SMP_FALSE='#'
else
-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 355d2286af777878544bb4c6f9024494121699bd..a75b07f5bcb96e65fc88ebd7e8726d4d16f7f573 100644 (file)
--- a/configure.ac
+++ b/configure.ac
# 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 ....])],
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 b2e455f19c6c1bc86f7f7e7abc7cac45f6eab30b..d0b3e24a2398671c0251cf15e27c7f481e6a7394 100644 (file)
--- a/ipc-bios.bld
+++ b/ipc-bios.bld
/* 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;
}
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 dfe55908d198010d8533f34408b0f7c1de8ff087..ca19eb875aeaddc7d0d316c26c9f5281ccbbd294 100644 (file)
--- a/ipc-qnx.mak
+++ b/ipc-qnx.mak
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)
@make -C qnx \
IPC_REPO=`pwd` \
PLATFORM=$(*:.qnx,=) \
- BUILD_FOR_VIRTIO=$(BUILD_FOR_VIRTIO)
+ BUILD_FOR_VIRTIO=false
clean:
@echo "cleaning Qnx user libraries ..."
@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 58418dfad4a1f4d979309549acce12aa4049c251..6e9467b695df42c41cf4ca8f36a3c926dfad99e8 100644 (file)
--- a/products.mak
+++ b/products.mak
#
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 ?=
#
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 bdfddc573b4ba91e524d2a46e3af6e9a01a6ec52..d22d50a69f96ac04d132867def7d28662df0eb52 100644 (file)
--- a/qnx/Makefile
+++ b/qnx/Makefile
# 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