summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 46381ef)
raw | patch | inline | side by side (parent: 46381ef)
author | Chris Ring <cring@ti.com> | |
Wed, 3 Jul 2013 21:13:46 +0000 (14:13 -0700) | ||
committer | Chris Ring <cring@ti.com> | |
Wed, 3 Jul 2013 21:13:46 +0000 (14:13 -0700) |
Add tci6636 as a new PLATFORM visible to Linux autotools.
On the BIOS side, treat 6636 just like 6638 in config and
build scripts.
On the BIOS side, treat 6636 just like 6638 in config and
build scripts.
20 files changed:
diff --git a/Makefile.in b/Makefile.in
index 844cc8c8d958f1bb116c8f84188bb3f42a59e106..71849d7fc08aea50eda2ecafa01f851858f1eebe 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
STRIP = @STRIP@
TCI6614_FALSE = @TCI6614_FALSE@
TCI6614_TRUE = @TCI6614_TRUE@
+TCI6636_FALSE = @TCI6636_FALSE@
+TCI6636_TRUE = @TCI6636_TRUE@
TCI6638_FALSE = @TCI6638_FALSE@
TCI6638_TRUE = @TCI6638_TRUE@
VERSION = @VERSION@
diff --git a/configure b/configure
index aafc27c75314803f8a8bfb28e1e33a3384948691..8022d7439ca556270c953216e7eaba5e42cf7d96 100755 (executable)
--- a/configure
+++ b/configure
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL AM_CFLAGS AM_LDFLAGS PLATFORM CMEM_INSTALL_DIR KERNEL_INSTALL_DIR OMAPL138_TRUE OMAPL138_FALSE TCI6614_TRUE TCI6614_FALSE TCI6638_TRUE TCI6638_FALSE OMAP54XX_SMP_TRUE OMAP54XX_SMP_FALSE CMEM_TRUE CMEM_FALSE KDIR_TRUE KDIR_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL AM_CFLAGS AM_LDFLAGS PLATFORM CMEM_INSTALL_DIR KERNEL_INSTALL_DIR OMAPL138_TRUE OMAPL138_FALSE TCI6614_TRUE TCI6614_FALSE TCI6636_TRUE TCI6636_FALSE TCI6638_TRUE TCI6638_FALSE OMAP54XX_SMP_TRUE OMAP54XX_SMP_FALSE CMEM_TRUE CMEM_FALSE KDIR_TRUE KDIR_FALSE LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
CXXFLAGS C++ compiler flags
CXXCPP C++ preprocessor
PLATFORM Platform to build. Options are: 'omapl138' 'omap54xx_smp'
- 'tci6614' and 'tci6638'. If not defined all platforms will be
+ 'tci6636' and 'tci6638'. If not defined all platforms will be
built.
CMEM_INSTALL_DIR
Installation path directory to the CMEM libraries
# Add config variables/options and check them
+# Note that 6614 isn't documented and, though it may work, is planned for removal
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
+ { 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
{ echo "$as_me:$LINENO: PLATFORM is set to ${PLATFORM}" >&5
fi
+fi
+
# Test platform for omap5 variable and require a KERNEL path
if test "x$PLATFORM" = "xomap54xx_smp"; then
+if test "x$PLATFORM" = "xtci6636"; then
+ TCI6636_TRUE=
+ TCI6636_FALSE='#'
+else
+ TCI6636_TRUE='#'
+ TCI6636_FALSE=
+fi
+
+
+
if test "x$PLATFORM" = "xtci6638"; then
TCI6638_TRUE=
TCI6638_FALSE='#'
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${TCI6636_TRUE}" && test -z "${TCI6636_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"TCI6636\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"TCI6636\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${TCI6638_TRUE}" && test -z "${TCI6638_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"TCI6638\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
s,@OMAPL138_FALSE@,$OMAPL138_FALSE,;t t
s,@TCI6614_TRUE@,$TCI6614_TRUE,;t t
s,@TCI6614_FALSE@,$TCI6614_FALSE,;t t
+s,@TCI6636_TRUE@,$TCI6636_TRUE,;t t
+s,@TCI6636_FALSE@,$TCI6636_FALSE,;t t
s,@TCI6638_TRUE@,$TCI6638_TRUE,;t t
s,@TCI6638_FALSE@,$TCI6638_FALSE,;t t
s,@OMAP54XX_SMP_TRUE@,$OMAP54XX_SMP_TRUE,;t t
diff --git a/configure.ac b/configure.ac
index ce2422c108d63f67efd64043e49a902f03637757..e41feaad06802dc96902f13eb0e1c7a2e4e8a46e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
AC_PREREQ(2.59)
# Initilize autoconf
-AC_INIT(TI IPC, 3.0.0, )
+AC_INIT(TI IPC, 3.0.0, )
# Check common src files to ensure integrity of the package
AC_CONFIG_SRCDIR([packages/ti/ipc/MessageQ.h])
AC_SUBST([AM_LDFLAGS])
# Add config variables/options and check them
-AC_ARG_VAR(PLATFORM, Platform to build. Options are: 'omapl138' 'omap54xx_smp' 'tci6614' and 'tci6638'. If not defined all platforms will be built.)
+# 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' and 'tci6638'. 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_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
[AS_IF([test "x$PLATFORM" = "xtci6614"],
[AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
+ [AS_IF([test "x$PLATFORM" = "xtci6636"],
+ [AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
[AS_IF([test "x$PLATFORM" = "xtci6638"],
[AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
[AS_IF([test "x$PLATFORM" = "xomap54xx_smp"],
[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_MSG_ERROR([PLATFORM is set to "${PLATFORM}": run ./configure --help for available PLATFORM options])])])])])])
+ [AC_MSG_ERROR([PLATFORM is set to "${PLATFORM}": run ./configure --help for available PLATFORM options])])])])])])])
# Test platform for omap5 variable and require a KERNEL path
AS_IF([test "x$PLATFORM" = "xomap54xx_smp"],
[AC_MSG_ERROR([Kernel path for ${PLATFORM} is not set])])])
# Ignore KERNEL path when no platform is set
-AS_IF([test "x$PLATFORM" = "x"], [KERNEL_INSTALL_DIR=])
+AS_IF([test "x$PLATFORM" = "x"], [KERNEL_INSTALL_DIR=])
# Export optional user variable to Makefile(s)
AC_SUBST([PLATFORM])
AC_SUBST([KERNEL_INSTALL_DIR])
# 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([TCI6638], [test "x$PLATFORM" = "xtci6638"])
+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([CMEM], [test "x$CMEM_INSTALL_DIR" != "x"])
-AM_CONDITIONAL([KDIR], [test "x$KERNEL_INSTALL_DIR" != "x"])
+AM_CONDITIONAL([CMEM], [test "x$CMEM_INSTALL_DIR" != "x"])
+AM_CONDITIONAL([KDIR], [test "x$KERNEL_INSTALL_DIR" != "x"])
# Generate Makefile(s)
AC_CONFIG_FILES([Makefile])
diff --git a/ipc-bios.bld b/ipc-bios.bld
index 22ee7a64a6e49e216529bec1e2dfe1867a8bf651..7e4cc755d8a1b37340ae0a7add5bab66c2aa648d 100644 (file)
--- a/ipc-bios.bld
+++ b/ipc-bios.bld
target.platforms = [
//"ti.platforms.simKepler"
//"ti.platforms.evm6614:DSP"
+ "ti.platforms.evmTCI6636K2H",
"ti.platforms.evmTCI6638K2K",
"ti.platforms.evmDRA7XX:dsp1",
];
diff --git a/linux/etc/Makefile.in b/linux/etc/Makefile.in
index 04024955eb543dee17629ab4914ef3fae1f93ba2..7b88b866ecfd04973274639457ae9fa6821d7359 100644 (file)
--- a/linux/etc/Makefile.in
+++ b/linux/etc/Makefile.in
STRIP = @STRIP@
TCI6614_FALSE = @TCI6614_FALSE@
TCI6614_TRUE = @TCI6614_TRUE@
+TCI6636_FALSE = @TCI6636_FALSE@
+TCI6636_TRUE = @TCI6636_TRUE@
TCI6638_FALSE = @TCI6638_FALSE@
TCI6638_TRUE = @TCI6638_TRUE@
VERSION = @VERSION@
index f6da879167dd6110107eb33438cbe13673ffc877..6d35817a2d98f9b0598ca4399c8295ef735d0485 100644 (file)
STRIP = @STRIP@
TCI6614_FALSE = @TCI6614_FALSE@
TCI6614_TRUE = @TCI6614_TRUE@
+TCI6636_FALSE = @TCI6636_FALSE@
+TCI6636_TRUE = @TCI6636_TRUE@
TCI6638_FALSE = @TCI6638_FALSE@
TCI6638_TRUE = @TCI6638_TRUE@
VERSION = @VERSION@
index 72c5ff2b704481c1fdee3f4a5e48575d945b9571..da988e07c9b296e3b5b8f638ef94305fa5df9a12 100644 (file)
if TCI6638
bin_PROGRAMS += lad_tci6638
else
- bin_PROGRAMS += lad_omap54xx_smp lad_omapl138 lad_tci6614 lad_tci6638
+if TCI6636
+ bin_PROGRAMS += lad_tci6636
+else
+ bin_PROGRAMS += lad_omap54xx_smp lad_omapl138 lad_tci6614 lad_tci6636 lad_tci6638
+endif
endif
endif
endif
$(top_srcdir)/packages/ti/ipc/MultiProc.h
# list of sources for the 'lad' binary and to add to the source distribution
+#
+# NOTE: 6636_SOURCES using 6638.c is not a typo! 6636 has the same
+# MultiProc config as 6638, so we reuse that source file.
lad_omap54xx_smp_SOURCES = $(common_sources) MultiProcCfg_omap54xx_smp.c
lad_omapl138_SOURCES = $(common_sources) MultiProcCfg_omapl138.c
lad_tci6614_SOURCES = $(common_sources) MultiProcCfg_tci6614.c
+lad_tci6636_SOURCES = $(common_sources) MultiProcCfg_tci6638.c
lad_tci6638_SOURCES = $(common_sources) MultiProcCfg_tci6638.c
common_libraries = -lpthread $(top_builddir)/linux/src/api/libtiipc.la \
$(AM_LDFLAGS)
lad_tci6614_LDADD = $(common_libraries) \
$(AM_LDFLAGS)
+lad_tci6636_LDADD = $(common_libraries) \
+ $(AM_LDFLAGS)
lad_tci6638_LDADD = $(common_libraries) \
$(AM_LDFLAGS)
index aa3b934c4d8804456cfc98d3099363ae61d4518f..a865ba2729d7464bd0708ba4cc4d9362f2937a0d 100644 (file)
build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__EXEEXT_3) \
- $(am__EXEEXT_4) $(am__EXEEXT_5)
+ $(am__EXEEXT_4) $(am__EXEEXT_5) $(am__EXEEXT_6)
@OMAP54XX_SMP_TRUE@am__append_1 = lad_omap54xx_smp
@OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@am__append_2 = lad_omapl138
@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_TRUE@am__append_3 = lad_tci6614
@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_TRUE@am__append_4 = lad_tci6638
-@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__append_5 = lad_omap54xx_smp lad_omapl138 lad_tci6614 lad_tci6638
+@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6636_TRUE@@TCI6638_FALSE@am__append_5 = lad_tci6636
+@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6636_FALSE@@TCI6638_FALSE@am__append_6 = lad_omap54xx_smp lad_omapl138 lad_tci6614 lad_tci6636 lad_tci6638
subdir = linux/src/daemon
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@ lad_omapl138$(EXEEXT)
@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_TRUE@am__EXEEXT_3 = lad_tci6614$(EXEEXT)
@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_TRUE@am__EXEEXT_4 = lad_tci6638$(EXEEXT)
-@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__EXEEXT_5 = lad_omap54xx_smp$(EXEEXT) \
-@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@ lad_omapl138$(EXEEXT) \
-@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@ lad_tci6614$(EXEEXT) \
-@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@ lad_tci6638$(EXEEXT)
+@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6636_TRUE@@TCI6638_FALSE@am__EXEEXT_5 = lad_tci6636$(EXEEXT)
+@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6636_FALSE@@TCI6638_FALSE@am__EXEEXT_6 = lad_omap54xx_smp$(EXEEXT) \
+@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6636_FALSE@@TCI6638_FALSE@ lad_omapl138$(EXEEXT) \
+@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6636_FALSE@@TCI6638_FALSE@ lad_tci6614$(EXEEXT) \
+@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6636_FALSE@@TCI6638_FALSE@ lad_tci6636$(EXEEXT) \
+@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6636_FALSE@@TCI6638_FALSE@ lad_tci6638$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
MultiProcCfg_tci6614.$(OBJEXT)
lad_tci6614_OBJECTS = $(am_lad_tci6614_OBJECTS)
lad_tci6614_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
+am_lad_tci6636_OBJECTS = $(am__objects_1) \
+ MultiProcCfg_tci6638.$(OBJEXT)
+lad_tci6636_OBJECTS = $(am_lad_tci6636_OBJECTS)
+lad_tci6636_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2)
am_lad_tci6638_OBJECTS = $(am__objects_1) \
MultiProcCfg_tci6638.$(OBJEXT)
lad_tci6638_OBJECTS = $(am_lad_tci6638_OBJECTS)
LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(lad_omap54xx_smp_SOURCES) $(lad_omapl138_SOURCES) \
- $(lad_tci6614_SOURCES) $(lad_tci6638_SOURCES)
+ $(lad_tci6614_SOURCES) $(lad_tci6636_SOURCES) \
+ $(lad_tci6638_SOURCES)
DIST_SOURCES = $(lad_omap54xx_smp_SOURCES) $(lad_omapl138_SOURCES) \
- $(lad_tci6614_SOURCES) $(lad_tci6638_SOURCES)
+ $(lad_tci6614_SOURCES) $(lad_tci6636_SOURCES) \
+ $(lad_tci6638_SOURCES)
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
STRIP = @STRIP@
TCI6614_FALSE = @TCI6614_FALSE@
TCI6614_TRUE = @TCI6614_TRUE@
+TCI6636_FALSE = @TCI6636_FALSE@
+TCI6636_TRUE = @TCI6636_TRUE@
TCI6638_FALSE = @TCI6638_FALSE@
TCI6638_TRUE = @TCI6638_TRUE@
VERSION = @VERSION@
# list of sources for the 'lad' binary and to add to the source distribution
+#
+# NOTE: 6636_SOURCES using 6638.c is not a typo! 6636 has the same
+# MultiProc config as 6638, so we reuse that source file.
lad_omap54xx_smp_SOURCES = $(common_sources) MultiProcCfg_omap54xx_smp.c
lad_omapl138_SOURCES = $(common_sources) MultiProcCfg_omapl138.c
lad_tci6614_SOURCES = $(common_sources) MultiProcCfg_tci6614.c
+lad_tci6636_SOURCES = $(common_sources) MultiProcCfg_tci6638.c
lad_tci6638_SOURCES = $(common_sources) MultiProcCfg_tci6638.c
common_libraries = -lpthread $(top_builddir)/linux/src/api/libtiipc.la \
$(top_builddir)/linux/src/utils/libtiipcutils.la
lad_tci6614_LDADD = $(common_libraries) \
$(AM_LDFLAGS)
+lad_tci6636_LDADD = $(common_libraries) \
+ $(AM_LDFLAGS)
+
lad_tci6638_LDADD = $(common_libraries) \
$(AM_LDFLAGS)
lad_tci6614$(EXEEXT): $(lad_tci6614_OBJECTS) $(lad_tci6614_DEPENDENCIES)
@rm -f lad_tci6614$(EXEEXT)
$(LINK) $(lad_tci6614_LDFLAGS) $(lad_tci6614_OBJECTS) $(lad_tci6614_LDADD) $(LIBS)
+lad_tci6636$(EXEEXT): $(lad_tci6636_OBJECTS) $(lad_tci6636_DEPENDENCIES)
+ @rm -f lad_tci6636$(EXEEXT)
+ $(LINK) $(lad_tci6636_LDFLAGS) $(lad_tci6636_OBJECTS) $(lad_tci6636_LDADD) $(LIBS)
lad_tci6638$(EXEEXT): $(lad_tci6638_OBJECTS) $(lad_tci6638_DEPENDENCIES)
@rm -f lad_tci6638$(EXEEXT)
$(LINK) $(lad_tci6638_LDFLAGS) $(lad_tci6638_OBJECTS) $(lad_tci6638_LDADD) $(LIBS)
index 7d95504a971eb52ffe3f2b53b42813151f0dbe25..6a5ca152bce63231884ba50a6412778a979469f0 100644 (file)
--- a/linux/src/mm/Makefile.in
+++ b/linux/src/mm/Makefile.in
STRIP = @STRIP@
TCI6614_FALSE = @TCI6614_FALSE@
TCI6614_TRUE = @TCI6614_TRUE@
+TCI6636_FALSE = @TCI6636_FALSE@
+TCI6636_TRUE = @TCI6636_TRUE@
TCI6638_FALSE = @TCI6638_FALSE@
TCI6638_TRUE = @TCI6638_TRUE@
VERSION = @VERSION@
index d3edfae5f1220ce6097ce7cc98d4db5bb51bd4ea..099300e7f909bf67576e934105bd53fca75a2ef8 100644 (file)
# the program to build (the names of the final binaries)
bin_PROGRAMS = ping_rpmsg MessageQApp MessageQBench MessageQMulti \
NameServerApp
-
+
if OMAP54XX_SMP
# Add platform specific bin application's here
# Add platform specific bin application's here
bin_PROGRAMS +=
else
+if TCI6636
+# Add platform specific bin application's here
+ bin_PROGRAMS +=
+else
if TCI6638
# Add platform specific bin application's here
bin_PROGRAMS +=
else
-# Add platform independent apps here or above in bin_PROGRMAS
+# Add platform independent apps here or above in bin_PROGRAMS
if CMEM
bin_PROGRAMS += nano_test
endif
endif
endif
endif
+endif
common_sources = \
$(top_srcdir)/linux/include/ti/ipc/Std.h \
index ecdb8070aecfabe14c55e6bde3ec91d40589c875..43e242655d5b16ea727ea571aaf6104e52e3dcb9 100644 (file)
MessageQBench$(EXEEXT) MessageQMulti$(EXEEXT) \
NameServerApp$(EXEEXT) $(am__EXEEXT_1) $(am__EXEEXT_2) \
$(am__EXEEXT_1) $(am__EXEEXT_3) $(am__EXEEXT_1) \
- $(am__EXEEXT_1) $(am__EXEEXT_4) $(am__EXEEXT_5)
+ $(am__EXEEXT_1) $(am__EXEEXT_1) $(am__EXEEXT_4) \
+ $(am__EXEEXT_5)
# Add platform specific bin application's here
@OMAP54XX_SMP_TRUE@am__append_1 =
# Add platform specific bin application's here
@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_TRUE@am__append_5 =
# Add platform specific bin application's here
-@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_TRUE@am__append_6 =
-# Add platform independent apps here or above in bin_PROGRMAS
-@CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__append_7 = nano_test
-@KDIR_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__append_8 = mmrpc_test
+@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6636_TRUE@am__append_6 =
+# Add platform specific bin application's here
+@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6636_FALSE@@TCI6638_TRUE@am__append_7 =
+# Add platform independent apps here or above in bin_PROGRAMS
+@CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6636_FALSE@@TCI6638_FALSE@am__append_8 = nano_test
+@KDIR_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6636_FALSE@@TCI6638_FALSE@am__append_9 = mmrpc_test
subdir = linux/src/tests
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__EXEEXT_1 =
@KDIR_TRUE@@OMAP54XX_SMP_TRUE@am__EXEEXT_2 = mmrpc_test$(EXEEXT)
@CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_TRUE@am__EXEEXT_3 = nano_test$(EXEEXT)
-@CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__EXEEXT_4 = nano_test$(EXEEXT)
-@KDIR_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6638_FALSE@am__EXEEXT_5 = mmrpc_test$(EXEEXT)
+@CMEM_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6636_FALSE@@TCI6638_FALSE@am__EXEEXT_4 = nano_test$(EXEEXT)
+@KDIR_TRUE@@OMAP54XX_SMP_FALSE@@OMAPL138_FALSE@@TCI6614_FALSE@@TCI6636_FALSE@@TCI6638_FALSE@am__EXEEXT_5 = mmrpc_test$(EXEEXT)
am__installdirs = "$(DESTDIR)$(bindir)"
binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
PROGRAMS = $(bin_PROGRAMS)
STRIP = @STRIP@
TCI6614_FALSE = @TCI6614_FALSE@
TCI6614_TRUE = @TCI6614_TRUE@
+TCI6636_FALSE = @TCI6636_FALSE@
+TCI6636_TRUE = @TCI6636_TRUE@
TCI6638_FALSE = @TCI6638_FALSE@
TCI6638_TRUE = @TCI6638_TRUE@
VERSION = @VERSION@
index fa58e14428db312bd0a571efc67351f00c1b9dc2..cfeb8070478122b57cec5372c50489f68909cd2d 100644 (file)
STRIP = @STRIP@
TCI6614_FALSE = @TCI6614_FALSE@
TCI6614_TRUE = @TCI6614_TRUE@
+TCI6636_FALSE = @TCI6636_FALSE@
+TCI6636_TRUE = @TCI6636_TRUE@
TCI6638_FALSE = @TCI6638_FALSE@
TCI6638_TRUE = @TCI6638_TRUE@
VERSION = @VERSION@
diff --git a/packages/ti/ipc/family/tci6638/Interrupt.xs b/packages/ti/ipc/family/tci6638/Interrupt.xs
index e02afb10585f76076c10f502625a9d9e03d70c91..9864e8077fdf0a8ea55e8f6c28ea5721c3a9bed5 100644 (file)
INTERDSPINT: 105,
DSPINT: 5,
},
+ 'TMS320TCI6636' : {
+ IPCGR0: 0x02620240,
+ IPCAR0: 0x02620280,
+ IPCGRH: 0x02620260,
+ IPCARH: 0x026202A0,
+ KICK0: 0x02620038,
+ KICK1: 0x0262003C,
+ INTERDSPINT: 105,
+ DSPINT: 5
+ }
}
var Settings = xdc.loadCapsule('ti/sdo/ipc/family/Settings.xs');
Settings.setDeviceAliases(deviceSettings, Settings.deviceAliases);
index 3db7341dad8ae728e1651aee5d033b00051976e9..8c4f805d4f40c6b3edb1535d701ae700b50bafe2 100644 (file)
//#include <ti/ipc/remoteproc/rsc_table_tci6614_v3.3.h> // Test with v3.3 Linux.
% }
% else if (prog.platformName.match(/Kepler/) ||
-% prog.platformName.match(/TCI6638/)) {
+% prog.cpu.deviceName.match(/^TMS320TCI663[6|8]$/)) {
% if (this.traceOnly) {
#define TRACE_RESOURCE_ONLY
% }
index e778c2c532dd6928895b8837aaccaa94caa5c0a0..aa562d11924a23053e5abafb8fbe454f9ccc4d0f 100644 (file)
break;
case "Kepler":
+ case "TMS320TCI6636":
case "TMS320TCI6638":
xdc.useModule('ti.ipc.family.tci6638.VirtQueue');
break;
break;
case "Kepler":
+ case "TMS320TCI6636":
case "TMS320TCI6638":
platform = "tci6638";
break;
index 2377022754b264f43cab63bb89ad2b9552ca7486..4c76e348b68ee7255eb08ad3e4a41ac2e24a87ef 100644 (file)
MultiProcSetup = xdc.useModule('ti.sdo.ipc.family.c647x.MultiProcSetup');
}
else if (Program.platformName.match(/simKepler/) ||
- Program.cpu.deviceName.match(/^TMS320TCI6638$/)) {
+ Program.cpu.deviceName.match(/^TMS320TCI663[6|8]$/)) {
MultiProcSetup = xdc.useModule('ti.sdo.ipc.family.tci663x.MultiProcSetup');
}
MultiProcSetup.configureProcId = false;
NotifyDriverShm.InterruptProxy = Interrupt;
}
else if (Program.platformName.match(/simKepler/) ||
- Program.cpu.deviceName.match(/^TMS320TCI6638$/)) {
+ Program.cpu.deviceName.match(/^TMS320TCI663[6|8]$/)) {
var NotifyDriverCirc =
xdc.useModule('ti.sdo.ipc.notifyDrivers.NotifyDriverCirc');
var Interrupt = xdc.useModule('ti.ipc.family.tci6638.Interrupt');
Notify.SetupProxy = xdc.module('ti.ipc.family.tci6614.NotifySetup');
}
else if (Program.platformName.match(/simKepler/) ||
- Program.cpu.deviceName.match(/^TMS320TCI6638$/)) {
+ Program.cpu.deviceName.match(/^TMS320TCI663[6|8]$/)) {
Notify.SetupProxy = xdc.module('ti.ipc.family.tci6638.NotifyCircSetup');
}
diff --git a/packages/ti/ipc/tests/messageq_common.cfg.xs b/packages/ti/ipc/tests/messageq_common.cfg.xs
index f394439b2c811103fa42deb1133ea387ea885db2..ee8ffa0bf62474755f78197dbecf454ebc0825a9 100644 (file)
*/
}
else if (Program.platformName.match(/simKepler/) ||
- Program.cpu.deviceName.match(/^TMS320TCI6638$/)) {
+ Program.cpu.deviceName.match(/^TMS320TCI663[6|8]$/)) {
var VirtQueue = xdc.useModule('ti.ipc.family.tci6638.VirtQueue');
var Interrupt = xdc.useModule('ti.ipc.family.tci6638.Interrupt');
diff --git a/packages/ti/ipc/tests/messageq_multicore.cfg b/packages/ti/ipc/tests/messageq_multicore.cfg
index e4a8775c6862fe5fa0fc8123bf7dc0c5570308f5..04642c1f9cf94e6882a06d7d21a86d4a9ed4b923 100644 (file)
break;
case "Kepler":
+ case "TMS320TCI6636":
case "TMS320TCI6638":
nameList = ["CORE0", "CORE1", "CORE2", "CORE3", "CORE4", "CORE5",
"CORE6", "CORE7"];
index d8a05d24f0d742b0644b4eea29067834294f07bb..707c3b0feedb66a0ae71529f664a2913b6acac65 100644 (file)
if (!((platform.match(/^ti\.platforms\.evm6614\:DSP/)) ||
(platform.match(/^ti\.platforms\.simKepler/)) ||
(platform.match(/^ti.platforms.evmTCI6638K2K/)) ||
+ (platform.match(/^ti.platforms.evmTCI6636K2H/)) ||
(platform.match(/^ti\.platform\.omap54xx/)) ||
(platform.match(/^ti\.platforms\.sdp5430/)) ||
(platform.match(/^ti\.platform\.vayu/)) ||
/* messageq_multicore - only for our homogeneous multicore platforms */
if (platform.match(/^ti\.platforms\.simKepler/) ||
(platform.match(/^ti.platforms.evmTCI6638K2K/)) ||
+ (platform.match(/^ti.platforms.evmTCI6636K2H/)) ||
(platform.match(/^ti\.platforms\.evm6614\:DSP/))) {
Pkg.addExecutable(name + "/messageq_multicore", targ, platform, {
cfgScript: "messageq_multicore",
diff --git a/packages/ti/ipc/tests/ping_rpmsg_common.cfg.xs b/packages/ti/ipc/tests/ping_rpmsg_common.cfg.xs
index 255477a6585dd6f4cf2a8d2b912b9f96735a7ada..3f8fd185fd422d6aad0885f2ee9b52230466e3a8 100644 (file)
*/
}
else if (Program.platformName.match(/simKepler/) ||
+ Program.platformName.match(/evmTCI6636K2H/) ||
Program.platformName.match(/evmTCI6638K2K/)) {
var VirtQueue = xdc.useModule('ti.ipc.family.tci6638.VirtQueue');
var Interrupt = xdc.useModule('ti.ipc.family.tci6638.Interrupt');