all: update build constraints to Go 1.17

Do it all at once in preparation for Go 1.18 support.

To make this commit, I've simply modified the `fmt-check` Makefile
target to rewrite files instead of listing the differences. So this is a
fully mechanical change, it should not have introduced any errors.

139 files changed, 139 insertions, 0 deletions

diff --git a/src/machine/board_arduino.go b/src/machine/board_arduino.go
index 001ba9c70..e78153f18 100644
--- a/src/machine/board_arduino.go
+++ b/src/machine/board_arduino.go
@@ -1,3 +1,4 @@
+//go:build arduino
 // +build arduino
 
 package machine
diff --git a/src/machine/board_arduino_mega1280.go b/src/machine/board_arduino_mega1280.go
index 289b55b2b..961fcec23 100644
--- a/src/machine/board_arduino_mega1280.go
+++ b/src/machine/board_arduino_mega1280.go
@@ -1,3 +1,4 @@
+//go:build arduino_mega1280
 // +build arduino_mega1280
 
 package machine
diff --git a/src/machine/board_arduino_mega2560.go b/src/machine/board_arduino_mega2560.go
index c6370139e..f47504bd1 100644
--- a/src/machine/board_arduino_mega2560.go
+++ b/src/machine/board_arduino_mega2560.go
@@ -1,3 +1,4 @@
+//go:build arduino_mega2560
 // +build arduino_mega2560
 
 package machine
diff --git a/src/machine/board_arduino_mkr1000.go b/src/machine/board_arduino_mkr1000.go
index 30ad48e90..b7d2b51ab 100644
--- a/src/machine/board_arduino_mkr1000.go
+++ b/src/machine/board_arduino_mkr1000.go
@@ -1,3 +1,4 @@
+//go:build arduino_mkr1000
 // +build arduino_mkr1000
 
 // This contains the pin mappings for the Arduino MKR1000 board.
diff --git a/src/machine/board_arduino_mkrwifi1010.go b/src/machine/board_arduino_mkrwifi1010.go
index 8703e1353..89eb25d8f 100644
--- a/src/machine/board_arduino_mkrwifi1010.go
+++ b/src/machine/board_arduino_mkrwifi1010.go
@@ -1,3 +1,4 @@
+//go:build arduino_mkrwifi1010
 // +build arduino_mkrwifi1010
 
 // This contains the pin mappings for the Arduino MKR WiFi 1010 board.
diff --git a/src/machine/board_arduino_nano.go b/src/machine/board_arduino_nano.go
index d84b23f36..d3213d4f1 100644
--- a/src/machine/board_arduino_nano.go
+++ b/src/machine/board_arduino_nano.go
@@ -1,3 +1,4 @@
+//go:build arduino_nano
 // +build arduino_nano
 
 package machine
diff --git a/src/machine/board_arduino_nano33.go b/src/machine/board_arduino_nano33.go
index 76353bacc..49cb09c83 100644
--- a/src/machine/board_arduino_nano33.go
+++ b/src/machine/board_arduino_nano33.go
@@ -1,3 +1,4 @@
+//go:build arduino_nano33
 // +build arduino_nano33
 
 // This contains the pin mappings for the Arduino Nano33 IoT board.
diff --git a/src/machine/board_arduino_zero.go b/src/machine/board_arduino_zero.go
index 651eea821..3c04f37a4 100644
--- a/src/machine/board_arduino_zero.go
+++ b/src/machine/board_arduino_zero.go
@@ -1,3 +1,4 @@
+//go:build sam && atsamd21 && arduino_zero
 // +build sam,atsamd21,arduino_zero
 
 package machine
diff --git a/src/machine/board_atmega328p.go b/src/machine/board_atmega328p.go
index 030c78fe9..007d31640 100644
--- a/src/machine/board_atmega328p.go
+++ b/src/machine/board_atmega328p.go
@@ -1,3 +1,4 @@
+//go:build (avr && atmega328p) || arduino || arduino_nano
 // +build avr,atmega328p arduino arduino_nano
 
 package machine
diff --git a/src/machine/board_atsamd21.go b/src/machine/board_atsamd21.go
index 3b11b452a..619af02b2 100644
--- a/src/machine/board_atsamd21.go
+++ b/src/machine/board_atsamd21.go
@@ -1,3 +1,4 @@
+//go:build (sam && atsamd21) || arduino_nano33 || circuitplay_express
 // +build sam,atsamd21 arduino_nano33 circuitplay_express
 
 package machine
diff --git a/src/machine/board_atsame54-xpro.go b/src/machine/board_atsame54-xpro.go
index 173ccae5f..8c2606577 100644
--- a/src/machine/board_atsame54-xpro.go
+++ b/src/machine/board_atsame54-xpro.go
@@ -1,3 +1,4 @@
+//go:build atsame54_xpro
 // +build atsame54_xpro
 
 package machine
diff --git a/src/machine/board_circuitplay_bluefruit.go b/src/machine/board_circuitplay_bluefruit.go
index 0fd699e58..bfa7cb2ca 100644
--- a/src/machine/board_circuitplay_bluefruit.go
+++ b/src/machine/board_circuitplay_bluefruit.go
@@ -1,3 +1,4 @@
+//go:build circuitplay_bluefruit
 // +build circuitplay_bluefruit
 
 package machine
diff --git a/src/machine/board_circuitplay_express.go b/src/machine/board_circuitplay_express.go
index 23037a1e8..28f59df27 100644
--- a/src/machine/board_circuitplay_express.go
+++ b/src/machine/board_circuitplay_express.go
@@ -1,3 +1,4 @@
+//go:build circuitplay_express
 // +build circuitplay_express
 
 package machine
diff --git a/src/machine/board_clue_alpha.go b/src/machine/board_clue_alpha.go
index d8def8f35..bb3024072 100644
--- a/src/machine/board_clue_alpha.go
+++ b/src/machine/board_clue_alpha.go
@@ -1,3 +1,4 @@
+//go:build clue_alpha
 // +build clue_alpha
 
 package machine
diff --git a/src/machine/board_digispark.go b/src/machine/board_digispark.go
index af89656d2..55531d556 100644
--- a/src/machine/board_digispark.go
+++ b/src/machine/board_digispark.go
@@ -1,3 +1,4 @@
+//go:build digispark
 // +build digispark
 
 package machine
diff --git a/src/machine/board_esp32-coreboard-v2.go b/src/machine/board_esp32-coreboard-v2.go
index 0145fe4ea..cbeb54dc1 100644
--- a/src/machine/board_esp32-coreboard-v2.go
+++ b/src/machine/board_esp32-coreboard-v2.go
@@ -1,3 +1,4 @@
+//go:build esp32_coreboard_v2
 // +build esp32_coreboard_v2
 
 package machine
diff --git a/src/machine/board_fe310.go b/src/machine/board_fe310.go
index b6e88a3c7..70c266345 100644
--- a/src/machine/board_fe310.go
+++ b/src/machine/board_fe310.go
@@ -1,3 +1,4 @@
+//go:build hifive1b
 // +build hifive1b
 
 package machine
diff --git a/src/machine/board_feather-m0.go b/src/machine/board_feather-m0.go
index cfef7288d..a0c71f56c 100644
--- a/src/machine/board_feather-m0.go
+++ b/src/machine/board_feather-m0.go
@@ -1,3 +1,4 @@
+//go:build sam && atsamd21 && feather_m0
 // +build sam,atsamd21,feather_m0
 
 package machine
diff --git a/src/machine/board_feather-m4-can.go b/src/machine/board_feather-m4-can.go
index 5e9d464f5..7bc1a6e3e 100644
--- a/src/machine/board_feather-m4-can.go
+++ b/src/machine/board_feather-m4-can.go
@@ -1,3 +1,4 @@
+//go:build feather_m4_can
 // +build feather_m4_can
 
 package machine
diff --git a/src/machine/board_feather-m4.go b/src/machine/board_feather-m4.go
index 901a18723..07783964d 100644
--- a/src/machine/board_feather-m4.go
+++ b/src/machine/board_feather-m4.go
@@ -1,3 +1,4 @@
+//go:build feather_m4
 // +build feather_m4
 
 package machine
diff --git a/src/machine/board_feather-nrf52840-sense.go b/src/machine/board_feather-nrf52840-sense.go
index 8a4f71446..ae98ce84d 100644
--- a/src/machine/board_feather-nrf52840-sense.go
+++ b/src/machine/board_feather-nrf52840-sense.go
@@ -1,3 +1,4 @@
+//go:build feather_nrf52840_sense
 // +build feather_nrf52840_sense
 
 package machine
diff --git a/src/machine/board_feather-nrf52840.go b/src/machine/board_feather-nrf52840.go
index e433e1037..42cdf582b 100644
--- a/src/machine/board_feather-nrf52840.go
+++ b/src/machine/board_feather-nrf52840.go
@@ -1,3 +1,4 @@
+//go:build feather_nrf52840
 // +build feather_nrf52840
 
 package machine
diff --git a/src/machine/board_feather-stm32f405.go b/src/machine/board_feather-stm32f405.go
index 0fd149567..1e695a43a 100644
--- a/src/machine/board_feather-stm32f405.go
+++ b/src/machine/board_feather-stm32f405.go
@@ -1,3 +1,4 @@
+//go:build feather_stm32f405
 // +build feather_stm32f405
 
 package machine
diff --git a/src/machine/board_feather_rp2040.go b/src/machine/board_feather_rp2040.go
index 77981b230..98ecd1740 100644
--- a/src/machine/board_feather_rp2040.go
+++ b/src/machine/board_feather_rp2040.go
@@ -1,3 +1,4 @@
+//go:build feather_rp2040
 // +build feather_rp2040
 
 package machine
diff --git a/src/machine/board_grandcentral-m4.go b/src/machine/board_grandcentral-m4.go
index 7f0a7390f..61201826f 100644
--- a/src/machine/board_grandcentral-m4.go
+++ b/src/machine/board_grandcentral-m4.go
@@ -1,3 +1,4 @@
+//go:build grandcentral_m4
 // +build grandcentral_m4
 
 package machine
diff --git a/src/machine/board_hifive1b.go b/src/machine/board_hifive1b.go
index d16225a68..7e3001a61 100644
--- a/src/machine/board_hifive1b.go
+++ b/src/machine/board_hifive1b.go
@@ -1,3 +1,4 @@
+//go:build hifive1b
 // +build hifive1b
 
 package machine
diff --git a/src/machine/board_hifive1b_baremetal.go b/src/machine/board_hifive1b_baremetal.go
index 729e985de..28d276f23 100644
--- a/src/machine/board_hifive1b_baremetal.go
+++ b/src/machine/board_hifive1b_baremetal.go
@@ -1,3 +1,4 @@
+//go:build fe310 && hifive1b
 // +build fe310,hifive1b
 
 package machine
diff --git a/src/machine/board_itsybitsy-m0.go b/src/machine/board_itsybitsy-m0.go
index 30bf8f2b0..22b2daa7f 100644
--- a/src/machine/board_itsybitsy-m0.go
+++ b/src/machine/board_itsybitsy-m0.go
@@ -1,3 +1,4 @@
+//go:build sam && atsamd21 && itsybitsy_m0
 // +build sam,atsamd21,itsybitsy_m0
 
 package machine
diff --git a/src/machine/board_itsybitsy-m4.go b/src/machine/board_itsybitsy-m4.go
index b88e44fd3..f42efee98 100644
--- a/src/machine/board_itsybitsy-m4.go
+++ b/src/machine/board_itsybitsy-m4.go
@@ -1,3 +1,4 @@
+//go:build itsybitsy_m4
 // +build itsybitsy_m4
 
 package machine
diff --git a/src/machine/board_itsybitsy-nrf52840.go b/src/machine/board_itsybitsy-nrf52840.go
index 418e83839..a003704c2 100644
--- a/src/machine/board_itsybitsy-nrf52840.go
+++ b/src/machine/board_itsybitsy-nrf52840.go
@@ -1,3 +1,4 @@
+//go:build itsybitsy_nrf52840
 // +build itsybitsy_nrf52840
 
 package machine
diff --git a/src/machine/board_k210.go b/src/machine/board_k210.go
index 60467a689..d476fee87 100644
--- a/src/machine/board_k210.go
+++ b/src/machine/board_k210.go
@@ -1,3 +1,4 @@
+//go:build maixbit
 // +build maixbit
 
 // Chip datasheet: https://s3.cn-north-1.amazonaws.com.cn/dl.kendryte.com/documents/kendryte_datasheet_20181011163248_en.pdf
diff --git a/src/machine/board_lgt92.go b/src/machine/board_lgt92.go
index e043dcd77..7a4da00bb 100644
--- a/src/machine/board_lgt92.go
+++ b/src/machine/board_lgt92.go
@@ -1,3 +1,4 @@
+//go:build lgt92
 // +build lgt92
 
 package machine
diff --git a/src/machine/board_m5stack.go b/src/machine/board_m5stack.go
index 0f05146c2..5273034fb 100644
--- a/src/machine/board_m5stack.go
+++ b/src/machine/board_m5stack.go
@@ -1,3 +1,4 @@
+//go:build m5stack
 // +build m5stack
 
 package machine
diff --git a/src/machine/board_m5stack_core2.go b/src/machine/board_m5stack_core2.go
index cb20b2ae1..93b0b618d 100644
--- a/src/machine/board_m5stack_core2.go
+++ b/src/machine/board_m5stack_core2.go
@@ -1,3 +1,4 @@
+//go:build m5stack_core2
 // +build m5stack_core2
 
 package machine
diff --git a/src/machine/board_maixbit.go b/src/machine/board_maixbit.go
index e2c551b0e..b633ac423 100644
--- a/src/machine/board_maixbit.go
+++ b/src/machine/board_maixbit.go
@@ -1,3 +1,4 @@
+//go:build maixbit
 // +build maixbit
 
 package machine
diff --git a/src/machine/board_maixbit_baremetal.go b/src/machine/board_maixbit_baremetal.go
index 98733bee8..5c9ab7704 100644
--- a/src/machine/board_maixbit_baremetal.go
+++ b/src/machine/board_maixbit_baremetal.go
@@ -1,3 +1,4 @@
+//go:build k210 && maixbit
 // +build k210,maixbit
 
 package machine
diff --git a/src/machine/board_matrixportal-m4.go b/src/machine/board_matrixportal-m4.go
index c733e784a..cab5f7aa1 100644
--- a/src/machine/board_matrixportal-m4.go
+++ b/src/machine/board_matrixportal-m4.go
@@ -1,3 +1,4 @@
+//go:build matrixportal_m4
 // +build matrixportal_m4
 
 package machine
diff --git a/src/machine/board_mdbt50qrx.go b/src/machine/board_mdbt50qrx.go
index 45a059ded..3d66fbb28 100644
--- a/src/machine/board_mdbt50qrx.go
+++ b/src/machine/board_mdbt50qrx.go
@@ -1,3 +1,4 @@
+//go:build mdbt50qrx
 // +build mdbt50qrx
 
 package machine
diff --git a/src/machine/board_metro-m4-airlift.go b/src/machine/board_metro-m4-airlift.go
index d70220eb9..2350ea71b 100644
--- a/src/machine/board_metro-m4-airlift.go
+++ b/src/machine/board_metro-m4-airlift.go
@@ -1,3 +1,4 @@
+//go:build metro_m4_airlift
 // +build metro_m4_airlift
 
 package machine
diff --git a/src/machine/board_microbit-v2.go b/src/machine/board_microbit-v2.go
index 81ccf5be2..20c0bc808 100644
--- a/src/machine/board_microbit-v2.go
+++ b/src/machine/board_microbit-v2.go
@@ -1,3 +1,4 @@
+//go:build microbit_v2
 // +build microbit_v2
 
 package machine
diff --git a/src/machine/board_microbit.go b/src/machine/board_microbit.go
index b4af49f8d..37c7d3348 100644
--- a/src/machine/board_microbit.go
+++ b/src/machine/board_microbit.go
@@ -1,3 +1,4 @@
+//go:build microbit
 // +build microbit
 
 package machine
diff --git a/src/machine/board_nano-rp2040.go b/src/machine/board_nano-rp2040.go
index d91a26589..1e30ca67d 100644
--- a/src/machine/board_nano-rp2040.go
+++ b/src/machine/board_nano-rp2040.go
@@ -1,3 +1,4 @@
+//go:build nano_rp2040
 // +build nano_rp2040
 
 // This contains the pin mappings for the Arduino Nano RP2040 Connect board.
diff --git a/src/machine/board_nicenano.go b/src/machine/board_nicenano.go
index 94511bf9f..8baf86fa0 100644
--- a/src/machine/board_nicenano.go
+++ b/src/machine/board_nicenano.go
@@ -1,3 +1,4 @@
+//go:build nicenano
 // +build nicenano
 
 package machine
diff --git a/src/machine/board_nodemcu.go b/src/machine/board_nodemcu.go
index f9f1af4f9..b3dbc3358 100644
--- a/src/machine/board_nodemcu.go
+++ b/src/machine/board_nodemcu.go
@@ -1,3 +1,4 @@
+//go:build nodemcu
 // +build nodemcu
 
 // Pinout for the NodeMCU dev kit.
diff --git a/src/machine/board_nrf52840-mdk-usb-dongle.go b/src/machine/board_nrf52840-mdk-usb-dongle.go
index 57a3d1976..c1910fecf 100644
--- a/src/machine/board_nrf52840-mdk-usb-dongle.go
+++ b/src/machine/board_nrf52840-mdk-usb-dongle.go
@@ -1,3 +1,4 @@
+//go:build nrf52840_mdk_usb_dongle
 // +build nrf52840_mdk_usb_dongle
 
 package machine
diff --git a/src/machine/board_nrf52840-mdk.go b/src/machine/board_nrf52840-mdk.go
index fbc42861b..262983c3a 100644
--- a/src/machine/board_nrf52840-mdk.go
+++ b/src/machine/board_nrf52840-mdk.go
@@ -1,3 +1,4 @@
+//go:build nrf52840_mdk
 // +build nrf52840_mdk
 
 package machine
diff --git a/src/machine/board_nucleof103rb.go b/src/machine/board_nucleof103rb.go
index 22580e20b..3027c5ad5 100644
--- a/src/machine/board_nucleof103rb.go
+++ b/src/machine/board_nucleof103rb.go
@@ -1,3 +1,4 @@
+//go:build nucleof103rb
 // +build nucleof103rb
 
 package machine
diff --git a/src/machine/board_nucleof722ze.go b/src/machine/board_nucleof722ze.go
index 41d3f2849..4206e39d4 100644
--- a/src/machine/board_nucleof722ze.go
+++ b/src/machine/board_nucleof722ze.go
@@ -1,3 +1,4 @@
+//go:build nucleof722ze
 // +build nucleof722ze
 
 package machine
diff --git a/src/machine/board_nucleol031k6.go b/src/machine/board_nucleol031k6.go
index fe85f276b..cc0fbe15b 100644
--- a/src/machine/board_nucleol031k6.go
+++ b/src/machine/board_nucleol031k6.go
@@ -1,3 +1,4 @@
+//go:build nucleol031k6
 // +build nucleol031k6
 
 package machine
diff --git a/src/machine/board_nucleol432kc.go b/src/machine/board_nucleol432kc.go
index bfebd1eed..d8c91d06d 100644
--- a/src/machine/board_nucleol432kc.go
+++ b/src/machine/board_nucleol432kc.go
@@ -1,3 +1,4 @@
+//go:build nucleol432kc
 // +build nucleol432kc
 
 package machine
diff --git a/src/machine/board_nucleol552ze.go b/src/machine/board_nucleol552ze.go
index a0d3ee522..d34f40d64 100644
--- a/src/machine/board_nucleol552ze.go
+++ b/src/machine/board_nucleol552ze.go
@@ -1,3 +1,4 @@
+//go:build nucleol552ze
 // +build nucleol552ze
 
 package machine
diff --git a/src/machine/board_p1am-100.go b/src/machine/board_p1am-100.go
index e263746ad..e75d464b6 100644
--- a/src/machine/board_p1am-100.go
+++ b/src/machine/board_p1am-100.go
@@ -1,3 +1,4 @@
+//go:build p1am_100
 // +build p1am_100
 
 // This contains the pin mappings for the ProductivityOpen P1AM-100 board.
diff --git a/src/machine/board_particle_argon.go b/src/machine/board_particle_argon.go
index 9427029f4..48df2e435 100644
--- a/src/machine/board_particle_argon.go
+++ b/src/machine/board_particle_argon.go
@@ -1,3 +1,4 @@
+//go:build particle_argon
 // +build particle_argon
 
 package machine
diff --git a/src/machine/board_particle_boron.go b/src/machine/board_particle_boron.go
index b6a2c3e54..103cfbb62 100644
--- a/src/machine/board_particle_boron.go
+++ b/src/machine/board_particle_boron.go
@@ -1,3 +1,4 @@
+//go:build particle_boron
 // +build particle_boron
 
 package machine
diff --git a/src/machine/board_particle_xenon.go b/src/machine/board_particle_xenon.go
index 0b25f373b..5a902186e 100644
--- a/src/machine/board_particle_xenon.go
+++ b/src/machine/board_particle_xenon.go
@@ -1,3 +1,4 @@
+//go:build particle_xenon
 // +build particle_xenon
 
 package machine
diff --git a/src/machine/board_pca10031.go b/src/machine/board_pca10031.go
index 122c00d20..afcd3593a 100644
--- a/src/machine/board_pca10031.go
+++ b/src/machine/board_pca10031.go
@@ -1,3 +1,4 @@
+//go:build pca10031
 // +build pca10031
 
 // pca10031 is a nrf51 based dongle, intended for use in wireless applications.
diff --git a/src/machine/board_pca10040.go b/src/machine/board_pca10040.go
index f425ca37c..03189ad14 100644
--- a/src/machine/board_pca10040.go
+++ b/src/machine/board_pca10040.go
@@ -1,3 +1,4 @@
+//go:build pca10040
 // +build pca10040
 
 package machine
diff --git a/src/machine/board_pca10056.go b/src/machine/board_pca10056.go
index 783629465..df6bbb871 100644
--- a/src/machine/board_pca10056.go
+++ b/src/machine/board_pca10056.go
@@ -1,3 +1,4 @@
+//go:build pca10056
 // +build pca10056
 
 package machine
diff --git a/src/machine/board_pca10059.go b/src/machine/board_pca10059.go
index 7f6167913..42be8f3ab 100644
--- a/src/machine/board_pca10059.go
+++ b/src/machine/board_pca10059.go
@@ -1,3 +1,4 @@
+//go:build pca10059
 // +build pca10059
 
 package machine
diff --git a/src/machine/board_pico.go b/src/machine/board_pico.go
index 2cbba390d..b26395497 100644
--- a/src/machine/board_pico.go
+++ b/src/machine/board_pico.go
@@ -1,3 +1,4 @@
+//go:build pico
 // +build pico
 
 package machine
diff --git a/src/machine/board_pinetime-devkit0.go b/src/machine/board_pinetime-devkit0.go
index b9669c84d..e71f9e97d 100644
--- a/src/machine/board_pinetime-devkit0.go
+++ b/src/machine/board_pinetime-devkit0.go
@@ -1,3 +1,4 @@
+//go:build pinetime_devkit0
 // +build pinetime_devkit0
 
 package machine
diff --git a/src/machine/board_pybadge.go b/src/machine/board_pybadge.go
index f747286d5..69b814a5c 100644
--- a/src/machine/board_pybadge.go
+++ b/src/machine/board_pybadge.go
@@ -1,3 +1,4 @@
+//go:build pybadge
 // +build pybadge
 
 package machine
diff --git a/src/machine/board_pygamer.go b/src/machine/board_pygamer.go
index 4662e3a65..319e9e95f 100644
--- a/src/machine/board_pygamer.go
+++ b/src/machine/board_pygamer.go
@@ -1,3 +1,4 @@
+//go:build sam && atsamd51 && pygamer
 // +build sam,atsamd51,pygamer
 
 package machine
diff --git a/src/machine/board_pyportal.go b/src/machine/board_pyportal.go
index e8dfc0b1b..3e7aa7cb7 100644
--- a/src/machine/board_pyportal.go
+++ b/src/machine/board_pyportal.go
@@ -1,3 +1,4 @@
+//go:build pyportal
 // +build pyportal
 
 package machine
diff --git a/src/machine/board_qtpy.go b/src/machine/board_qtpy.go
index 04ef57185..aa294b81e 100644
--- a/src/machine/board_qtpy.go
+++ b/src/machine/board_qtpy.go
@@ -1,3 +1,4 @@
+//go:build sam && atsamd21 && qtpy
 // +build sam,atsamd21,qtpy
 
 package machine
diff --git a/src/machine/board_reelboard.go b/src/machine/board_reelboard.go
index 7fd715bb7..c8383c1fb 100644
--- a/src/machine/board_reelboard.go
+++ b/src/machine/board_reelboard.go
@@ -1,3 +1,4 @@
+//go:build reelboard
 // +build reelboard
 
 package machine
diff --git a/src/machine/board_stm32f469disco.go b/src/machine/board_stm32f469disco.go
index db20aca72..07a51c0bb 100644
--- a/src/machine/board_stm32f469disco.go
+++ b/src/machine/board_stm32f469disco.go
@@ -1,3 +1,4 @@
+//go:build stm32f469disco
 // +build stm32f469disco
 
 package machine
diff --git a/src/machine/board_teensy36.go b/src/machine/board_teensy36.go
index 8fa71f6e9..106382be3 100644
--- a/src/machine/board_teensy36.go
+++ b/src/machine/board_teensy36.go
@@ -1,3 +1,4 @@
+//go:build nxp && mk66f18 && teensy36
 // +build nxp,mk66f18,teensy36
 
 package machine
diff --git a/src/machine/board_teensy40.go b/src/machine/board_teensy40.go
index f96f63de7..9f6f8617e 100644
--- a/src/machine/board_teensy40.go
+++ b/src/machine/board_teensy40.go
@@ -1,3 +1,4 @@
+//go:build teensy40
 // +build teensy40
 
 package machine
diff --git a/src/machine/board_trinket.go b/src/machine/board_trinket.go
index 06f2ace3e..34f271910 100644
--- a/src/machine/board_trinket.go
+++ b/src/machine/board_trinket.go
@@ -1,3 +1,4 @@
+//go:build sam && atsamd21 && trinket_m0
 // +build sam,atsamd21,trinket_m0
 
 package machine
diff --git a/src/machine/board_wioterminal.go b/src/machine/board_wioterminal.go
index 0726b1acb..c19de4642 100644
--- a/src/machine/board_wioterminal.go
+++ b/src/machine/board_wioterminal.go
@@ -1,3 +1,4 @@
+//go:build wioterminal
 // +build wioterminal
 
 package machine
diff --git a/src/machine/board_x9pro.go b/src/machine/board_x9pro.go
index 111dcf5fd..5e2d67769 100644
--- a/src/machine/board_x9pro.go
+++ b/src/machine/board_x9pro.go
@@ -1,3 +1,4 @@
+//go:build x9pro
 // +build x9pro
 
 package machine
diff --git a/src/machine/board_xiao.go b/src/machine/board_xiao.go
index 108346ada..aa8c44045 100644
--- a/src/machine/board_xiao.go
+++ b/src/machine/board_xiao.go
@@ -1,3 +1,4 @@
+//go:build sam && atsamd21 && xiao
 // +build sam,atsamd21,xiao
 
 package machine
diff --git a/src/machine/i2s.go b/src/machine/i2s.go
index caecc0661..91c97ec9f 100644
--- a/src/machine/i2s.go
+++ b/src/machine/i2s.go
@@ -1,3 +1,4 @@
+//go:build sam
 // +build sam
 
 // This is the definition for I2S bus functions.
diff --git a/src/machine/machine_atmega.go b/src/machine/machine_atmega.go
index 6e2b59cf1..41d5192cb 100644
--- a/src/machine/machine_atmega.go
+++ b/src/machine/machine_atmega.go
@@ -1,3 +1,4 @@
+//go:build avr && atmega
 // +build avr,atmega
 
 package machine
diff --git a/src/machine/machine_atmega1280.go b/src/machine/machine_atmega1280.go
index 391c27405..6c286f18b 100644
--- a/src/machine/machine_atmega1280.go
+++ b/src/machine/machine_atmega1280.go
@@ -1,3 +1,4 @@
+//go:build avr && atmega1280
 // +build avr,atmega1280
 
 package machine
diff --git a/src/machine/machine_atmega1284p.go b/src/machine/machine_atmega1284p.go
index 83a88906d..633a4e9c8 100644
--- a/src/machine/machine_atmega1284p.go
+++ b/src/machine/machine_atmega1284p.go
@@ -1,3 +1,4 @@
+//go:build avr && atmega1284p
 // +build avr,atmega1284p
 
 package machine
diff --git a/src/machine/machine_atmega2560.go b/src/machine/machine_atmega2560.go
index d50f9081d..2cc97cdb8 100644
--- a/src/machine/machine_atmega2560.go
+++ b/src/machine/machine_atmega2560.go
@@ -1,3 +1,4 @@
+//go:build avr && atmega2560
 // +build avr,atmega2560
 
 package machine
diff --git a/src/machine/machine_atmega328p.go b/src/machine/machine_atmega328p.go
index ecb3c1b88..ee92c1b52 100644
--- a/src/machine/machine_atmega328p.go
+++ b/src/machine/machine_atmega328p.go
@@ -1,3 +1,4 @@
+//go:build avr && atmega328p
 // +build avr,atmega328p
 
 package machine
diff --git a/src/machine/machine_atmega328pb.go b/src/machine/machine_atmega328pb.go
index 38c26dfb6..afae4798d 100644
--- a/src/machine/machine_atmega328pb.go
+++ b/src/machine/machine_atmega328pb.go
@@ -1,3 +1,4 @@
+//go:build avr && atmega328pb
 // +build avr,atmega328pb
 
 package machine
diff --git a/src/machine/machine_atsamd21.go b/src/machine/machine_atsamd21.go
index cb151703a..92f21b0a5 100644
--- a/src/machine/machine_atsamd21.go
+++ b/src/machine/machine_atsamd21.go
@@ -1,3 +1,4 @@
+//go:build sam && atsamd21
 // +build sam,atsamd21
 
 // Peripheral abstraction layer for the atsamd21.
diff --git a/src/machine/machine_atsamd21e18.go b/src/machine/machine_atsamd21e18.go
index fd4f5d091..f019d6125 100644
--- a/src/machine/machine_atsamd21e18.go
+++ b/src/machine/machine_atsamd21e18.go
@@ -1,3 +1,4 @@
+//go:build sam && atsamd21 && atsamd21e18
 // +build sam,atsamd21,atsamd21e18
 
 // Peripheral abstraction layer for the atsamd21.
diff --git a/src/machine/machine_atsamd21g18.go b/src/machine/machine_atsamd21g18.go
index 44cc5828b..aece56f47 100644
--- a/src/machine/machine_atsamd21g18.go
+++ b/src/machine/machine_atsamd21g18.go
@@ -1,3 +1,4 @@
+//go:build sam && atsamd21 && atsamd21g18
 // +build sam,atsamd21,atsamd21g18
 
 // Peripheral abstraction layer for the atsamd21.
diff --git a/src/machine/machine_atsamd51g19.go b/src/machine/machine_atsamd51g19.go
index f50701f12..e8c8f69a3 100644
--- a/src/machine/machine_atsamd51g19.go
+++ b/src/machine/machine_atsamd51g19.go
@@ -1,3 +1,4 @@
+//go:build sam && atsamd51 && atsamd51g19
 // +build sam,atsamd51,atsamd51g19
 
 // Peripheral abstraction layer for the atsamd51.
diff --git a/src/machine/machine_atsamd51j19.go b/src/machine/machine_atsamd51j19.go
index c29d9a7a0..9e74deee6 100644
--- a/src/machine/machine_atsamd51j19.go
+++ b/src/machine/machine_atsamd51j19.go
@@ -1,3 +1,4 @@
+//go:build sam && atsamd51 && atsamd51j19
 // +build sam,atsamd51,atsamd51j19
 
 // Peripheral abstraction layer for the atsamd51.
diff --git a/src/machine/machine_atsamd51j20.go b/src/machine/machine_atsamd51j20.go
index 966114e0b..68b1f8ee8 100644
--- a/src/machine/machine_atsamd51j20.go
+++ b/src/machine/machine_atsamd51j20.go
@@ -1,3 +1,4 @@
+//go:build sam && atsamd51 && atsamd51j20
 // +build sam,atsamd51,atsamd51j20
 
 // Peripheral abstraction layer for the atsamd51.
diff --git a/src/machine/machine_atsamd51p19.go b/src/machine/machine_atsamd51p19.go
index b642fae7b..458d6b626 100644
--- a/src/machine/machine_atsamd51p19.go
+++ b/src/machine/machine_atsamd51p19.go
@@ -1,3 +1,4 @@
+//go:build sam && atsamd51 && atsamd51p19
 // +build sam,atsamd51,atsamd51p19
 
 // Peripheral abstraction layer for the atsamd51.
diff --git a/src/machine/machine_atsamd51p20.go b/src/machine/machine_atsamd51p20.go
index e5d0faa04..c8312fb55 100644
--- a/src/machine/machine_atsamd51p20.go
+++ b/src/machine/machine_atsamd51p20.go
@@ -1,3 +1,4 @@
+//go:build sam && atsamd51 && atsamd51p20
 // +build sam,atsamd51,atsamd51p20
 
 // Peripheral abstraction layer for the atsamd51.
diff --git a/src/machine/machine_atsame51j19.go b/src/machine/machine_atsame51j19.go
index 3064648e5..01e73869c 100644
--- a/src/machine/machine_atsame51j19.go
+++ b/src/machine/machine_atsame51j19.go
@@ -1,3 +1,4 @@
+//go:build sam && atsame51 && atsame51j19
 // +build sam,atsame51,atsame51j19
 
 // Peripheral abstraction layer for the atsame51.
diff --git a/src/machine/machine_atsame54p20.go b/src/machine/machine_atsame54p20.go
index 2a49019c9..74ab5f3ce 100644
--- a/src/machine/machine_atsame54p20.go
+++ b/src/machine/machine_atsame54p20.go
@@ -1,3 +1,4 @@
+//go:build sam && atsame5x && atsame54p20
 // +build sam,atsame5x,atsame54p20
 
 // Peripheral abstraction layer for the atsame54.
diff --git a/src/machine/machine_atsame5x_can.go b/src/machine/machine_atsame5x_can.go
index 9cad660ec..47be30514 100644
--- a/src/machine/machine_atsame5x_can.go
+++ b/src/machine/machine_atsame5x_can.go
@@ -1,3 +1,4 @@
+//go:build (sam && atsame51) || (sam && atsame54)
 // +build sam,atsame51 sam,atsame54
 
 package machine
diff --git a/src/machine/machine_attiny85.go b/src/machine/machine_attiny85.go
index 5a6c37c7b..002a1feab 100644
--- a/src/machine/machine_attiny85.go
+++ b/src/machine/machine_attiny85.go
@@ -1,3 +1,4 @@
+//go:build attiny85
 // +build attiny85
 
 package machine
diff --git a/src/machine/machine_esp32.go b/src/machine/machine_esp32.go
index 31a324829..b2187e78f 100644
--- a/src/machine/machine_esp32.go
+++ b/src/machine/machine_esp32.go
@@ -1,3 +1,4 @@
+//go:build esp32
 // +build esp32
 
 package machine
diff --git a/src/machine/machine_esp32c3.go b/src/machine/machine_esp32c3.go
index 39ac78bb1..695615c19 100644
--- a/src/machine/machine_esp32c3.go
+++ b/src/machine/machine_esp32c3.go
@@ -1,3 +1,4 @@
+//go:build esp32c3
 // +build esp32c3
 
 package machine
diff --git a/src/machine/machine_esp8266.go b/src/machine/machine_esp8266.go
index a5fbbc672..77fb0ba63 100644
--- a/src/machine/machine_esp8266.go
+++ b/src/machine/machine_esp8266.go
@@ -1,3 +1,4 @@
+//go:build esp8266
 // +build esp8266
 
 package machine
diff --git a/src/machine/machine_fe310.go b/src/machine/machine_fe310.go
index 609571ea2..7a1360204 100644
--- a/src/machine/machine_fe310.go
+++ b/src/machine/machine_fe310.go
@@ -1,3 +1,4 @@
+//go:build fe310
 // +build fe310
 
 package machine
diff --git a/src/machine/machine_gameboyadvance.go b/src/machine/machine_gameboyadvance.go
index c35b7ef3b..9c7c83926 100644
--- a/src/machine/machine_gameboyadvance.go
+++ b/src/machine/machine_gameboyadvance.go
@@ -1,3 +1,4 @@
+//go:build gameboyadvance
 // +build gameboyadvance
 
 package machine
diff --git a/src/machine/machine_generic.go b/src/machine/machine_generic.go
index cbcc98ecf..51ea63c04 100644
--- a/src/machine/machine_generic.go
+++ b/src/machine/machine_generic.go
@@ -1,3 +1,4 @@
+//go:build !baremetal
 // +build !baremetal
 
 package machine
diff --git a/src/machine/machine_generic_peripherals.go b/src/machine/machine_generic_peripherals.go
index 03146e8b2..a9ac85d5f 100644
--- a/src/machine/machine_generic_peripherals.go
+++ b/src/machine/machine_generic_peripherals.go
@@ -1,3 +1,4 @@
+//go:build !baremetal && !arduino_mkr1000 && !arduino_mkrwifi1010 && !arduino_nano33 && !arduino_zero && !circuitplay_express && !feather_m0 && !feather_m4 && !grandcentral_m4 && !itsybitsy_m0 && !itsybitsy_m4 && !matrixportal_m4 && !metro_m4_airlift && !p1am_100 && !pybadge && !pygamer && !pyportal && !qtpy && !trinket_m0 && !wioterminal && !xiao
 // +build !baremetal,!arduino_mkr1000,!arduino_mkrwifi1010,!arduino_nano33,!arduino_zero,!circuitplay_express,!feather_m0,!feather_m4,!grandcentral_m4,!itsybitsy_m0,!itsybitsy_m4,!matrixportal_m4,!metro_m4_airlift,!p1am_100,!pybadge,!pygamer,!pyportal,!qtpy,!trinket_m0,!wioterminal,!xiao
 
 package machine
diff --git a/src/machine/machine_k210.go b/src/machine/machine_k210.go
index 4a8bc98f1..364406001 100644
--- a/src/machine/machine_k210.go
+++ b/src/machine/machine_k210.go
@@ -1,3 +1,4 @@
+//go:build k210
 // +build k210
 
 package machine
diff --git a/src/machine/machine_mimxrt1062.go b/src/machine/machine_mimxrt1062.go
index bcb06021a..05d79b2a5 100644
--- a/src/machine/machine_mimxrt1062.go
+++ b/src/machine/machine_mimxrt1062.go
@@ -1,3 +1,4 @@
+//go:build mimxrt1062
 // +build mimxrt1062
 
 package machine
diff --git a/src/machine/machine_mimxrt1062_uart.go b/src/machine/machine_mimxrt1062_uart.go
index b61fd04f0..95813d836 100644
--- a/src/machine/machine_mimxrt1062_uart.go
+++ b/src/machine/machine_mimxrt1062_uart.go
@@ -1,3 +1,4 @@
+//go:build mimxrt1062
 // +build mimxrt1062
 
 package machine
diff --git a/src/machine/machine_nrf51.go b/src/machine/machine_nrf51.go
index d60dc5f16..9068df0b4 100644
--- a/src/machine/machine_nrf51.go
+++ b/src/machine/machine_nrf51.go
@@ -1,3 +1,4 @@
+//go:build nrf51
 // +build nrf51
 
 package machine
diff --git a/src/machine/machine_nrf52.go b/src/machine/machine_nrf52.go
index 45e481593..f5c6ed240 100644
--- a/src/machine/machine_nrf52.go
+++ b/src/machine/machine_nrf52.go
@@ -1,3 +1,4 @@
+//go:build nrf52
 // +build nrf52
 
 package machine
diff --git a/src/machine/machine_nrf52833.go b/src/machine/machine_nrf52833.go
index 73f86f157..1d1ab961c 100644
--- a/src/machine/machine_nrf52833.go
+++ b/src/machine/machine_nrf52833.go
@@ -1,3 +1,4 @@
+//go:build nrf52833
 // +build nrf52833
 
 package machine
diff --git a/src/machine/machine_nrf52840.go b/src/machine/machine_nrf52840.go
index d7d6ae2b3..f0a59f549 100644
--- a/src/machine/machine_nrf52840.go
+++ b/src/machine/machine_nrf52840.go
@@ -1,3 +1,4 @@
+//go:build nrf52840
 // +build nrf52840
 
 package machine
diff --git a/src/machine/machine_nrf52840_usb.go b/src/machine/machine_nrf52840_usb.go
index 82a44afe6..098424a35 100644
--- a/src/machine/machine_nrf52840_usb.go
+++ b/src/machine/machine_nrf52840_usb.go
@@ -1,3 +1,4 @@
+//go:build nrf52840
 // +build nrf52840
 
 package machine
diff --git a/src/machine/machine_nrf52840_usb_reset_bossa.go b/src/machine/machine_nrf52840_usb_reset_bossa.go
index 42c6ad000..1125696eb 100644
--- a/src/machine/machine_nrf52840_usb_reset_bossa.go
+++ b/src/machine/machine_nrf52840_usb_reset_bossa.go
@@ -1,3 +1,4 @@
+//go:build nrf52840 && nrf52840_reset_bossa
 // +build nrf52840,nrf52840_reset_bossa
 
 package machine
diff --git a/src/machine/machine_nrf52840_usb_reset_none.go b/src/machine/machine_nrf52840_usb_reset_none.go
index 796a021e7..a7a998878 100644
--- a/src/machine/machine_nrf52840_usb_reset_none.go
+++ b/src/machine/machine_nrf52840_usb_reset_none.go
@@ -1,3 +1,4 @@
+//go:build nrf52840 && !nrf52840_reset_uf2 && !nrf52840_reset_bossa
 // +build nrf52840,!nrf52840_reset_uf2,!nrf52840_reset_bossa
 
 package machine
diff --git a/src/machine/machine_nrf52840_usb_reset_uf2.go b/src/machine/machine_nrf52840_usb_reset_uf2.go
index e1d15cd5e..ec685529e 100644
--- a/src/machine/machine_nrf52840_usb_reset_uf2.go
+++ b/src/machine/machine_nrf52840_usb_reset_uf2.go
@@ -1,3 +1,4 @@
+//go:build nrf52840 && nrf52840_reset_uf2
 // +build nrf52840,nrf52840_reset_uf2
 
 package machine
diff --git a/src/machine/machine_nrf528xx.go b/src/machine/machine_nrf528xx.go
index 2cf2e10bd..02fe9ebc1 100644
--- a/src/machine/machine_nrf528xx.go
+++ b/src/machine/machine_nrf528xx.go
@@ -1,3 +1,4 @@
+//go:build nrf52 || nrf52840 || nrf52833
 // +build nrf52 nrf52840 nrf52833
 
 package machine
diff --git a/src/machine/machine_nxpmk66f18.go b/src/machine/machine_nxpmk66f18.go
index aaecee536..a8257b0b3 100644
--- a/src/machine/machine_nxpmk66f18.go
+++ b/src/machine/machine_nxpmk66f18.go
@@ -27,6 +27,7 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+//go:build nxp && mk66f18
 // +build nxp,mk66f18
 
 package machine
diff --git a/src/machine/machine_nxpmk66f18_uart.go b/src/machine/machine_nxpmk66f18_uart.go
index 2d8eae016..ccbb18edb 100644
--- a/src/machine/machine_nxpmk66f18_uart.go
+++ b/src/machine/machine_nxpmk66f18_uart.go
@@ -27,6 +27,7 @@
 // CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+//go:build nxp && mk66f18
 // +build nxp,mk66f18
 
 package machine
diff --git a/src/machine/machine_rp2040_adc.go b/src/machine/machine_rp2040_adc.go
index 5598c6b73..c9631e39b 100644
--- a/src/machine/machine_rp2040_adc.go
+++ b/src/machine/machine_rp2040_adc.go
@@ -1,3 +1,4 @@
+//go:build rp2040
 // +build rp2040
 
 package machine
diff --git a/src/machine/machine_rp2040_clocks.go b/src/machine/machine_rp2040_clocks.go
index 38da5ffa7..3a0c714a7 100644
--- a/src/machine/machine_rp2040_clocks.go
+++ b/src/machine/machine_rp2040_clocks.go
@@ -1,3 +1,4 @@
+//go:build rp2040
 // +build rp2040
 
 package machine
diff --git a/src/machine/machine_rp2040_i2c.go b/src/machine/machine_rp2040_i2c.go
index efbb62a4f..f4d9d4700 100644
--- a/src/machine/machine_rp2040_i2c.go
+++ b/src/machine/machine_rp2040_i2c.go
@@ -1,3 +1,4 @@
+//go:build rp2040
 // +build rp2040
 
 package machine
diff --git a/src/machine/machine_rp2040_pll.go b/src/machine/machine_rp2040_pll.go
index 275aa25f1..d716566b8 100644
--- a/src/machine/machine_rp2040_pll.go
+++ b/src/machine/machine_rp2040_pll.go
@@ -1,3 +1,4 @@
+//go:build rp2040
 // +build rp2040
 
 package machine
diff --git a/src/machine/machine_rp2040_resets.go b/src/machine/machine_rp2040_resets.go
index 39c834505..1a6ad99e5 100644
--- a/src/machine/machine_rp2040_resets.go
+++ b/src/machine/machine_rp2040_resets.go
@@ -1,3 +1,4 @@
+//go:build rp2040
 // +build rp2040
 
 package machine
diff --git a/src/machine/machine_rp2040_spi.go b/src/machine/machine_rp2040_spi.go
index ac2bcabe6..8e5525413 100644
--- a/src/machine/machine_rp2040_spi.go
+++ b/src/machine/machine_rp2040_spi.go
@@ -1,3 +1,4 @@
+//go:build rp2040
 // +build rp2040
 
 package machine
diff --git a/src/machine/machine_rp2040_timer.go b/src/machine/machine_rp2040_timer.go
index e714a1915..1ebe2130c 100644
--- a/src/machine/machine_rp2040_timer.go
+++ b/src/machine/machine_rp2040_timer.go
@@ -1,3 +1,4 @@
+//go:build rp2040
 // +build rp2040
 
 package machine
diff --git a/src/machine/machine_rp2040_uart.go b/src/machine/machine_rp2040_uart.go
index e2b5f7337..7dd822cf9 100644
--- a/src/machine/machine_rp2040_uart.go
+++ b/src/machine/machine_rp2040_uart.go
@@ -1,3 +1,4 @@
+//go:build rp2040
 // +build rp2040
 
 package machine
diff --git a/src/machine/machine_rp2040_watchdog.go b/src/machine/machine_rp2040_watchdog.go
index b55bbc671..e2dc196fc 100644
--- a/src/machine/machine_rp2040_watchdog.go
+++ b/src/machine/machine_rp2040_watchdog.go
@@ -1,3 +1,4 @@
+//go:build rp2040
 // +build rp2040
 
 package machine
diff --git a/src/machine/machine_rp2040_xosc.go b/src/machine/machine_rp2040_xosc.go
index 357853948..f670de40c 100644
--- a/src/machine/machine_rp2040_xosc.go
+++ b/src/machine/machine_rp2040_xosc.go
@@ -1,3 +1,4 @@
+//go:build rp2040
 // +build rp2040
 
 package machine
diff --git a/src/machine/machine_stm32.go b/src/machine/machine_stm32.go
index 1f92b1957..a5d4b3827 100644
--- a/src/machine/machine_stm32.go
+++ b/src/machine/machine_stm32.go
@@ -1,3 +1,4 @@
+//go:build stm32
 // +build stm32
 
 package machine
diff --git a/src/machine/machine_stm32_exti_afio.go b/src/machine/machine_stm32_exti_afio.go
index aee4936ac..0cf34003b 100644
--- a/src/machine/machine_stm32_exti_afio.go
+++ b/src/machine/machine_stm32_exti_afio.go
@@ -1,3 +1,4 @@
+//go:build stm32f1
 // +build stm32f1
 
 package machine
diff --git a/src/machine/machine_stm32_exti_exti.go b/src/machine/machine_stm32_exti_exti.go
index 73db5e1e4..e21cfae56 100644
--- a/src/machine/machine_stm32_exti_exti.go
+++ b/src/machine/machine_stm32_exti_exti.go
@@ -1,3 +1,4 @@
+//go:build stm32l5
 // +build stm32l5
 
 package machine
diff --git a/src/machine/machine_stm32_i2c_reva.go b/src/machine/machine_stm32_i2c_reva.go
index 4d7e2190d..eee4e155d 100644
--- a/src/machine/machine_stm32_i2c_reva.go
+++ b/src/machine/machine_stm32_i2c_reva.go
@@ -1,3 +1,4 @@
+//go:build stm32f4 || stm32f1
 // +build stm32f4 stm32f1
 
 package machine
diff --git a/src/machine/machine_stm32_tim.go b/src/machine/machine_stm32_tim.go
index 41e4fb0f8..02c6c7a16 100644
--- a/src/machine/machine_stm32_tim.go
+++ b/src/machine/machine_stm32_tim.go
@@ -1,3 +1,4 @@
+//go:build stm32
 // +build stm32
 
 package machine
diff --git a/src/machine/machine_stm32_tim_moder.go b/src/machine/machine_stm32_tim_moder.go
index e1c359bae..e868469f4 100644
--- a/src/machine/machine_stm32_tim_moder.go
+++ b/src/machine/machine_stm32_tim_moder.go
@@ -1,3 +1,4 @@
+//go:build stm32 && !stm32f1
 // +build stm32,!stm32f1
 
 package machine
diff --git a/src/machine/machine_stm32_uart.go b/src/machine/machine_stm32_uart.go
index 62f7cb192..9fdd17cb0 100644
--- a/src/machine/machine_stm32_uart.go
+++ b/src/machine/machine_stm32_uart.go
@@ -1,3 +1,4 @@
+//go:build stm32
 // +build stm32
 
 package machine
diff --git a/src/machine/machine_stm32f103.go b/src/machine/machine_stm32f103.go
index 0e21c455d..4c6778023 100644
--- a/src/machine/machine_stm32f103.go
+++ b/src/machine/machine_stm32f103.go
@@ -1,3 +1,4 @@
+//go:build stm32 && stm32f103
 // +build stm32,stm32f103
 
 package machine
diff --git a/src/machine/machine_stm32f7x2.go b/src/machine/machine_stm32f7x2.go
index 7035c38c5..bdfa27bc1 100644
--- a/src/machine/machine_stm32f7x2.go
+++ b/src/machine/machine_stm32f7x2.go
@@ -1,3 +1,4 @@
+//go:build stm32f7x2
 // +build stm32f7x2
 
 package machine
diff --git a/src/machine/machine_stm32l0x1.go b/src/machine/machine_stm32l0x1.go
index 033718c57..254fb36cc 100644
--- a/src/machine/machine_stm32l0x1.go
+++ b/src/machine/machine_stm32l0x1.go
@@ -1,3 +1,4 @@
+//go:build stm32l0x1
 // +build stm32l0x1
 
 package machine
diff --git a/src/machine/machine_stm32l5x2.go b/src/machine/machine_stm32l5x2.go
index fc81b2747..966c0cebc 100644
--- a/src/machine/machine_stm32l5x2.go
+++ b/src/machine/machine_stm32l5x2.go
@@ -1,3 +1,4 @@
+//go:build stm32l5x2
 // +build stm32l5x2
 
 package machine
diff --git a/src/machine/serial-none.go b/src/machine/serial-none.go
index 22e94cc90..3596769f4 100644
--- a/src/machine/serial-none.go
+++ b/src/machine/serial-none.go
@@ -1,3 +1,4 @@
+//go:build baremetal && serial.none
 // +build baremetal,serial.none
 
 package machine
diff --git a/src/machine/serial-uart.go b/src/machine/serial-uart.go
index d3edf832f..30575502d 100644
--- a/src/machine/serial-uart.go
+++ b/src/machine/serial-uart.go
@@ -1,3 +1,4 @@
+//go:build baremetal && serial.uart
 // +build baremetal,serial.uart
 
 package machine
diff --git a/src/machine/serial-usb.go b/src/machine/serial-usb.go
index 476d4b0cf..ac484f87a 100644
--- a/src/machine/serial-usb.go
+++ b/src/machine/serial-usb.go
@@ -1,3 +1,4 @@
+//go:build baremetal && serial.usb
 // +build baremetal,serial.usb
 
 package machine
diff --git a/src/machine/uart.go b/src/machine/uart.go
index 8fbac8711..ccfc64ee7 100644
--- a/src/machine/uart.go
+++ b/src/machine/uart.go
@@ -1,3 +1,4 @@
+//go:build atmega || esp || nrf || sam || sifive || stm32 || k210 || nxp || rp2040
 // +build atmega esp nrf sam sifive stm32 k210 nxp rp2040
 
 package machine
diff --git a/src/machine/usb.go b/src/machine/usb.go
index 4bea1880d..1789e170a 100644
--- a/src/machine/usb.go
+++ b/src/machine/usb.go
@@ -1,3 +1,4 @@
+//go:build sam || nrf52840
 // +build sam nrf52840
 
 package machine