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

Jump to bottom

Update nrfx submodule to v3.2.0 #286

Merged
merged 2 commits into from
Oct 24, 2023
Merged

Update nrfx submodule to v3.2.0 #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2b2e47
Update nrfx submodule to v3.2.0
marbre Oct 24, 2023
b37ab69
Merge branch 'main' into nrfx-3.2.0
marbre Oct 24, 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
2 changes: 1 addition & 1 deletion build_tools/configure_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ case $2 in
echo "Building for NRF52840"
export ARM_CPU="cortex-m4"
if [ -z ${PATH_TO_LINKER_SCRIPT+x} ]; then
export PATH_TO_LINKER_SCRIPT="${PATH_TO_REPO}/third_party/nrfx/mdk/nrf52840_xxaa.ld"
export PATH_TO_LINKER_SCRIPT="${PATH_TO_REPO}/third_party/nrfx-custom/nrf52840_xxaa.ld"
fi
;;

Expand Down
5 changes: 3 additions & 2 deletions build_tools/third_party/nrfx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

set(nrfx_DIR "${iree-bare-metal-arm_SOURCE_DIR}/third_party/nrfx/")
set(nrfx_custom_DIR "${iree-bare-metal-arm_SOURCE_DIR}/third_party/nrfx-custom/")
set(CMSIS_5_SOURCE_DIR "${iree-bare-metal-arm_SOURCE_DIR}/third_party/CMSIS_5/")

#-------------------------------------------------------------------------------
Expand All @@ -16,7 +17,7 @@ add_library(nrfx_nrf52840 STATIC "")
target_sources(nrfx_nrf52840
PRIVATE
${nrfx_DIR}/mdk/system_nrf52840.c
${nrfx_DIR}/mdk/gcc_startup_nrf52840.S
${nrfx_custom_DIR}/gcc_startup_nrf52840.S
)

target_include_directories(nrfx_nrf52840
Expand All @@ -32,7 +33,7 @@ target_compile_definitions(nrfx_nrf52840
)

# Allow ld to find generic linker script
target_link_directories(nrfx_nrf52840 INTERFACE "${nrfx_DIR}/mdk/")
target_link_directories(nrfx_nrf52840 INTERFACE "${nrfx_custom_DIR}")

#-------------------------------------------------------------------------------
# nRF UART
Expand Down
2 changes: 1 addition & 1 deletion third_party/nrfx
Open in desktop
Submodule nrfx updated 463 files
Loading