From 4ed112b2594f6a8aa34b5d9f3894eb7c36170022 Mon Sep 17 00:00:00 2001
From: Kabir Mohammed <mhkabir98@gmail.com>
Date: Fri, 29 Apr 2016 21:22:34 +0530
Subject: [PATCH] Remove old toolchain

---
 cmake/cmake_hexagon                           |  2 +-
 cmake/configs/posix_eagle_default.cmake       |  9 +-
 .../Toolchain-arm-linux-gnueabihf.cmake       | 93 -------------------
 src/lib/DriverFramework                       |  2 +-
 4 files changed, 10 insertions(+), 96 deletions(-)
 delete mode 100644 cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake

diff --git a/cmake/cmake_hexagon b/cmake/cmake_hexagon
index da4d6e7898..77d487dc07 160000
--- a/cmake/cmake_hexagon
+++ b/cmake/cmake_hexagon
@@ -1 +1 @@
-Subproject commit da4d6e7898880ce370dca21dac1362cd56274a79
+Subproject commit 77d487dc076a8519f81a335a5e4a2040799790de
diff --git a/cmake/configs/posix_eagle_default.cmake b/cmake/configs/posix_eagle_default.cmake
index ddb152fcb0..3a6dd22755 100644
--- a/cmake/configs/posix_eagle_default.cmake
+++ b/cmake/configs/posix_eagle_default.cmake
@@ -4,7 +4,14 @@
 # on the Linux side of the Snapdragon.
 include(configs/posix_sdflight_default)
 
-# This definition allows to differentiate the specific board.
+set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/cmake_hexagon/toolchain/Toolchain-arm-linux-gnueabihf.cmake)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/cmake_hexagon")
+
+set(CONFIG_SHMEM "1")
+
+# This definition allows to differentiate if this just the usual POSIX build
+# or if it is for the Snapdragon.
 add_definitions(
 	-D__PX4_POSIX_EAGLE
 )
diff --git a/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake b/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake
deleted file mode 100644
index cfac028903..0000000000
--- a/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake
+++ /dev/null
@@ -1,93 +0,0 @@
-# defines:
-#
-# NM
-# OBJCOPY
-# LD
-# CXX_COMPILER
-# C_COMPILER
-# CMAKE_SYSTEM_NAME
-# CMAKE_SYSTEM_VERSION
-# GENROMFS
-# LINKER_FLAGS
-# CMAKE_EXE_LINKER_FLAGS
-# CMAKE_FIND_ROOT_PATH
-# CMAKE_FIND_ROOT_PATH_MODE_PROGRAM
-# CMAKE_FIND_ROOT_PATH_MODE_LIBRARY
-# CMAKE_FIND_ROOT_PATH_MODE_INCLUDE
-
-include(CMakeForceCompiler)
-
-if ("$ENV{HEXAGON_SDK_ROOT}" STREQUAL "")
-        message(FATAL_ERROR "HEXAGON_SDK_ROOT not set")
-else()
-        set(HEXAGON_SDK_ROOT $ENV{HEXAGON_SDK_ROOT})
-endif()
-
-if ("$ENV{HEXAGON_ARM_SYSROOT}" STREQUAL "")
-        message(FATAL_ERROR "HEXAGON_ARM_SYSROOT not set")
-else()
-        set(HEXAGON_TOOLS_ROOT $ENV{HEXAGON_ARM_SYSROOT})
-endif()
-
-# this one is important
-set(CMAKE_SYSTEM_NAME Generic)
-
-#this one not so much
-set(CMAKE_SYSTEM_VERSION 1)
-
-# specify the cross compiler
-find_program(C_COMPILER arm-linux-gnueabihf-gcc
-	PATHS ${HEXAGON_SDK_ROOT}/gcc-linaro-arm-linux-gnueabihf-4.8-2013.08_linux/bin
-	NO_DEFAULT_PATH
-	)
-
-if(NOT C_COMPILER)
-	message(FATAL_ERROR "could not find arm-linux-gnueabihf-gcc compiler")
-endif()
-cmake_force_c_compiler(${C_COMPILER} GNU)
-
-find_program(CXX_COMPILER arm-linux-gnueabihf-g++
-	PATHS ${HEXAGON_SDK_ROOT}/gcc-linaro-arm-linux-gnueabihf-4.8-2013.08_linux/bin
-	NO_DEFAULT_PATH
-	)
-
-if(NOT CXX_COMPILER)
-	message(FATAL_ERROR "could not find arm-linux-gnueabihf-g++ compiler")
-endif()
-cmake_force_cxx_compiler(${CXX_COMPILER} GNU)
-
-# compiler tools
-foreach(tool objcopy nm ld)
-	string(TOUPPER ${tool} TOOL)
-	find_program(${TOOL} arm-linux-gnueabihf-${tool}
-		PATHS ${HEXAGON_SDK_ROOT}/gcc-linaro-arm-linux-gnueabihf-4.8-2013.08_linux/bin
-		NO_DEFAULT_PATH
-		)
-	if(NOT ${TOOL})
-		message(FATAL_ERROR "could not find arm-linux-gnueabihf-${tool}")
-	endif()
-endforeach()
-
-# os tools
-foreach(tool echo patch grep rm mkdir nm genromfs cp touch make unzip)
-	string(TOUPPER ${tool} TOOL)
-	find_program(${TOOL} ${tool})
-	if(NOT ${TOOL})
-		message(FATAL_ERROR "could not find ${TOOL}")
-	endif()
-endforeach()
-
-set(C_FLAGS "--sysroot=${HEXAGON_ARM_SYSROOT}")
-set(LINKER_FLAGS "-Wl,-gc-sections")
-set(CMAKE_EXE_LINKER_FLAGS ${LINKER_FLAGS})
-set(CMAKE_C_FLAGS ${C_FLAGS})
-set(CMAKE_CXX_LINKER_FLAGS ${C_FLAGS})
-
-# where is the target environment
-set(CMAKE_FIND_ROOT_PATH  get_file_component(${C_COMPILER} PATH))
-
-# search for programs in the build host directories
-set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-# for libraries and headers in the target directories
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
diff --git a/src/lib/DriverFramework b/src/lib/DriverFramework
index f8cb7dc3f3..62449aef6d 160000
--- a/src/lib/DriverFramework
+++ b/src/lib/DriverFramework
@@ -1 +1 @@
-Subproject commit f8cb7dc3f382e2693099df66ffad7f59ade623f6
+Subproject commit 62449aef6decd2faa75bc2abd509333df5a675c4