6636: More Linux and BIOS 6636 support3.00.02.25_eng

Add tci6636 as a new PLATFORM visible to Linux autotools.

On the BIOS side, treat 6636 just like 6638 in config and
build scripts.

20 files changed, 132 insertions, 34 deletions

diff --git a/Makefile.in b/Makefile.in
index 844cc8c..71849d7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -150,6 +150,8 @@ SHELL = @SHELL@
 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 aafc27c..8022d74 100755
--- a/configure
+++ b/configure
@@ -461,7 +461,7 @@ ac_includes_default="\
 # 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.
@@ -1060,7 +1060,7 @@ Some influential environment variables:
   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
@@ -16770,6 +16770,7 @@ done
 
 
 # Add config variables/options and check them
+# Note that 6614 isn't documented and, though it may work, is planned for removal
 
 
 
@@ -16783,6 +16784,10 @@ else
   { 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
 echo "$as_me: PLATFORM is set to ${PLATFORM}" >&6;}
@@ -16808,6 +16813,8 @@ fi
 
 fi
 
+fi
+
 
 # Test platform for omap5 variable and require a KERNEL path
 if test "x$PLATFORM" = "xomap54xx_smp"; then
@@ -16854,6 +16861,16 @@ fi
 
 
 
+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='#'
@@ -17079,6 +17096,13 @@ echo "$as_me: error: conditional \"TCI6614\" was never defined.
 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
@@ -17712,6 +17736,8 @@ s,@OMAPL138_TRUE@,$OMAPL138_TRUE,;t t
 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 ce2422c..e41feaa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@
 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])
@@ -66,7 +66,8 @@ AC_SUBST([AM_CFLAGS])
 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.)
 
@@ -75,13 +76,15 @@ AS_IF([test "x$PLATFORM" = "xomapl138"],
   [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"],
@@ -89,7 +92,7 @@ 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])
@@ -97,12 +100,13 @@ AC_SUBST([CMEM_INSTALL_DIR])
 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 22ee7a6..7e4cc75 100644
--- a/ipc-bios.bld
+++ b/ipc-bios.bld
@@ -141,6 +141,7 @@ for (arg = 0; arg < arguments.length; arg++) {
         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 0402495..7b88b86 100644
--- a/linux/etc/Makefile.in
+++ b/linux/etc/Makefile.in
@@ -116,6 +116,8 @@ SHELL = @SHELL@
 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/linux/src/api/Makefile.in b/linux/src/api/Makefile.in
index f6da879..6d35817 100644
--- a/linux/src/api/Makefile.in
+++ b/linux/src/api/Makefile.in
@@ -150,6 +150,8 @@ SHELL = @SHELL@
 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/linux/src/daemon/Makefile.am b/linux/src/daemon/Makefile.am
index 72c5ff2..da988e0 100644
--- a/linux/src/daemon/Makefile.am
+++ b/linux/src/daemon/Makefile.am
@@ -54,7 +54,11 @@ else
 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
@@ -79,9 +83,13 @@ common_sources = \
                 $(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 \
@@ -94,6 +102,8 @@ lad_omapl138_LDADD = $(common_libraries) \
                 $(AM_LDFLAGS)
 lad_tci6614_LDADD = $(common_libraries) \
                 $(AM_LDFLAGS)
+lad_tci6636_LDADD = $(common_libraries) \
+                $(AM_LDFLAGS)
 lad_tci6638_LDADD = $(common_libraries) \
                 $(AM_LDFLAGS)
 
diff --git a/linux/src/daemon/Makefile.in b/linux/src/daemon/Makefile.in
index aa3b934..a865ba2 100644
--- a/linux/src/daemon/Makefile.in
+++ b/linux/src/daemon/Makefile.in
@@ -37,12 +37,13 @@ POST_UNINSTALL = :
 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
@@ -56,10 +57,12 @@ CONFIG_CLEAN_FILES =
 @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)
@@ -82,6 +85,10 @@ am_lad_tci6614_OBJECTS = $(am__objects_1) \
 	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)
@@ -98,9 +105,11 @@ CCLD = $(CC)
 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)
@@ -176,6 +185,8 @@ SHELL = @SHELL@
 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@
@@ -241,9 +252,13 @@ common_sources = \
 
 
 # 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
@@ -259,6 +274,9 @@ lad_omapl138_LDADD = $(common_libraries) \
 lad_tci6614_LDADD = $(common_libraries) \
                 $(AM_LDFLAGS)
 
+lad_tci6636_LDADD = $(common_libraries) \
+                $(AM_LDFLAGS)
+
 lad_tci6638_LDADD = $(common_libraries) \
                 $(AM_LDFLAGS)
 
@@ -332,6 +350,9 @@ lad_omapl138$(EXEEXT): $(lad_omapl138_OBJECTS) $(lad_omapl138_DEPENDENCIES)
 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)
diff --git a/linux/src/mm/Makefile.in b/linux/src/mm/Makefile.in
index 7d95504..6a5ca15 100644
--- a/linux/src/mm/Makefile.in
+++ b/linux/src/mm/Makefile.in
@@ -154,6 +154,8 @@ SHELL = @SHELL@
 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/linux/src/tests/Makefile.am b/linux/src/tests/Makefile.am
index d3edfae..099300e 100644
--- a/linux/src/tests/Makefile.am
+++ b/linux/src/tests/Makefile.am
@@ -44,7 +44,7 @@ VPATH = ../../../packages/ti/ipc/tests
 # 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
@@ -64,11 +64,15 @@ if TCI6614
 # 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
@@ -79,6 +83,7 @@ endif
 endif
 endif
 endif
+endif
 
 common_sources = \
                 $(top_srcdir)/linux/include/ti/ipc/Std.h \
diff --git a/linux/src/tests/Makefile.in b/linux/src/tests/Makefile.in
index ecdb807..43e2426 100644
--- a/linux/src/tests/Makefile.in
+++ b/linux/src/tests/Makefile.in
@@ -39,7 +39,8 @@ bin_PROGRAMS = ping_rpmsg$(EXEEXT) MessageQApp$(EXEEXT) \
 	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 = 
@@ -50,10 +51,12 @@ bin_PROGRAMS = ping_rpmsg$(EXEEXT) MessageQApp$(EXEEXT) \
 # 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
@@ -65,8 +68,8 @@ CONFIG_CLEAN_FILES =
 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)
@@ -198,6 +201,8 @@ SHELL = @SHELL@
 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/linux/src/utils/Makefile.in b/linux/src/utils/Makefile.in
index fa58e14..cfeb807 100644
--- a/linux/src/utils/Makefile.in
+++ b/linux/src/utils/Makefile.in
@@ -151,6 +151,8 @@ SHELL = @SHELL@
 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 e02afb1..9864e80 100644
--- a/packages/ti/ipc/family/tci6638/Interrupt.xs
+++ b/packages/ti/ipc/family/tci6638/Interrupt.xs
@@ -55,6 +55,16 @@ var deviceSettings = {
         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);
diff --git a/packages/ti/ipc/remoteproc/Resource.xdt b/packages/ti/ipc/remoteproc/Resource.xdt
index 3db7341..8c4f805 100644
--- a/packages/ti/ipc/remoteproc/Resource.xdt
+++ b/packages/ti/ipc/remoteproc/Resource.xdt
@@ -49,7 +49,7 @@ extern struct resource_table ti_ipc_remoteproc_ResourceTable;
 //#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
 %    }
diff --git a/packages/ti/ipc/rpmsg/package.xs b/packages/ti/ipc/rpmsg/package.xs
index e778c2c..aa562d1 100644
--- a/packages/ti/ipc/rpmsg/package.xs
+++ b/packages/ti/ipc/rpmsg/package.xs
@@ -59,6 +59,7 @@ function close()
             break;
 
         case "Kepler":
+        case "TMS320TCI6636":
         case "TMS320TCI6638":
             xdc.useModule('ti.ipc.family.tci6638.VirtQueue');
             break;
@@ -124,6 +125,7 @@ function getLibs(prog)
             break;
 
         case "Kepler":
+        case "TMS320TCI6636":
         case "TMS320TCI6638":
             platform = "tci6638";
             break;
diff --git a/packages/ti/ipc/tests/dual_transports.cfg b/packages/ti/ipc/tests/dual_transports.cfg
index 2377022..4c76e34 100644
--- a/packages/ti/ipc/tests/dual_transports.cfg
+++ b/packages/ti/ipc/tests/dual_transports.cfg
@@ -39,7 +39,7 @@ if (Program.platformName.match(/6614/)) {
     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;
@@ -58,7 +58,7 @@ if (Program.platformName.match(/6614/)) {
     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');
@@ -78,7 +78,7 @@ if (Program.platformName.match(/6614/)) {
     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 f394439..ee8ffa0 100644
--- a/packages/ti/ipc/tests/messageq_common.cfg.xs
+++ b/packages/ti/ipc/tests/messageq_common.cfg.xs
@@ -155,7 +155,7 @@ else if (Program.platformName.match(/6614/)) {
     */
 }
 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 e4a8775..04642c1 100644
--- a/packages/ti/ipc/tests/messageq_multicore.cfg
+++ b/packages/ti/ipc/tests/messageq_multicore.cfg
@@ -37,6 +37,7 @@ switch (Program.cpu.deviceName) {
         break;
 
     case "Kepler":
+    case "TMS320TCI6636":
     case "TMS320TCI6638":
         nameList = ["CORE0", "CORE1", "CORE2", "CORE3", "CORE4", "CORE5",
                 "CORE6", "CORE7"];
diff --git a/packages/ti/ipc/tests/package.bld b/packages/ti/ipc/tests/package.bld
index d8a05d2..707c3b0 100644
--- a/packages/ti/ipc/tests/package.bld
+++ b/packages/ti/ipc/tests/package.bld
@@ -373,6 +373,7 @@ for (var i = 0; i < Build.targets.length; i++) {
         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/)) ||
@@ -405,6 +406,7 @@ for (var i = 0; i < Build.targets.length; i++) {
         /* 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 255477a..3f8fd18 100644
--- a/packages/ti/ipc/tests/ping_rpmsg_common.cfg.xs
+++ b/packages/ti/ipc/tests/ping_rpmsg_common.cfg.xs
@@ -131,6 +131,7 @@ else if (Program.platformName.match(/6614/)) {
     */
 }
 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');