Update nrfx submodule to v3.2.0 (#286)

Closes #282.
iree-org · Oct 24, 2023 · b64f287 · b64f287
1 parent 6845374
commit b64f287
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/build_tools/configure_build.sh b/build_tools/configure_build.sh
@@ -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
     ;;
 

diff --git a/build_tools/third_party/nrfx/CMakeLists.txt b/build_tools/third_party/nrfx/CMakeLists.txt
@@ -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/")
 
 #-------------------------------------------------------------------------------
@@ -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
@@ -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

diff --git a/third_party/nrfx b/third_party/nrfx