diff --git a/configure.ac b/configure.ac
index c2034bd44dc6e8191fa9cfec37a5bddc8b51a71b..355d2286af777878544bb4c6f9024494121699bd 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' 'omap4330' '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' '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"],
- [AC_MSG_NOTICE([PLATFORM is set to ${PLATFORM}])],
- [AS_IF([test "x$PLATFORM" = "xomap4430"],
[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" = "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_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])])])])])])])])
+
+# Ignore KERNEL path when no platform is set
+AS_IF([test "x$PLATFORM" = "x"], [KERNEL_INSTALL_DIR=])
+AS_IF([test "x$PLATFORM" = "x"], [DRM_PREFIX=])
+AS_IF([test "x$PLATFORM" = "x"], [CMEM_INSTALL_DIR=])
# Export optional user variable to Makefile(s)
AC_SUBST([PLATFORM])
AC_SUBST([CMEM_INSTALL_DIR])
+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([OMAP4430], [test "x$PLATFORM" = "xomap4430"])
-AM_CONDITIONAL([TCI6614], [test "x$PLATFORM" = "xtci6614"])
-AM_CONDITIONAL([TCI6638], [test "x$PLATFORM" = "xtci6638"])
-
-AM_CONDITIONAL([CMEM], [test "x$CMEM_INSTALL_DIR" != "x"])
+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([CMEM], [test "x$CMEM_INSTALL_DIR" != "x"])
+AM_CONDITIONAL([KDIR], [test "x$KERNEL_INSTALL_DIR" != "x"])
+AM_CONDITIONAL([DRM], [test "x$DRM_PREFIX" != "x"])
# Generate Makefile(s)
AC_CONFIG_FILES([Makefile])
AC_CONFIG_FILES([linux/etc/Makefile])
AC_CONFIG_FILES([linux/src/utils/Makefile])
AC_CONFIG_FILES([linux/src/api/Makefile])
-AC_CONFIG_FILES([linux/src/family/Makefile])
+AC_CONFIG_FILES([linux/src/mm/Makefile])
AC_CONFIG_FILES([linux/src/daemon/Makefile])
AC_CONFIG_FILES([linux/src/tests/Makefile])
AC_OUTPUT
You have configured to build for the '${PLATFORM}' platform
-Your CMEM installation is at:
+Your KERNEL installation directory is set to:
+ '${KERNEL_INSTALL_DIR}'
+
+Your DRM installation directory is set to:
+ '${DRM_PREFIX}'
+
+Your CMEM installation directory is set to:
'${CMEM_INSTALL_DIR}'
Now type 'make; sudo make install' to generate the program