zrzk
/
px4_autopilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Rename to generic arm toolchain

sbg
Kabir Mohammed 8 years ago committed by Lorenz Meier
parent
bd60f87283
commit
f123ade6d3
6 changed files with 13 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Tools/adb_upload_to_bebop.sh
  2. 4
      cmake/configs/posix_bebop_default.cmake
  3. 6
      cmake/configs/posix_rpi_cross.cmake
  4. 2
      cmake/posix/px4_impl_posix.cmake
  5. 6
      cmake/toolchains/Toolchain-arm-linux-gnueabihf-clang.cmake
  6. 6
      cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake

2
Tools/adb_upload_to_bebop.sh
Unescape View File

@ -34,7 +34,7 @@ adb shell mount -o remount,rw / @@ -34,7 +34,7 @@ adb shell mount -o remount,rw /
adb shell touch /home/root/parameters
adb shell mkdir -p /data/ftp/internal_000/fs/microsd
${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-strip \
${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin/arm-linux-gnueabihf-strip \
-R .comment -R .gnu.version \
../build_posix_bebop_default/src/firmware/posix/px4

4
cmake/configs/posix_bebop_default.cmake
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
include(posix/px4_impl_posix)
set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian.cmake)
set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake)
add_definitions(
-D__PX4_POSIX_BEBOP
@ -9,7 +9,7 @@ add_definitions( @@ -9,7 +9,7 @@ add_definitions(
)
set(CMAKE_PROGRAM_PATH
"${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin"
"${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin"
${CMAKE_PROGRAM_PATH}
)

6
cmake/configs/posix_rpi_cross.cmake
Unescape View File

@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
include(configs/posix_rpi_common)
if("$ENV{RPI_USE_CLANG}" STREQUAL "1")
set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian-clang.cmake)
set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf-clang.cmake)
else()
set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian.cmake)
set(CMAKE_TOOLCHAIN_FILE ${PX4_SOURCE_DIR}/cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake)
endif()
set(CMAKE_PROGRAM_PATH
"${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin"
"${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin"
${CMAKE_PROGRAM_PATH}
)

2
cmake/posix/px4_impl_posix.cmake
Unescape View File

@ -274,7 +274,7 @@ elseif ("${BOARD}" STREQUAL "rpi" AND "$ENV{RPI_USE_CLANG}" STREQUAL "1") @@ -274,7 +274,7 @@ elseif ("${BOARD}" STREQUAL "rpi" AND "$ENV{RPI_USE_CLANG}" STREQUAL "1")
-m32
--target=arm-linux-gnueabihf
-ccc-gcc-name arm-linux-gnueabihf
--sysroot=${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/arm-linux-gnueabihf/libc/)
--sysroot=${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/arm-linux-gnueabihf/libc/)
set(added_c_flags ${POSIX_CMAKE_C_FLAGS} ${clang_added_flags})
list(APPEND added_cxx_flags ${POSIX_CMAKE_CXX_FLAGS} ${clang_added_flags})

6
cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian-clang.cmake → cmake/toolchains/Toolchain-arm-linux-gnueabihf-clang.cmake
Unescape View File

@ -15,7 +15,7 @@ set(CMAKE_SYSTEM_VERSION 1) @@ -15,7 +15,7 @@ set(CMAKE_SYSTEM_VERSION 1)
# specify the cross compiler
# requires a symbolic link typically from /usr/bin/clang
find_program(C_COMPILER clang
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
NO_DEFAULT_PATH
)
@ -25,7 +25,7 @@ endif() @@ -25,7 +25,7 @@ endif()
cmake_force_c_compiler(${C_COMPILER} Clang)
find_program(CXX_COMPILER clang++
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
NO_DEFAULT_PATH
)
@ -38,7 +38,7 @@ cmake_force_cxx_compiler(${CXX_COMPILER} Clang) @@ -38,7 +38,7 @@ cmake_force_cxx_compiler(${CXX_COMPILER} Clang)
foreach(tool objcopy nm ld)
string(TOUPPER ${tool} TOOL)
find_program(${TOOL} arm-linux-gnueabihf-${tool}
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
NO_DEFAULT_PATH
)
if(NOT ${TOOL})

6
cmake/toolchains/Toolchain-arm-linux-gnueabihf-raspbian.cmake → cmake/toolchains/Toolchain-arm-linux-gnueabihf.cmake
Unescape View File

@ -30,7 +30,7 @@ set(CMAKE_SYSTEM_VERSION 1) @@ -30,7 +30,7 @@ set(CMAKE_SYSTEM_VERSION 1)
# specify the cross compiler
find_program(C_COMPILER arm-linux-gnueabihf-gcc
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
NO_DEFAULT_PATH
)
@ -40,7 +40,7 @@ endif() @@ -40,7 +40,7 @@ endif()
cmake_force_c_compiler(${C_COMPILER} GNU)
find_program(CXX_COMPILER arm-linux-gnueabihf-g++
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
NO_DEFAULT_PATH
)
@ -53,7 +53,7 @@ cmake_force_cxx_compiler(${CXX_COMPILER} GNU) @@ -53,7 +53,7 @@ cmake_force_cxx_compiler(${CXX_COMPILER} GNU)
foreach(tool objcopy nm ld)
string(TOUPPER ${tool} TOOL)
find_program(${TOOL} arm-linux-gnueabihf-${tool}
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf-raspbian/bin
PATHS ${RPI_TOOLCHAIN_DIR}/gcc-linaro-arm-linux-gnueabihf/bin
NO_DEFAULT_PATH
)
if(NOT ${TOOL})
Write Preview
Loading…
Cancel
Save