From 69a284bd36abd53ce23578eede368279363da969 Mon Sep 17 00:00:00 2001 From: Ron Evans Date: Fri, 16 Dec 2022 19:10:30 +0100 Subject: [PATCH] Revert "Bump CMSIS to 5.9.0" This reverts commit 92be61534e607a2564e6fe73bbed759533eef65a. --- .gitmodules | 2 +- Makefile | 4 ++-- lib/CMSIS | 2 +- targets/nrf51.json | 2 +- targets/nrf52.json | 2 +- targets/nrf52833.json | 2 +- targets/nrf52840.json | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index e11c5188..35e6870c 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 diff --git a/Makefile b/Makefile index 17f83bb5..fef3efc8 100644 --- a/Makefile +++ b/Makefile @@ -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 index 2b7495b8..9fe411ce 160000 --- a/lib/CMSIS +++ b/lib/CMSIS @@ -1 +1 @@ -Subproject commit 2b7495b8535bdcb306dac29b9ded4cfb679d7e5c +Subproject commit 9fe411cef1cef5de58e5957b89760759de44e393 diff --git a/targets/nrf51.json b/targets/nrf51.json index d9d1e1c8..714e2c55 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 e45e8208..3248ef73 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 03b61ad5..54304dbc 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 bc75d732..9d86a650 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",