66AK2E: Linux: Remove leading 'C' in device name

The initial Linux support for 66AK2E (commit
f45b1ad1a591b188eb1321102a3b8ed479eec490) went in with
the leading 'C66AK2E' identifier.  After review by the MCSDK team,
the leading 'C' was incorrect and removed.

Note that autotools' condition variables must start with a
leading character, so internally the variable 'C66AK2E' is
still used.  But the user only sees '66AK2E' when setting
the PLATFORM variable.

The BIOS-side changes are in a separate commit.

diff --git a/configure.ac b/configure.ac
index da8b6d51e0b47040d51c774208ca7ccc391562a3..3bd2d896c1bba40c9beb32bd6f5763cb2ace1ce7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -67,7 +67,7 @@ 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' 'C66AK2E' 'TCI6630' 'TCI6636' 'TCI6638' and 'DRA7XX'. If not defined all platforms will be built.)
+AC_ARG_VAR(PLATFORM, Platform to build. Options are: 'OMAPL138' 'OMAP54XX' '66AK2E' 'TCI6630' '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.)
@@ -75,7 +75,7 @@ AC_ARG_VAR(DRM_PREFIX, Installation location to the DRM library.)
 # Test platform variable for setting
 AS_IF([test "x$PLATFORM" = "xOMAPL138"],
   [AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
-  [AS_IF([test "x$PLATFORM" = "xC66AK2E"],
+  [AS_IF([test "x$PLATFORM" = "x66AK2E"],
   [AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
   [AS_IF([test "x$PLATFORM" = "xTCI6614"],
   [AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
@@ -110,7 +110,7 @@ AC_SUBST([DRM_PREFIX])
 
 # Define specific variables to be used in Makefile.am
 AM_CONDITIONAL([OMAPL138], [test "x$PLATFORM" = "xOMAPL138"])
-AM_CONDITIONAL([C66AK2E], [test "x$PLATFORM" = "xC66AK2E"])
+AM_CONDITIONAL([C66AK2E],  [test "x$PLATFORM" = "x66AK2E"])
 AM_CONDITIONAL([TCI6614], [test "x$PLATFORM" = "xTCI6614"])
 AM_CONDITIONAL([TCI6630], [test "x$PLATFORM" = "xTCI6630"])
 AM_CONDITIONAL([TCI6636], [test "x$PLATFORM" = "xTCI6636"])

diff --git a/linux/src/daemon/Makefile.am b/linux/src/daemon/Makefile.am
index f205ddbf34700aebefe3cd3c9d1cd1f2c4124f17..3f8509db5c2338dad463e70e0bc858620eda3f94 100644 (file)
--- a/linux/src/daemon/Makefile.am
+++ b/linux/src/daemon/Makefile.am
@@ -57,7 +57,7 @@ if OMAPL138
   bin_PROGRAMS += lad_omapl138
 else
 if C66AK2E
-  bin_PROGRAMS += lad_c66ak2e
+  bin_PROGRAMS += lad_66ak2e
 else
 if TCI6614
   bin_PROGRAMS += lad_tci6614
@@ -71,7 +71,7 @@ else
 if TCI6638
   bin_PROGRAMS += lad_tci6638
 else
-  bin_PROGRAMS += lad_omap54xx_smp lad_dra7xx lad_omapl138 lad_c66ak2e lad_tci6614 lad_tci6630 lad_tci6636 lad_tci6638
+  bin_PROGRAMS += lad_omap54xx_smp lad_dra7xx lad_omapl138 lad_66ak2e lad_tci6614 lad_tci6630 lad_tci6636 lad_tci6638
 endif
 endif
 endif
@@ -122,7 +122,7 @@ endif
 lad_omap54xx_smp_SOURCES = $(common_sources) MultiProcCfg_omap54xx_smp.c
 lad_dra7xx_SOURCES = $(common_sources) MultiProcCfg_dra7xx.c
 lad_omapl138_SOURCES = $(common_sources) MultiProcCfg_omapl138.c
-lad_c66ak2e_SOURCES = $(common_sources) MultiProcCfg_c66ak2e.c
+lad_66ak2e_SOURCES = $(common_sources) MultiProcCfg_66ak2e.c
 lad_tci6614_SOURCES = $(common_sources) MultiProcCfg_tci6614.c
 lad_tci6630_SOURCES = $(common_sources) MultiProcCfg_tci6630.c
 lad_tci6636_SOURCES = $(common_sources) MultiProcCfg_tci6638.c
@@ -138,7 +138,7 @@ lad_dra7xx_LDADD = $(common_libraries) \
                 $(AM_LDFLAGS)
 lad_omapl138_LDADD = $(common_libraries) \
                 $(AM_LDFLAGS)
-lad_c66ak2e_LDADD = $(common_libraries) \
+lad_66ak2e_LDADD = $(common_libraries) \
                 $(AM_LDFLAGS)
 lad_tci6614_LDADD = $(common_libraries) \
                 $(AM_LDFLAGS)

diff --git a/linux/src/daemon/MultiProcCfg_c66ak2e.c b/linux/src/daemon/MultiProcCfg_66ak2e.c
similarity index 100%
rename from linux/src/daemon/MultiProcCfg_c66ak2e.c
rename to linux/src/daemon/MultiProcCfg_66ak2e.c