diff options
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| m--------- | lib/CMSIS | 0 | ||||
| -rw-r--r-- | targets/nrf51.json | 2 | ||||
| -rw-r--r-- | targets/nrf52.json | 2 | ||||
| -rw-r--r-- | targets/nrf52833.json | 2 | ||||
| -rw-r--r-- | targets/nrf52840.json | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules index e11c5188d..35e6870c0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/NordicSemiconductor/nrfx.git [submodule "lib/CMSIS"] path = lib/CMSIS - url = https://github.com/ARM-software/CMSIS_5.git + url = https://github.com/ARM-software/CMSIS.git [submodule "lib/avr"] path = lib/avr url = https://github.com/avr-rust/avr-mcu.git @@ -748,7 +748,7 @@ wasmtest: build/release: tinygo gen-device wasi-libc $(if $(filter 1,$(USE_SYSTEM_BINARYEN)),,binaryen) @mkdir -p build/release/tinygo/bin @mkdir -p build/release/tinygo/lib/clang/include - @mkdir -p build/release/tinygo/lib/CMSIS/CMSIS/Core + @mkdir -p build/release/tinygo/lib/CMSIS/CMSIS @mkdir -p build/release/tinygo/lib/macos-minimal-sdk @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-crt/lib-common @mkdir -p build/release/tinygo/lib/mingw-w64/mingw-w64-headers/defaults @@ -768,7 +768,7 @@ ifneq ($(USE_SYSTEM_BINARYEN),1) @cp -p build/wasm-opt$(EXE) build/release/tinygo/bin endif @cp -p $(abspath $(CLANG_SRC))/lib/Headers/*.h build/release/tinygo/lib/clang/include - @cp -rp lib/CMSIS/CMSIS/Core/Include build/release/tinygo/lib/CMSIS/CMSIS/Core + @cp -rp lib/CMSIS/CMSIS/Include build/release/tinygo/lib/CMSIS/CMSIS @cp -rp lib/CMSIS/README.md build/release/tinygo/lib/CMSIS @cp -rp lib/macos-minimal-sdk/* build/release/tinygo/lib/macos-minimal-sdk @cp -rp lib/musl/arch/aarch64 build/release/tinygo/lib/musl/arch diff --git a/lib/CMSIS b/lib/CMSIS -Subproject 2b7495b8535bdcb306dac29b9ded4cfb679d7e5 +Subproject 9fe411cef1cef5de58e5957b89760759de44e39 diff --git a/targets/nrf51.json b/targets/nrf51.json index d9d1e1c81..714e2c55f 100644 --- a/targets/nrf51.json +++ b/targets/nrf51.json @@ -3,7 +3,7 @@ "build-tags": ["nrf51822", "nrf51", "nrf"], "cflags": [ "-DNRF51", - "-I{root}/lib/CMSIS/CMSIS/Core/Include", + "-I{root}/lib/CMSIS/CMSIS/Include", "-I{root}/lib/nrfx/mdk" ], "linkerscript": "targets/nrf51.ld", diff --git a/targets/nrf52.json b/targets/nrf52.json index e45e8208a..3248ef731 100644 --- a/targets/nrf52.json +++ b/targets/nrf52.json @@ -3,7 +3,7 @@ "build-tags": ["nrf52", "nrf"], "cflags": [ "-DNRF52832_XXAA", - "-I{root}/lib/CMSIS/CMSIS/Core/Include", + "-I{root}/lib/CMSIS/CMSIS/Include", "-I{root}/lib/nrfx/mdk" ], "linkerscript": "targets/nrf52.ld", diff --git a/targets/nrf52833.json b/targets/nrf52833.json index 03b61ad5a..54304dbc6 100644 --- a/targets/nrf52833.json +++ b/targets/nrf52833.json @@ -3,7 +3,7 @@ "build-tags": ["nrf52833", "nrf"], "cflags": [ "-DNRF52833_XXAA", - "-I{root}/lib/CMSIS/CMSIS/Core/Include", + "-I{root}/lib/CMSIS/CMSIS/Include", "-I{root}/lib/nrfx/mdk" ], "linkerscript": "targets/nrf52833.ld", diff --git a/targets/nrf52840.json b/targets/nrf52840.json index bc75d7329..9d86a6503 100644 --- a/targets/nrf52840.json +++ b/targets/nrf52840.json @@ -3,7 +3,7 @@ "build-tags": ["nrf52840", "nrf"], "cflags": [ "-DNRF52840_XXAA", - "-I{root}/lib/CMSIS/CMSIS/Core/Include", + "-I{root}/lib/CMSIS/CMSIS/Include", "-I{root}/lib/nrfx/mdk" ], "linkerscript": "targets/nrf52840.ld", |