Revert "all: move stm32 files to separate repository"

This reverts commit 644356c.
tinygo-org · Feb 28, 2022 · d65e3de · d65e3de
1 parent cbfa85b
commit d65e3de
Show file tree

Hide file tree

Showing 76 changed files with 89 additions and 81 deletions.
diff --git 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
@@ -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
@@ -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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
 )