diff --git a/.gitignore b/.gitignore
index 623c6b0c..37076e57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,13 +11,10 @@ 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 e82a938b..49ceeddc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -20,9 +20,6 @@
 [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
@@ -35,3 +32,6 @@
 [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 4bad8349..0892ae24 100644
--- a/Makefile
+++ b/Makefile
@@ -126,9 +126,6 @@ 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
@@ -165,10 +162,6 @@ 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
deleted file mode 160000
index e6db8e32..00000000
--- a/lib/stm32-svd
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e6db8e32d5d42293a528434ec12e7f88479a8649
diff --git a/loader/goroot.go b/loader/goroot.go
index 1ff7fa8d..9beac58a 100644
--- a/loader/goroot.go
+++ b/loader/goroot.go
@@ -241,6 +241,8 @@ 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 9f7dca8a..a39ca27f 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 1e695a43..9ef49be5 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 073c0c04..2968671b 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 7a4da00b..72042adb 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 422eca20..66fd3246 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 3027c5ad..84bc654d 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 4206e39d..4bb6abe7 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 cc0fbe15..1093985c 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 d8c91d06..f06ea5f9 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 d34f40d6..9dd87ac3 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 761d4b84..3dfd3470 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 07a51c0b..7e16f66c 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 f396e4ca..2dc5a969 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 8c50fff4..a49d44d0 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 a5d4b382..8a693656 100644
--- a/src/machine/machine_stm32.go
+++ b/src/machine/machine_stm32.go
@@ -3,7 +3,7 @@
 
 package machine
 
-import "device/stm32"
+import "tinygo.org/x/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 fb0cee66..3e73b645 100644
--- a/src/machine/machine_stm32_adc_f1.go
+++ b/src/machine/machine_stm32_adc_f1.go
@@ -4,7 +4,7 @@
 package machine
 
 import (
-	"device/stm32"
+	"tinygo.org/x/device/stm32"
 	"unsafe"
 )
 
diff --git a/src/machine/machine_stm32_adc_f4.go b/src/machine/machine_stm32_adc_f4.go
index 4f0b8d11..3ad93257 100644
--- a/src/machine/machine_stm32_adc_f4.go
+++ b/src/machine/machine_stm32_adc_f4.go
@@ -4,7 +4,7 @@
 package machine
 
 import (
-	"device/stm32"
+	"tinygo.org/x/device/stm32"
 	"unsafe"
 )
 
diff --git a/src/machine/machine_stm32_exti_afio.go b/src/machine/machine_stm32_exti_afio.go
index 0cf34003..c093b391 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 e21cfae5..f6145f9f 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 7e4666cf..dc3e571b 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 d6fa06e2..0845e8dd 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 1712986a..bcbbf1ad 100644
--- a/src/machine/machine_stm32_gpio_reva.go
+++ b/src/machine/machine_stm32_gpio_reva.go
@@ -4,7 +4,7 @@
 package machine
 
 import (
-	"device/stm32"
+	"tinygo.org/x/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 7329f47e..3d97ee1c 100644
--- a/src/machine/machine_stm32_gpio_revb.go
+++ b/src/machine/machine_stm32_gpio_revb.go
@@ -4,7 +4,7 @@
 package machine
 
 import (
-	"device/stm32"
+	"tinygo.org/x/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 0eb91989..ba24b749 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 (
-	"device/stm32"
+	"tinygo.org/x/device/stm32"
 )
 
 //
diff --git a/src/machine/machine_stm32_i2c_reva.go b/src/machine/machine_stm32_i2c_reva.go
index eee4e155..f03a4693 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 (
-	"device/stm32"
+	"tinygo.org/x/device/stm32"
 	"unsafe"
 )
 
diff --git a/src/machine/machine_stm32_i2c_revb.go b/src/machine/machine_stm32_i2c_revb.go
index 449c2809..662429b6 100644
--- a/src/machine/machine_stm32_i2c_revb.go
+++ b/src/machine/machine_stm32_i2c_revb.go
@@ -4,7 +4,7 @@
 package machine
 
 import (
-	"device/stm32"
+	"tinygo.org/x/device/stm32"
 	"unsafe"
 )
 
diff --git a/src/machine/machine_stm32_moder_gpio.go b/src/machine/machine_stm32_moder_gpio.go
index b24ac48c..71c85aa2 100644
--- a/src/machine/machine_stm32_moder_gpio.go
+++ b/src/machine/machine_stm32_moder_gpio.go
@@ -4,7 +4,7 @@
 package machine
 
 import (
-	"device/stm32"
+	"tinygo.org/x/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 8160ab87..6cfc2d82 100644
--- a/src/machine/machine_stm32_rng.go
+++ b/src/machine/machine_stm32_rng.go
@@ -3,7 +3,7 @@
 
 package machine
 
-import "device/stm32"
+import "tinygo.org/x/device/stm32"
 
 var rngInitDone = false
 
diff --git a/src/machine/machine_stm32_spi.go b/src/machine/machine_stm32_spi.go
index 481df8cd..9537e525 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 02c6c7a1..f1f9a8db 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 9fdd17cb..1ebbad6b 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 4c677802..9a795505 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 dd8a0ad7..fdf6b82f 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 838250b5..bc53dcb6 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 bdfa27bc..2142f3fe 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 (
-	"device/stm32"
+	"tinygo.org/x/device/stm32"
 )
 
 func CPUFrequency() uint32 {
diff --git a/src/machine/machine_stm32l0.go b/src/machine/machine_stm32l0.go
index 70b7ce58..c090d0c0 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 254fb36c..2cd0db33 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 3ac63254..bc92c38f 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 9063b802..a28d1992 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 5eb951d8..c077b960 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 966c0ceb..acf03bd9 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 (
-	"device/stm32"
+	"tinygo.org/x/device/stm32"
 )
 
 func CPUFrequency() uint32 {
diff --git a/src/machine/machine_stm32wlx.go b/src/machine/machine_stm32wlx.go
index 377781e8..ff5d0900 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 81b728f7..7ee5b784 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 c0cd7fa4..0de50ac8 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 6ce44303..8e49a019 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 ce8e9ef5..c0c9d2ed 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 643f67f8..6a3c4e3f 100644
--- a/src/runtime/runtime_stm32f407.go
+++ b/src/runtime/runtime_stm32f407.go
@@ -3,7 +3,7 @@
 
 package runtime
 
-import "device/stm32"
+import "tinygo.org/x/device/stm32"
 
 /*
    clock settings
diff --git a/src/runtime/runtime_stm32f469.go b/src/runtime/runtime_stm32f469.go
index 56900e3b..a50d78eb 100644
--- a/src/runtime/runtime_stm32f469.go
+++ b/src/runtime/runtime_stm32f469.go
@@ -3,7 +3,7 @@
 
 package runtime
 
-import "device/stm32"
+import "tinygo.org/x/device/stm32"
 
 /*
    clock settings
diff --git a/src/runtime/runtime_stm32f7x2.go b/src/runtime/runtime_stm32f7x2.go
index 29fe173c..fb038e98 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 bee860ab..1703bcbb 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 dfc30f4c..7d6da357 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 4021e495..e3997775 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 06b84eb6..eb19234d 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 2e3cbbd0..8857ea6d 100644
--- a/src/runtime/runtime_stm32l4x2.go
+++ b/src/runtime/runtime_stm32l4x2.go
@@ -4,7 +4,7 @@
 package runtime
 
 import (
-	"device/stm32"
+	"tinygo.org/x/device/stm32"
 )
 
 /*
diff --git a/src/runtime/runtime_stm32l4x5.go b/src/runtime/runtime_stm32l4x5.go
index 87837b97..1517c549 100644
--- a/src/runtime/runtime_stm32l4x5.go
+++ b/src/runtime/runtime_stm32l4x5.go
@@ -4,7 +4,7 @@
 package runtime
 
 import (
-	"device/stm32"
+	"tinygo.org/x/device/stm32"
 )
 
 /*
diff --git a/src/runtime/runtime_stm32l5x2.go b/src/runtime/runtime_stm32l5x2.go
index 73d0cc0b..c93e3a85 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 91c5a3f7..ed1acd63 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
new file mode 160000
index 00000000..c873563f
--- /dev/null
+++ b/src/vendor/tinygo.org/x/device
@@ -0,0 +1 @@
+Subproject commit c873563f9ed5a213be5f037c007e27ce733007d1
diff --git a/targets/bluepill.json b/targets/bluepill.json
index 752261f4..4eda18e0 100644
--- a/targets/bluepill.json
+++ b/targets/bluepill.json
@@ -4,7 +4,7 @@
 	"serial": "uart",
 	"linkerscript": "targets/stm32.ld",
 	"extra-files": [
-		"src/device/stm32/stm32f103.s"
+		"src/vendor/tinygo.org/x/device/stm32/stm32f103.s"
 	],
 	"flash-method": "openocd",
 	"openocd-interface": "stlink-v2",
diff --git a/targets/feather-stm32f405.json b/targets/feather-stm32f405.json
index 3d824d1e..b592d21d 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/device/stm32/stm32f405.s"
+    "src/vendor/tinygo.org/x/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 723c5eef..c7ed6cd1 100644
--- a/targets/nucleo-f103rb.json
+++ b/targets/nucleo-f103rb.json
@@ -4,7 +4,7 @@
   "serial": "uart",
   "linkerscript": "targets/stm32f103rb.ld",
   "extra-files": [
-    "src/device/stm32/stm32f103.s"
+    "src/vendor/tinygo.org/x/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 f426b332..1cea69db 100644
--- a/targets/nucleo-f722ze.json
+++ b/targets/nucleo-f722ze.json
@@ -4,7 +4,7 @@
   "serial": "uart",
   "linkerscript": "targets/stm32f7x2zetx.ld",
   "extra-files": [
-    "src/device/stm32/stm32f7x2.s"
+    "src/vendor/tinygo.org/x/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 eed8f38f..cf980b7d 100644
--- a/targets/nucleo-l031k6.json
+++ b/targets/nucleo-l031k6.json
@@ -4,9 +4,9 @@
     "serial": "uart",
     "linkerscript": "targets/stm32l031k6.ld",
     "extra-files": [
-        "src/device/stm32/stm32l0x1.s"
+        "src/vendor/tinygo.org/x/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 028b034b..44772a43 100644
--- a/targets/nucleo-l432kc.json
+++ b/targets/nucleo-l432kc.json
@@ -4,9 +4,9 @@
     "serial": "uart",
     "linkerscript": "targets/stm32l4x2.ld",
     "extra-files": [
-      "src/device/stm32/stm32l4x2.s"
+      "src/vendor/tinygo.org/x/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 9ee43680..cefd7071 100644
--- a/targets/nucleo-l552ze.json
+++ b/targets/nucleo-l552ze.json
@@ -4,9 +4,9 @@
     "serial": "uart",
     "linkerscript": "targets/stm32l5x2xe.ld",
     "extra-files": [
-      "src/device/stm32/stm32l552.s"
+      "src/vendor/tinygo.org/x/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 37deaa3a..7770118a 100644
--- a/targets/stm32f469disco.json
+++ b/targets/stm32f469disco.json
@@ -4,7 +4,7 @@
   "serial": "uart",
   "linkerscript": "targets/stm32f469.ld",
   "extra-files": [
-    "src/device/stm32/stm32f469.s"
+    "src/vendor/tinygo.org/x/device/stm32/stm32f469.s"
   ],
   "flash-method": "openocd",
   "openocd-interface": "stlink",
diff --git a/targets/stm32f4disco.json b/targets/stm32f4disco.json
index 4485c41d..13733701 100644
--- a/targets/stm32f4disco.json
+++ b/targets/stm32f4disco.json
@@ -4,7 +4,7 @@
   "serial": "uart",
   "linkerscript": "targets/stm32f407.ld",
   "extra-files": [
-    "src/device/stm32/stm32f407.s"
+    "src/vendor/tinygo.org/x/device/stm32/stm32f407.s"
   ],
   "flash-method": "openocd",
   "openocd-interface": "stlink-v2",
diff --git a/targets/stm32l0x2.json b/targets/stm32l0x2.json
index 13b42cc5..094d45e7 100644
--- a/targets/stm32l0x2.json
+++ b/targets/stm32l0x2.json
@@ -8,6 +8,6 @@
         "stm32"
     ],
     "extra-files": [
-        "src/device/stm32/stm32l0x2.s"
+        "src/vendor/tinygo.org/x/device/stm32/stm32l0x2.s"
     ]
-}
\ No newline at end of file
+}
diff --git a/targets/stm32wl5x_cm4.json b/targets/stm32wl5x_cm4.json
index 00d8bbb8..67d22e17 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/device/stm32/stm32wl5x_cm4.s"
+      "src/vendor/tinygo.org/x/device/stm32/stm32wl5x_cm4.s"
     ],
     "linkerscript": "targets/stm32wlx.ld"
 }
diff --git a/targets/stm32wle5.json b/targets/stm32wle5.json
index f24f28f2..e1432254 100644
--- a/targets/stm32wle5.json
+++ b/targets/stm32wle5.json
@@ -2,7 +2,7 @@
     "inherits": ["cortex-m4"],
     "build-tags": [ "stm32wle5","stm32wlx", "stm32"],
     "extra-files": [
-      "src/device/stm32/stm32wle5.s"
+      "src/vendor/tinygo.org/x/device/stm32/stm32wle5.s"
     ],
     "linkerscript": "targets/stm32wlx.ld"
 }
diff --git a/targets/swan.json b/targets/swan.json
index fbb46a55..0e323a01 100644
--- a/targets/swan.json
+++ b/targets/swan.json
@@ -4,10 +4,10 @@
     "serial": "uart",
     "linkerscript": "targets/stm32l4x5.ld",
     "extra-files": [
-      "src/device/stm32/stm32l4x5.s"
+      "src/vendor/tinygo.org/x/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
+  }