diff --git a/.gitignore b/.gitignore index 37076e57..623c6b0c 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 49ceeddc..e82a938b 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 8aeb9fe7..8691ac88 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 00000000..e6db8e32 --- /dev/null +++ b/lib/stm32-svd @@ -0,0 +1 @@ +Subproject commit e6db8e32d5d42293a528434ec12e7f88479a8649 diff --git a/loader/goroot.go b/loader/goroot.go index 9beac58a..1ff7fa8d 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 a39ca27f..9f7dca8a 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 9ef49be5..1e695a43 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 2968671b..073c0c04 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 72042adb..7a4da00b 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 66fd3246..422eca20 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 84bc654d..3027c5ad 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 4bb6abe7..4206e39d 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 1093985c..cc0fbe15 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 f06ea5f9..d8c91d06 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 9dd87ac3..d34f40d6 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 3dfd3470..761d4b84 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 7e16f66c..07a51c0b 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 2dc5a969..f396e4ca 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 a49d44d0..8c50fff4 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 8a693656..a5d4b382 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 3e73b645..fb0cee66 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 3ad93257..4f0b8d11 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 c093b391..0cf34003 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 f6145f9f..e21cfae5 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 dc3e571b..7e4666cf 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 0845e8dd..d6fa06e2 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 bcbbf1ad..1712986a 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 3d97ee1c..7329f47e 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 ba24b749..0eb91989 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 f03a4693..eee4e155 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 662429b6..449c2809 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 71c85aa2..b24ac48c 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 6cfc2d82..8160ab87 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 9537e525..481df8cd 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 f1f9a8db..02c6c7a1 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 1ebbad6b..9fdd17cb 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 9a795505..4c677802 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 fdf6b82f..dd8a0ad7 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 bc53dcb6..838250b5 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 2142f3fe..bdfa27bc 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 c090d0c0..70b7ce58 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 2cd0db33..254fb36c 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 bc92c38f..3ac63254 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 a28d1992..9063b802 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 c077b960..5eb951d8 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 acf03bd9..966c0ceb 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 ff5d0900..377781e8 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 7ee5b784..81b728f7 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 0de50ac8..c0cd7fa4 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 8e49a019..6ce44303 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 c0c9d2ed..ce8e9ef5 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 6a3c4e3f..643f67f8 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 a50d78eb..56900e3b 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 fb038e98..29fe173c 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 1703bcbb..bee860ab 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 7d6da357..dfc30f4c 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 e3997775..4021e495 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 eb19234d..06b84eb6 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 8857ea6d..2e3cbbd0 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 1517c549..87837b97 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 c93e3a85..73d0cc0b 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 ed1acd63..91c5a3f7 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 c873563f..00000000 --- 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 4eda18e0..752261f4 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 b592d21d..3d824d1e 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 c7ed6cd1..723c5eef 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 1cea69db..f426b332 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 cf980b7d..eed8f38f 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 44772a43..028b034b 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 cefd7071..9ee43680 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 7770118a..37deaa3a 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 13733701..4485c41d 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 094d45e7..13b42cc5 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 67d22e17..00d8bbb8 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 e1432254..f24f28f2 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 0e323a01..fbb46a55 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