sync with upstream

7 files changed, 6 insertions, 10 deletions

diff --git a/project/cmake/scripts/rbpi/archsetup.cmake b/project/cmake/scripts/rbpi/ArchSetup.cmake
index 72a610f..fa1f9f4 100644
--- a/project/cmake/scripts/rbpi/archsetup.cmake
+++ b/project/cmake/scripts/rbpi/ArchSetup.cmake
@@ -1,7 +1,3 @@
-if(NOT CMAKE_TOOLCHAIN_FILE)
-  message(FATAL_ERROR "CMAKE_TOOLCHAIN_FILE required for rbpi. See ${PROJECT_SOURCE_DIR}/README.md")
-endif()
-
 set(ARCH_DEFINES -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_ARMEL -DTARGET_RASPBERRY_PI
                  -DHAS_OMXPLAYER -DHAVE_OMXLIB)
 set(SYSTEM_DEFINES -D__STDC_CONSTANT_MACROS -D_FILE_DEFINED
@@ -16,8 +12,10 @@ if(WITH_ARCH)
 else()
   if(CPU STREQUAL arm1176jzf-s)
     set(ARCH arm-linux-gnueabihf)
-  elseif(CPU MATCHES "cortex-a7")
+    set(NEON False)
+  elseif(CPU MATCHES "cortex-a7" OR CPU MATCHES "cortex-a53")
     set(ARCH arm-linux-gnueabihf)
+    set(NEON True)
   else()
     message(SEND_ERROR "Unknown CPU: ${CPU}")
   endif()
@@ -25,8 +23,6 @@ endif()
 
 find_package(CXX11 REQUIRED)
 
-set(LIRC_DEVICE "\"/dev/lircd\"" CACHE STRING "LIRC device to use")
-set(DEP_DEFINES -DLIRC_DEVICE=${LIRC_DEVICE})
 set(MMAL_FOUND 1 CACHE INTERNAL "MMAL")
 set(OMX_FOUND 1 CACHE INTERNAL "OMX")
 set(OMXLIB_FOUND 1 CACHE INTERNAL "OMX")
diff --git a/project/cmake/scripts/rbpi/Install.cmake b/project/cmake/scripts/rbpi/Install.cmake
new file mode 120000
index 0000000..28ce012
--- /dev/null
+++ b/project/cmake/scripts/rbpi/Install.cmake
@@ -0,0 +1 @@
+../linux/Install.cmake
\ No newline at end of file
diff --git a/project/cmake/scripts/rbpi/Macros.cmake b/project/cmake/scripts/rbpi/Macros.cmake
new file mode 120000
index 0000000..2fdbb25
--- /dev/null
+++ b/project/cmake/scripts/rbpi/Macros.cmake
@@ -0,0 +1 @@
+../linux/Macros.cmake
\ No newline at end of file
diff --git a/project/cmake/scripts/rbpi/PathSetup.cmake b/project/cmake/scripts/rbpi/PathSetup.cmake
new file mode 120000
index 0000000..6786c1c
--- /dev/null
+++ b/project/cmake/scripts/rbpi/PathSetup.cmake
@@ -0,0 +1 @@
+../linux/PathSetup.cmake
\ No newline at end of file
diff --git a/project/cmake/scripts/rbpi/install.cmake b/project/cmake/scripts/rbpi/install.cmake
deleted file mode 120000
index 0409981..0000000
--- a/project/cmake/scripts/rbpi/install.cmake
+++ /dev/null
@@ -1 +0,0 @@
-../linux/install.cmake
\ No newline at end of file
diff --git a/project/cmake/scripts/rbpi/macros.cmake b/project/cmake/scripts/rbpi/macros.cmake
deleted file mode 120000
index 28c77ca..0000000
--- a/project/cmake/scripts/rbpi/macros.cmake
+++ /dev/null
@@ -1 +0,0 @@
-../linux/macros.cmake
\ No newline at end of file
diff --git a/project/cmake/scripts/rbpi/pathsetup.cmake b/project/cmake/scripts/rbpi/pathsetup.cmake
deleted file mode 120000
index 26d7f17..0000000
--- a/project/cmake/scripts/rbpi/pathsetup.cmake
+++ /dev/null
@@ -1 +0,0 @@
-../linux/pathsetup.cmake
\ No newline at end of file