Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: bump CrossGCC & openOCD versions to enable Apple Silicon support #31

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: bump CrossGCC & openOCD versions to enable Apple Silicon support #31

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5861f56
update
ahiuchingau May 4, 2023
74d3f30
ahiuchingau May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions FindCrossGCC.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,32 @@ Provides the variables
#]=======================================================================]

include(FetchContent)
set(GCC_CROSS_DIR "${CMAKE_CURRENT_LIST_DIR}/../stm32-tools/gcc-arm-embedded")
set(GCC_CROSS_VERSION "10-2020-q4-major" CACHE STRING "GCC compiler version")

set(GCC_CROSS_VERSION "11.3.1-1.1" CACHE STRING "GCC compiler version")
set(GCC_CROSS_DIR "${CMAKE_SOURCE_DIR}/stm32-tools/gcc-arm-embedded")
set(GCC_CROSS_TRIPLE "arm-none-eabi")

if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
set(GCC_ARCHIVE_EXTENSION "x86_64-linux.tar.bz2")
set(GCC_ARCHIVE_EXTENSION "linux-x64.tar.gz")
elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
set(GCC_ARCHIVE_EXTENSION "mac.tar.bz2")
if("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "arm64")
set(GCC_ARCHIVE_EXTENSION "darwin-arm64.tar.gz")
else()
set(GCC_ARCHIVE_EXTENSION "darwin-x64.tar.gz")
endif()
else()
set(GCC_ARCHIVE_EXTENSION "win32.zip")
set(GCC_ARCHIVE_EXTENSION "win32-x64.zip")
endif()

set(GCC_ARCHIVE "gcc-arm-none-eabi-${GCC_CROSS_VERSION}-${GCC_ARCHIVE_EXTENSION}")
set(GCC_ARCHIVE "xpack-arm-none-eabi-gcc-${GCC_CROSS_VERSION}-${GCC_ARCHIVE_EXTENSION}")
set(GCC_URL "https://github.com/xpack-dev-tools/arm-none-eabi-gcc-xpack/releases/download")

FetchContent_Declare(
GCC_ARM_EMBEDDED
PREFIX ${GCC_CROSS_DIR}
SOURCE_DIR "${GCC_CROSS_DIR}/${CMAKE_HOST_SYSTEM_NAME}"
DOWNLOAD_DIR "${GCC_CROSS_DIR}/${CMAKE_HOST_SYSTEM_NAME}"
URL "https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/${GCC_ARCHIVE}"
URL "${GCC_URL}/v${GCC_CROSS_VERSION}/${GCC_ARCHIVE}"
)

macro(FIND_CROSS_GCC REQUIRED)
Expand Down
8 changes: 6 additions & 2 deletions FindOpenOCD.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,17 @@ built into openocd live

include(FetchContent)

set(OPENOCD_VERSION "0.11.0-1")
set(OPENOCD_VERSION "0.12.0-1")
set(OPENOCD_DIR "${CMAKE_SOURCE_DIR}/stm32-tools/openocd")

if("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Linux")
set(OPENOCD_ARCHIVE_EXTENSION "linux-x64.tar.gz")
elseif("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
set(OPENOCD_ARCHIVE_EXTENSION "darwin-x64.tar.gz")
if("${CMAKE_HOST_SYSTEM_PROCESSOR}" STREQUAL "arm64")
set(OPENOCD_ARCHIVE_EXTENSION "darwin-arm64.tar.gz")
else()
set(OPENOCD_ARCHIVE_EXTENSION "darwin-x64.tar.gz")
endif()
else()
set(OPENOCD_ARCHIVE_EXTENSION "win32-x64.zip")
endif()
Expand Down