From a6e2c76f23af12bb0dc276cde897dfe90fab1626 Mon Sep 17 00:00:00 2001 From: sago35 Date: Fri, 25 Feb 2022 19:11:49 +0900 Subject: [PATCH] Revert "all: move stm32 files to separate repository" This reverts commit 644356c220ed88f110d01300f671a170cd36eb04. --- .gitignore | 3 +++ .gitmodules | 6 +++--- Makefile | 7 +++++++ lib/stm32-svd | 1 + loader/goroot.go | 2 -- src/machine/board_bluepill.go | 2 +- src/machine/board_feather-stm32f405.go | 2 +- src/machine/board_gnse.go | 2 +- src/machine/board_lgt92.go | 2 +- src/machine/board_lorae5.go | 2 +- src/machine/board_nucleof103rb.go | 2 +- src/machine/board_nucleof722ze.go | 2 +- src/machine/board_nucleol031k6.go | 2 +- src/machine/board_nucleol432kc.go | 2 +- src/machine/board_nucleol552ze.go | 2 +- src/machine/board_nucleowl55jc.go | 2 +- src/machine/board_stm32f469disco.go | 2 +- src/machine/board_stm32f4disco.go | 2 +- src/machine/board_swan.go | 2 +- src/machine/machine_stm32.go | 2 +- src/machine/machine_stm32_adc_f1.go | 2 +- src/machine/machine_stm32_adc_f4.go | 2 +- src/machine/machine_stm32_exti_afio.go | 2 +- src/machine/machine_stm32_exti_exti.go | 2 +- src/machine/machine_stm32_exti_syscfg.go | 2 +- src/machine/machine_stm32_exti_syscfg_noenable.go | 2 +- src/machine/machine_stm32_gpio_reva.go | 2 +- src/machine/machine_stm32_gpio_revb.go | 2 +- src/machine/machine_stm32_gpio_revb_mp.go | 2 +- src/machine/machine_stm32_i2c_reva.go | 2 +- src/machine/machine_stm32_i2c_revb.go | 2 +- src/machine/machine_stm32_moder_gpio.go | 2 +- src/machine/machine_stm32_rng.go | 2 +- src/machine/machine_stm32_spi.go | 2 +- src/machine/machine_stm32_tim.go | 2 +- src/machine/machine_stm32_uart.go | 2 +- src/machine/machine_stm32f103.go | 2 +- src/machine/machine_stm32f4.go | 2 +- src/machine/machine_stm32f7.go | 2 +- src/machine/machine_stm32f7x2.go | 2 +- src/machine/machine_stm32l0.go | 2 +- src/machine/machine_stm32l0x1.go | 2 +- src/machine/machine_stm32l0x2.go | 2 +- src/machine/machine_stm32l4.go | 2 +- src/machine/machine_stm32l5.go | 2 +- src/machine/machine_stm32l5x2.go | 2 +- src/machine/machine_stm32wlx.go | 2 +- src/runtime/runtime_stm32_timers.go | 2 +- src/runtime/runtime_stm32f103.go | 2 +- src/runtime/runtime_stm32f4.go | 2 +- src/runtime/runtime_stm32f405.go | 2 +- src/runtime/runtime_stm32f407.go | 2 +- src/runtime/runtime_stm32f469.go | 2 +- src/runtime/runtime_stm32f7x2.go | 2 +- src/runtime/runtime_stm32l0.go | 2 +- src/runtime/runtime_stm32l0x1.go | 2 +- src/runtime/runtime_stm32l0x2.go | 2 +- src/runtime/runtime_stm32l4.go | 2 +- src/runtime/runtime_stm32l4x2.go | 2 +- src/runtime/runtime_stm32l4x5.go | 2 +- src/runtime/runtime_stm32l5x2.go | 2 +- src/runtime/runtime_stm32wlx.go | 2 +- src/vendor/tinygo.org/x/device | 1 - targets/bluepill.json | 2 +- targets/feather-stm32f405.json | 2 +- targets/nucleo-f103rb.json | 2 +- targets/nucleo-f722ze.json | 2 +- targets/nucleo-l031k6.json | 4 ++-- targets/nucleo-l432kc.json | 4 ++-- targets/nucleo-l552ze.json | 4 ++-- targets/stm32f469disco.json | 2 +- targets/stm32f4disco.json | 2 +- targets/stm32l0x2.json | 4 ++-- targets/stm32wl5x_cm4.json | 2 +- targets/stm32wle5.json | 2 +- targets/swan.json | 4 ++-- 76 files changed, 89 insertions(+), 81 deletions(-) create mode 160000 lib/stm32-svd delete mode 160000 src/vendor/tinygo.org/x/device diff --git a/.gitignore b/.gitignore index 37076e5722..623c6b0c13 100644 --- a/.gitignore +++ b/.gitignore @@ -11,10 +11,13 @@ src/device/sam/*.go src/device/sam/*.s src/device/sifive/*.go src/device/sifive/*.s +src/device/stm32/*.go +src/device/stm32/*.s src/device/kendryte/*.go src/device/kendryte/*.s src/device/rp/*.go src/device/rp/*.s +vendor llvm-build llvm-project build/* diff --git a/.gitmodules b/.gitmodules index 49ceeddc64..e82a938b70 100644 --- a/.gitmodules +++ b/.gitmodules @@ -20,6 +20,9 @@ [submodule "lib/picolibc"] path = lib/picolibc url = https://github.com/keith-packard/picolibc.git +[submodule "lib/stm32-svd"] + path = lib/stm32-svd + url = https://github.com/tinygo-org/stm32-svd [submodule "lib/musl"] path = lib/musl url = git://git.musl-libc.org/musl @@ -32,6 +35,3 @@ [submodule "lib/macos-minimal-sdk"] path = lib/macos-minimal-sdk url = https://github.com/aykevl/macos-minimal-sdk.git -[submodule "src/vendor/tinygo.org/x/device"] - path = src/vendor/tinygo.org/x/device - url = https://github.com/tinygo-org/device.git diff --git a/Makefile b/Makefile index 8aeb9fe7ae..8691ac882c 100644 --- a/Makefile +++ b/Makefile @@ -126,6 +126,9 @@ fmt-check: gen-device: gen-device-avr gen-device-esp gen-device-nrf gen-device-sam gen-device-sifive gen-device-kendryte gen-device-nxp gen-device-rp +ifneq ($(STM32), 0) +gen-device: gen-device-stm32 +endif gen-device-avr: @if [ ! -e lib/avr/README.md ]; then echo "Submodules have not been downloaded. Please download them using:\n git submodule update --init"; exit 1; fi @@ -162,6 +165,10 @@ gen-device-kendryte: build/gen-device-svd ./build/gen-device-svd -source=https://github.com/posborne/cmsis-svd/tree/master/data/Kendryte-Community -interrupts=software lib/cmsis-svd/data/Kendryte-Community/ src/device/kendryte/ GO111MODULE=off $(GO) fmt ./src/device/kendryte +gen-device-stm32: build/gen-device-svd + ./build/gen-device-svd -source=https://github.com/tinygo-org/stm32-svd lib/stm32-svd/svd src/device/stm32/ + GO111MODULE=off $(GO) fmt ./src/device/stm32 + gen-device-rp: build/gen-device-svd ./build/gen-device-svd -source=https://github.com/posborne/cmsis-svd/tree/master/data/RaspberryPi lib/cmsis-svd/data/RaspberryPi/ src/device/rp/ GO111MODULE=off $(GO) fmt ./src/device/rp diff --git a/lib/stm32-svd b/lib/stm32-svd new file mode 160000 index 0000000000..e6db8e32d5 --- /dev/null +++ b/lib/stm32-svd @@ -0,0 +1 @@ +Subproject commit e6db8e32d5d42293a528434ec12e7f88479a8649 diff --git a/loader/goroot.go b/loader/goroot.go index 9beac58a39..1ff7fa8d35 100644 --- a/loader/goroot.go +++ b/loader/goroot.go @@ -241,8 +241,6 @@ func pathsToOverride(needsSyscallPackage bool) map[string]bool { "runtime/": false, "sync/": true, "testing/": true, - "vendor/": true, - "vendor/tinygo.org/": false, } if needsSyscallPackage { paths["syscall/"] = true // include syscall/js diff --git a/src/machine/board_bluepill.go b/src/machine/board_bluepill.go index a39ca27f8c..9f7dca8a43 100644 --- a/src/machine/board_bluepill.go +++ b/src/machine/board_bluepill.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_feather-stm32f405.go b/src/machine/board_feather-stm32f405.go index 9ef49be5d5..1e695a43a8 100644 --- a/src/machine/board_feather-stm32f405.go +++ b/src/machine/board_feather-stm32f405.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_gnse.go b/src/machine/board_gnse.go index 2968671bfb..073c0c045c 100644 --- a/src/machine/board_gnse.go +++ b/src/machine/board_gnse.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_lgt92.go b/src/machine/board_lgt92.go index 72042adbdf..7a4da00bbf 100644 --- a/src/machine/board_lgt92.go +++ b/src/machine/board_lgt92.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_lorae5.go b/src/machine/board_lorae5.go index 66fd3246c5..422eca20b4 100644 --- a/src/machine/board_lorae5.go +++ b/src/machine/board_lorae5.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_nucleof103rb.go b/src/machine/board_nucleof103rb.go index 84bc654de6..3027c5ad52 100644 --- a/src/machine/board_nucleof103rb.go +++ b/src/machine/board_nucleof103rb.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_nucleof722ze.go b/src/machine/board_nucleof722ze.go index 4bb6abe707..4206e39d49 100644 --- a/src/machine/board_nucleof722ze.go +++ b/src/machine/board_nucleof722ze.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_nucleol031k6.go b/src/machine/board_nucleol031k6.go index 1093985cc9..cc0fbe15b0 100644 --- a/src/machine/board_nucleol031k6.go +++ b/src/machine/board_nucleol031k6.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_nucleol432kc.go b/src/machine/board_nucleol432kc.go index f06ea5f9ae..d8c91d06d2 100644 --- a/src/machine/board_nucleol432kc.go +++ b/src/machine/board_nucleol432kc.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_nucleol552ze.go b/src/machine/board_nucleol552ze.go index 9dd87ac3c0..d34f40d64c 100644 --- a/src/machine/board_nucleol552ze.go +++ b/src/machine/board_nucleol552ze.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_nucleowl55jc.go b/src/machine/board_nucleowl55jc.go index 3dfd3470ee..761d4b8414 100644 --- a/src/machine/board_nucleowl55jc.go +++ b/src/machine/board_nucleowl55jc.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_stm32f469disco.go b/src/machine/board_stm32f469disco.go index 7e16f66c4f..07a51c0bb8 100644 --- a/src/machine/board_stm32f469disco.go +++ b/src/machine/board_stm32f469disco.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_stm32f4disco.go b/src/machine/board_stm32f4disco.go index 2dc5a969e4..f396e4ca21 100644 --- a/src/machine/board_stm32f4disco.go +++ b/src/machine/board_stm32f4disco.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/board_swan.go b/src/machine/board_swan.go index a49d44d0d2..8c50fff491 100644 --- a/src/machine/board_swan.go +++ b/src/machine/board_swan.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/machine/machine_stm32.go b/src/machine/machine_stm32.go index 8a6936567f..a5d4b38270 100644 --- a/src/machine/machine_stm32.go +++ b/src/machine/machine_stm32.go @@ -3,7 +3,7 @@ package machine -import "tinygo.org/x/device/stm32" +import "device/stm32" const deviceName = stm32.Device diff --git a/src/machine/machine_stm32_adc_f1.go b/src/machine/machine_stm32_adc_f1.go index 3e73b6453a..fb0cee669d 100644 --- a/src/machine/machine_stm32_adc_f1.go +++ b/src/machine/machine_stm32_adc_f1.go @@ -4,7 +4,7 @@ package machine import ( - "tinygo.org/x/device/stm32" + "device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32_adc_f4.go b/src/machine/machine_stm32_adc_f4.go index 3ad93257d5..4f0b8d11bf 100644 --- a/src/machine/machine_stm32_adc_f4.go +++ b/src/machine/machine_stm32_adc_f4.go @@ -4,7 +4,7 @@ package machine import ( - "tinygo.org/x/device/stm32" + "device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32_exti_afio.go b/src/machine/machine_stm32_exti_afio.go index c093b391ef..0cf34003b0 100644 --- a/src/machine/machine_stm32_exti_afio.go +++ b/src/machine/machine_stm32_exti_afio.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/volatile" - "tinygo.org/x/device/stm32" ) func getEXTIConfigRegister(pin uint8) *volatile.Register32 { diff --git a/src/machine/machine_stm32_exti_exti.go b/src/machine/machine_stm32_exti_exti.go index f6145f9f45..e21cfae563 100644 --- a/src/machine/machine_stm32_exti_exti.go +++ b/src/machine/machine_stm32_exti_exti.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/volatile" - "tinygo.org/x/device/stm32" ) func getEXTIConfigRegister(pin uint8) *volatile.Register32 { diff --git a/src/machine/machine_stm32_exti_syscfg.go b/src/machine/machine_stm32_exti_syscfg.go index dc3e571bf1..7e4666cf4e 100644 --- a/src/machine/machine_stm32_exti_syscfg.go +++ b/src/machine/machine_stm32_exti_syscfg.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/volatile" - "tinygo.org/x/device/stm32" ) func getEXTIConfigRegister(pin uint8) *volatile.Register32 { diff --git a/src/machine/machine_stm32_exti_syscfg_noenable.go b/src/machine/machine_stm32_exti_syscfg_noenable.go index 0845e8dd9e..d6fa06e27e 100644 --- a/src/machine/machine_stm32_exti_syscfg_noenable.go +++ b/src/machine/machine_stm32_exti_syscfg_noenable.go @@ -4,8 +4,8 @@ package machine import ( + "device/stm32" "runtime/volatile" - "tinygo.org/x/device/stm32" ) func getEXTIConfigRegister(pin uint8) *volatile.Register32 { diff --git a/src/machine/machine_stm32_gpio_reva.go b/src/machine/machine_stm32_gpio_reva.go index bcbbf1addc..1712986aa7 100644 --- a/src/machine/machine_stm32_gpio_reva.go +++ b/src/machine/machine_stm32_gpio_reva.go @@ -4,7 +4,7 @@ package machine import ( - "tinygo.org/x/device/stm32" + "device/stm32" ) // This variant of the GPIO input interrupt logic is for diff --git a/src/machine/machine_stm32_gpio_revb.go b/src/machine/machine_stm32_gpio_revb.go index 3d97ee1c8e..7329f47ee1 100644 --- a/src/machine/machine_stm32_gpio_revb.go +++ b/src/machine/machine_stm32_gpio_revb.go @@ -4,7 +4,7 @@ package machine import ( - "tinygo.org/x/device/stm32" + "device/stm32" ) // This variant of the GPIO input interrupt logic is for diff --git a/src/machine/machine_stm32_gpio_revb_mp.go b/src/machine/machine_stm32_gpio_revb_mp.go index ba24b74941..0eb91989ab 100644 --- a/src/machine/machine_stm32_gpio_revb_mp.go +++ b/src/machine/machine_stm32_gpio_revb_mp.go @@ -4,7 +4,7 @@ package machine import ( - "tinygo.org/x/device/stm32" + "device/stm32" ) // diff --git a/src/machine/machine_stm32_i2c_reva.go b/src/machine/machine_stm32_i2c_reva.go index f03a46932b..eee4e155db 100644 --- a/src/machine/machine_stm32_i2c_reva.go +++ b/src/machine/machine_stm32_i2c_reva.go @@ -7,7 +7,7 @@ package machine // of MCUs. import ( - "tinygo.org/x/device/stm32" + "device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32_i2c_revb.go b/src/machine/machine_stm32_i2c_revb.go index 662429b660..449c280990 100644 --- a/src/machine/machine_stm32_i2c_revb.go +++ b/src/machine/machine_stm32_i2c_revb.go @@ -4,7 +4,7 @@ package machine import ( - "tinygo.org/x/device/stm32" + "device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32_moder_gpio.go b/src/machine/machine_stm32_moder_gpio.go index 71c85aa2f5..b24ac48c37 100644 --- a/src/machine/machine_stm32_moder_gpio.go +++ b/src/machine/machine_stm32_moder_gpio.go @@ -4,7 +4,7 @@ package machine import ( - "tinygo.org/x/device/stm32" + "device/stm32" ) // GPIO for the stm32 families except the stm32f1xx which uses a simpler but diff --git a/src/machine/machine_stm32_rng.go b/src/machine/machine_stm32_rng.go index 6cfc2d8265..8160ab87f0 100644 --- a/src/machine/machine_stm32_rng.go +++ b/src/machine/machine_stm32_rng.go @@ -3,7 +3,7 @@ package machine -import "tinygo.org/x/device/stm32" +import "device/stm32" var rngInitDone = false diff --git a/src/machine/machine_stm32_spi.go b/src/machine/machine_stm32_spi.go index 9537e5252f..481df8cd1a 100644 --- a/src/machine/machine_stm32_spi.go +++ b/src/machine/machine_stm32_spi.go @@ -6,8 +6,8 @@ package machine // Peripheral abstraction layer for SPI on the stm32 family import ( + "device/stm32" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32_tim.go b/src/machine/machine_stm32_tim.go index f1f9a8dbf0..02c6c7a165 100644 --- a/src/machine/machine_stm32_tim.go +++ b/src/machine/machine_stm32_tim.go @@ -7,9 +7,9 @@ package machine // depending on the size of that register in the MCU's TIM_Type structure. import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" ) const PWM_MODE1 = 0x6 diff --git a/src/machine/machine_stm32_uart.go b/src/machine/machine_stm32_uart.go index 1ebbad6bcd..9fdd17cb08 100644 --- a/src/machine/machine_stm32_uart.go +++ b/src/machine/machine_stm32_uart.go @@ -6,9 +6,9 @@ package machine // Peripheral abstraction layer for UARTs on the stm32 family. import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32f103.go b/src/machine/machine_stm32f103.go index 9a79550562..4c6778023b 100644 --- a/src/machine/machine_stm32f103.go +++ b/src/machine/machine_stm32f103.go @@ -6,9 +6,9 @@ package machine // Peripheral abstraction layer for the stm32. import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32f4.go b/src/machine/machine_stm32f4.go index fdf6b82fa8..dd8a0ad7ce 100644 --- a/src/machine/machine_stm32f4.go +++ b/src/machine/machine_stm32f4.go @@ -6,10 +6,10 @@ package machine // Peripheral abstraction layer for the stm32f4 import ( + "device/stm32" "math/bits" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32f7.go b/src/machine/machine_stm32f7.go index bc53dcb62f..838250b5a3 100644 --- a/src/machine/machine_stm32f7.go +++ b/src/machine/machine_stm32f7.go @@ -6,9 +6,9 @@ package machine // Peripheral abstraction layer for the stm32f4 import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32f7x2.go b/src/machine/machine_stm32f7x2.go index 2142f3fe0c..bdfa27bc16 100644 --- a/src/machine/machine_stm32f7x2.go +++ b/src/machine/machine_stm32f7x2.go @@ -6,7 +6,7 @@ package machine // Peripheral abstraction layer for the stm32f407 import ( - "tinygo.org/x/device/stm32" + "device/stm32" ) func CPUFrequency() uint32 { diff --git a/src/machine/machine_stm32l0.go b/src/machine/machine_stm32l0.go index c090d0c0ed..70b7ce5835 100644 --- a/src/machine/machine_stm32l0.go +++ b/src/machine/machine_stm32l0.go @@ -6,8 +6,8 @@ package machine // Peripheral abstraction layer for the stm32l0 import ( + "device/stm32" "runtime/interrupt" - "tinygo.org/x/device/stm32" ) func CPUFrequency() uint32 { diff --git a/src/machine/machine_stm32l0x1.go b/src/machine/machine_stm32l0x1.go index 2cd0db332c..254fb36cca 100644 --- a/src/machine/machine_stm32l0x1.go +++ b/src/machine/machine_stm32l0x1.go @@ -6,9 +6,9 @@ package machine // Peripheral abstraction layer for the stm32l0 import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32l0x2.go b/src/machine/machine_stm32l0x2.go index bc92c38f06..3ac6325480 100644 --- a/src/machine/machine_stm32l0x2.go +++ b/src/machine/machine_stm32l0x2.go @@ -6,9 +6,9 @@ package machine // Peripheral abstraction layer for the stm32l0 import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32l4.go b/src/machine/machine_stm32l4.go index a28d19920f..9063b802bf 100644 --- a/src/machine/machine_stm32l4.go +++ b/src/machine/machine_stm32l4.go @@ -4,9 +4,9 @@ package machine import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32l5.go b/src/machine/machine_stm32l5.go index c077b960dc..5eb951d83a 100644 --- a/src/machine/machine_stm32l5.go +++ b/src/machine/machine_stm32l5.go @@ -6,9 +6,9 @@ package machine // Peripheral abstraction layer for the stm32l5 import ( + "device/stm32" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/machine/machine_stm32l5x2.go b/src/machine/machine_stm32l5x2.go index acf03bd956..966c0cebc3 100644 --- a/src/machine/machine_stm32l5x2.go +++ b/src/machine/machine_stm32l5x2.go @@ -6,7 +6,7 @@ package machine // Peripheral abstraction layer for the stm32f407 import ( - "tinygo.org/x/device/stm32" + "device/stm32" ) func CPUFrequency() uint32 { diff --git a/src/machine/machine_stm32wlx.go b/src/machine/machine_stm32wlx.go index ff5d090063..377781e8b8 100644 --- a/src/machine/machine_stm32wlx.go +++ b/src/machine/machine_stm32wlx.go @@ -6,10 +6,10 @@ package machine // Peripheral abstraction layer for the stm32wle5 import ( + "device/stm32" "math/bits" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" "unsafe" ) diff --git a/src/runtime/runtime_stm32_timers.go b/src/runtime/runtime_stm32_timers.go index 7ee5b784f8..81b728f779 100644 --- a/src/runtime/runtime_stm32_timers.go +++ b/src/runtime/runtime_stm32_timers.go @@ -11,10 +11,10 @@ package runtime // Output Comparator used for fine-grained sleeps. import ( + "device/stm32" "machine" "runtime/interrupt" "runtime/volatile" - "tinygo.org/x/device/stm32" ) type timerInfo struct { diff --git a/src/runtime/runtime_stm32f103.go b/src/runtime/runtime_stm32f103.go index 0de50ac80c..c0cd7fa432 100644 --- a/src/runtime/runtime_stm32f103.go +++ b/src/runtime/runtime_stm32f103.go @@ -4,8 +4,8 @@ package runtime import ( + "device/stm32" "machine" - "tinygo.org/x/device/stm32" ) func init() { diff --git a/src/runtime/runtime_stm32f4.go b/src/runtime/runtime_stm32f4.go index 8e49a0196d..6ce44303cb 100644 --- a/src/runtime/runtime_stm32f4.go +++ b/src/runtime/runtime_stm32f4.go @@ -5,8 +5,8 @@ package runtime import ( + "device/stm32" "machine" - "tinygo.org/x/device/stm32" ) func init() { diff --git a/src/runtime/runtime_stm32f405.go b/src/runtime/runtime_stm32f405.go index c0c9d2edeb..ce8e9ef5ab 100644 --- a/src/runtime/runtime_stm32f405.go +++ b/src/runtime/runtime_stm32f405.go @@ -4,8 +4,8 @@ package runtime import ( + "device/stm32" "machine" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/runtime/runtime_stm32f407.go b/src/runtime/runtime_stm32f407.go index 6a3c4e3f8a..643f67f825 100644 --- a/src/runtime/runtime_stm32f407.go +++ b/src/runtime/runtime_stm32f407.go @@ -3,7 +3,7 @@ package runtime -import "tinygo.org/x/device/stm32" +import "device/stm32" /* clock settings diff --git a/src/runtime/runtime_stm32f469.go b/src/runtime/runtime_stm32f469.go index a50d78ebbb..56900e3b68 100644 --- a/src/runtime/runtime_stm32f469.go +++ b/src/runtime/runtime_stm32f469.go @@ -3,7 +3,7 @@ package runtime -import "tinygo.org/x/device/stm32" +import "device/stm32" /* clock settings diff --git a/src/runtime/runtime_stm32f7x2.go b/src/runtime/runtime_stm32f7x2.go index fb038e984f..29fe173c28 100644 --- a/src/runtime/runtime_stm32f7x2.go +++ b/src/runtime/runtime_stm32f7x2.go @@ -4,8 +4,8 @@ package runtime import ( + "device/stm32" "machine" - "tinygo.org/x/device/stm32" ) /* diff --git a/src/runtime/runtime_stm32l0.go b/src/runtime/runtime_stm32l0.go index 1703bcbbe0..bee860ab81 100644 --- a/src/runtime/runtime_stm32l0.go +++ b/src/runtime/runtime_stm32l0.go @@ -4,8 +4,8 @@ package runtime import ( + "device/stm32" "machine" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/runtime/runtime_stm32l0x1.go b/src/runtime/runtime_stm32l0x1.go index 7d6da357d0..dfc30f4c51 100644 --- a/src/runtime/runtime_stm32l0x1.go +++ b/src/runtime/runtime_stm32l0x1.go @@ -4,8 +4,8 @@ package runtime import ( + "device/stm32" "machine" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/runtime/runtime_stm32l0x2.go b/src/runtime/runtime_stm32l0x2.go index e399777529..4021e495fd 100644 --- a/src/runtime/runtime_stm32l0x2.go +++ b/src/runtime/runtime_stm32l0x2.go @@ -4,8 +4,8 @@ package runtime import ( + "device/stm32" "machine" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/runtime/runtime_stm32l4.go b/src/runtime/runtime_stm32l4.go index eb19234d1f..06b84eb6e1 100644 --- a/src/runtime/runtime_stm32l4.go +++ b/src/runtime/runtime_stm32l4.go @@ -4,8 +4,8 @@ package runtime import ( + "device/stm32" "machine" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/runtime/runtime_stm32l4x2.go b/src/runtime/runtime_stm32l4x2.go index 8857ea6d31..2e3cbbd07b 100644 --- a/src/runtime/runtime_stm32l4x2.go +++ b/src/runtime/runtime_stm32l4x2.go @@ -4,7 +4,7 @@ package runtime import ( - "tinygo.org/x/device/stm32" + "device/stm32" ) /* diff --git a/src/runtime/runtime_stm32l4x5.go b/src/runtime/runtime_stm32l4x5.go index 1517c549f0..87837b97f0 100644 --- a/src/runtime/runtime_stm32l4x5.go +++ b/src/runtime/runtime_stm32l4x5.go @@ -4,7 +4,7 @@ package runtime import ( - "tinygo.org/x/device/stm32" + "device/stm32" ) /* diff --git a/src/runtime/runtime_stm32l5x2.go b/src/runtime/runtime_stm32l5x2.go index c93e3a85ee..73d0cc0b1a 100644 --- a/src/runtime/runtime_stm32l5x2.go +++ b/src/runtime/runtime_stm32l5x2.go @@ -4,8 +4,8 @@ package runtime import ( + "device/stm32" "machine" - "tinygo.org/x/device/stm32" ) /* diff --git a/src/runtime/runtime_stm32wlx.go b/src/runtime/runtime_stm32wlx.go index ed1acd63ff..91c5a3f7d1 100644 --- a/src/runtime/runtime_stm32wlx.go +++ b/src/runtime/runtime_stm32wlx.go @@ -4,8 +4,8 @@ package runtime import ( + "device/stm32" "machine" - "tinygo.org/x/device/stm32" ) const ( diff --git a/src/vendor/tinygo.org/x/device b/src/vendor/tinygo.org/x/device deleted file mode 160000 index c873563f9e..0000000000 --- a/src/vendor/tinygo.org/x/device +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c873563f9ed5a213be5f037c007e27ce733007d1 diff --git a/targets/bluepill.json b/targets/bluepill.json index 4eda18e083..752261f4d8 100644 --- a/targets/bluepill.json +++ b/targets/bluepill.json @@ -4,7 +4,7 @@ "serial": "uart", "linkerscript": "targets/stm32.ld", "extra-files": [ - "src/vendor/tinygo.org/x/device/stm32/stm32f103.s" + "src/device/stm32/stm32f103.s" ], "flash-method": "openocd", "openocd-interface": "stlink-v2", diff --git a/targets/feather-stm32f405.json b/targets/feather-stm32f405.json index b592d21d85..3d824d1ed3 100644 --- a/targets/feather-stm32f405.json +++ b/targets/feather-stm32f405.json @@ -5,7 +5,7 @@ "automatic-stack-size": false, "linkerscript": "targets/stm32f405.ld", "extra-files": [ - "src/vendor/tinygo.org/x/device/stm32/stm32f405.s" + "src/device/stm32/stm32f405.s" ], "flash-method": "command", "flash-command": "dfu-util --alt 0 --dfuse-address 0x08000000 --download {bin}", diff --git a/targets/nucleo-f103rb.json b/targets/nucleo-f103rb.json index c7ed6cd171..723c5eef9a 100644 --- a/targets/nucleo-f103rb.json +++ b/targets/nucleo-f103rb.json @@ -4,7 +4,7 @@ "serial": "uart", "linkerscript": "targets/stm32f103rb.ld", "extra-files": [ - "src/vendor/tinygo.org/x/device/stm32/stm32f103.s" + "src/device/stm32/stm32f103.s" ], "flash-method": "openocd", "openocd-interface": "stlink-v2-1", diff --git a/targets/nucleo-f722ze.json b/targets/nucleo-f722ze.json index 1cea69db95..f426b332d7 100644 --- a/targets/nucleo-f722ze.json +++ b/targets/nucleo-f722ze.json @@ -4,7 +4,7 @@ "serial": "uart", "linkerscript": "targets/stm32f7x2zetx.ld", "extra-files": [ - "src/vendor/tinygo.org/x/device/stm32/stm32f7x2.s" + "src/device/stm32/stm32f7x2.s" ], "flash-method": "openocd", "openocd-interface": "stlink-v2-1", diff --git a/targets/nucleo-l031k6.json b/targets/nucleo-l031k6.json index cf980b7db1..eed8f38f06 100644 --- a/targets/nucleo-l031k6.json +++ b/targets/nucleo-l031k6.json @@ -4,9 +4,9 @@ "serial": "uart", "linkerscript": "targets/stm32l031k6.ld", "extra-files": [ - "src/vendor/tinygo.org/x/device/stm32/stm32l0x1.s" + "src/device/stm32/stm32l0x1.s" ], "flash-method": "openocd", "openocd-interface": "stlink", "openocd-target": "stm32l0" -} +} \ No newline at end of file diff --git a/targets/nucleo-l432kc.json b/targets/nucleo-l432kc.json index 44772a431d..028b034b07 100644 --- a/targets/nucleo-l432kc.json +++ b/targets/nucleo-l432kc.json @@ -4,9 +4,9 @@ "serial": "uart", "linkerscript": "targets/stm32l4x2.ld", "extra-files": [ - "src/vendor/tinygo.org/x/device/stm32/stm32l4x2.s" + "src/device/stm32/stm32l4x2.s" ], "flash-method": "openocd", "openocd-interface": "stlink-v2-1", "openocd-target": "stm32l4x" - } + } \ No newline at end of file diff --git a/targets/nucleo-l552ze.json b/targets/nucleo-l552ze.json index cefd70713b..9ee4368089 100644 --- a/targets/nucleo-l552ze.json +++ b/targets/nucleo-l552ze.json @@ -4,9 +4,9 @@ "serial": "uart", "linkerscript": "targets/stm32l5x2xe.ld", "extra-files": [ - "src/vendor/tinygo.org/x/device/stm32/stm32l552.s" + "src/device/stm32/stm32l552.s" ], "flash-method": "openocd", "openocd-interface": "stlink", "openocd-target": "stm32l5x" - } + } \ No newline at end of file diff --git a/targets/stm32f469disco.json b/targets/stm32f469disco.json index 7770118adc..37deaa3a7a 100644 --- a/targets/stm32f469disco.json +++ b/targets/stm32f469disco.json @@ -4,7 +4,7 @@ "serial": "uart", "linkerscript": "targets/stm32f469.ld", "extra-files": [ - "src/vendor/tinygo.org/x/device/stm32/stm32f469.s" + "src/device/stm32/stm32f469.s" ], "flash-method": "openocd", "openocd-interface": "stlink", diff --git a/targets/stm32f4disco.json b/targets/stm32f4disco.json index 13733701e1..4485c41d3a 100644 --- a/targets/stm32f4disco.json +++ b/targets/stm32f4disco.json @@ -4,7 +4,7 @@ "serial": "uart", "linkerscript": "targets/stm32f407.ld", "extra-files": [ - "src/vendor/tinygo.org/x/device/stm32/stm32f407.s" + "src/device/stm32/stm32f407.s" ], "flash-method": "openocd", "openocd-interface": "stlink-v2", diff --git a/targets/stm32l0x2.json b/targets/stm32l0x2.json index 094d45e76e..13b42cc5c0 100644 --- a/targets/stm32l0x2.json +++ b/targets/stm32l0x2.json @@ -8,6 +8,6 @@ "stm32" ], "extra-files": [ - "src/vendor/tinygo.org/x/device/stm32/stm32l0x2.s" + "src/device/stm32/stm32l0x2.s" ] -} +} \ No newline at end of file diff --git a/targets/stm32wl5x_cm4.json b/targets/stm32wl5x_cm4.json index 67d22e1731..00d8bbb828 100644 --- a/targets/stm32wl5x_cm4.json +++ b/targets/stm32wl5x_cm4.json @@ -2,7 +2,7 @@ "inherits": ["cortex-m4"], "build-tags": [ "stm32wl5x_cm4","stm32wlx", "stm32"], "extra-files": [ - "src/vendor/tinygo.org/x/device/stm32/stm32wl5x_cm4.s" + "src/device/stm32/stm32wl5x_cm4.s" ], "linkerscript": "targets/stm32wlx.ld" } diff --git a/targets/stm32wle5.json b/targets/stm32wle5.json index e14322544f..f24f28f2e5 100644 --- a/targets/stm32wle5.json +++ b/targets/stm32wle5.json @@ -2,7 +2,7 @@ "inherits": ["cortex-m4"], "build-tags": [ "stm32wle5","stm32wlx", "stm32"], "extra-files": [ - "src/vendor/tinygo.org/x/device/stm32/stm32wle5.s" + "src/device/stm32/stm32wle5.s" ], "linkerscript": "targets/stm32wlx.ld" } diff --git a/targets/swan.json b/targets/swan.json index 0e323a01bb..fbb46a5569 100644 --- a/targets/swan.json +++ b/targets/swan.json @@ -4,10 +4,10 @@ "serial": "uart", "linkerscript": "targets/stm32l4x5.ld", "extra-files": [ - "src/vendor/tinygo.org/x/device/stm32/stm32l4x5.s" + "src/device/stm32/stm32l4x5.s" ], "flash-method": "command", "flash-command": "dfu-util --alt 0 --dfuse-address 0x08000000 --download {bin}", "openocd-interface": "stlink", "openocd-target": "stm32l4x" - } + } \ No newline at end of file