adafruit · hierophect · Mar 12, 2020 · Mar 11, 2020 · Mar 11, 2020 · Mar 11, 2020
diff --git a/.gitmodules b/.gitmodules
@@ -96,8 +96,8 @@
 [submodule "frozen/circuitpython-stage"]
 	path = frozen/circuitpython-stage
 	url = https://github.com/python-ugame/circuitpython-stage.git
-[submodule "ports/stm32f4/stm32f4"]
-	path = ports/stm32f4/stm32f4
+[submodule "ports/stm/stm32f4"]
+	path = ports/stm/stm32f4
 	url = https://github.com/adafruit/stm32f4.git
 [submodule "ports/cxd56/spresense-exported-sdk"]
 	path = ports/cxd56/spresense-exported-sdk

diff --git a/conf.py b/conf.py
@@ -121,16 +121,8 @@
                     "ports/atmel-samd/peripherals",
                     "ports/atmel-samd/QTouch",
                     "ports/atmel-samd/tools",
-                    "ports/bare-arm",
-                    "ports/cc3200",
-                    "ports/cc3200/FreeRTOS",
-                    "ports/cc3200/hal",
                     "ports/cxd56/mkspk",
                     "ports/cxd56/spresense-exported-sdk",
-                    "ports/esp32",
-                    "ports/esp8266/boards",
-                    "ports/esp8266/common-hal",
-                    "ports/esp8266/modules",
                     "ports/minimal",
                     "ports/mimxrt10xx/peripherals",
                     "ports/mimxrt10xx/sdk",
@@ -140,20 +132,10 @@
                     "ports/nrf/nrfx",
                     "ports/nrf/peripherals",
                     "ports/nrf/usb",
-                    "ports/stm32f4/stm32f4",
-                    "ports/stm32f4/peripherals",
-                    "ports/stm32f4/ref",
-                    "ports/pic16bit",
-                    "ports/qemu-arm",
-                    "ports/stm32",
-                    "ports/stm32/hal",
-                    "ports/stm32/cmsis",
-                    "ports/stm32/usbdev",
-                    "ports/stm32/usbhost",
-                    "ports/teensy",
+                    "ports/stm/stm32f4",
+                    "ports/stm/peripherals",
+                    "ports/stm/ref",
                     "ports/unix",
-                    "ports/windows",
-                    "ports/zephyr",
                     "py",
                     "shared-bindings/util.*",
                     "shared-module",

diff --git a/docs/supported_ports.rst b/docs/supported_ports.rst
@@ -10,5 +10,5 @@ and ESP8266.
     ../ports/atmel-samd/README
     ../ports/mimxrt10xx/README
     ../ports/nrf/README
-    ../ports/stm32f4/README
+    ../ports/stm/README
     ../ports/cxd56/README
diff --git a/ports/stm32f4/.gitignore → ports/stm/.gitignore b/ports/stm32f4/.gitignore → ports/stm/.gitignore
diff --git a/ports/stm32f4/Makefile → ports/stm/Makefile b/ports/stm32f4/Makefile → ports/stm/Makefile
diff --git a/ports/stm32f4/README.md → ports/stm/README.md b/ports/stm32f4/README.md → ports/stm/README.md
diff --git a/ports/stm32f4/background.c → ports/stm/background.c b/ports/stm32f4/background.c → ports/stm/background.c
diff --git a/ports/stm32f4/background.h → ports/stm/background.h b/ports/stm32f4/background.h → ports/stm/background.h
diff --git a/ports/stm32f4/boards/STM32F401xd_fs.ld → ports/stm/boards/STM32F401xd_fs.ld b/ports/stm32f4/boards/STM32F401xd_fs.ld → ports/stm/boards/STM32F401xd_fs.ld
diff --git a/ports/stm32f4/boards/STM32F401xe_boot.ld → ports/stm/boards/STM32F401xe_boot.ld b/ports/stm32f4/boards/STM32F401xe_boot.ld → ports/stm/boards/STM32F401xe_boot.ld
diff --git a/ports/stm32f4/boards/STM32F401xe_fs.ld → ports/stm/boards/STM32F401xe_fs.ld b/ports/stm32f4/boards/STM32F401xe_fs.ld → ports/stm/boards/STM32F401xe_fs.ld
diff --git a/ports/stm32f4/boards/STM32F405_boot.ld → ports/stm/boards/STM32F405_boot.ld b/ports/stm32f4/boards/STM32F405_boot.ld → ports/stm/boards/STM32F405_boot.ld
diff --git a/ports/stm32f4/boards/STM32F405_default.ld → ports/stm/boards/STM32F405_default.ld b/ports/stm32f4/boards/STM32F405_default.ld → ports/stm/boards/STM32F405_default.ld
diff --git a/ports/stm32f4/boards/STM32F405_fs.ld → ports/stm/boards/STM32F405_fs.ld b/ports/stm32f4/boards/STM32F405_fs.ld → ports/stm/boards/STM32F405_fs.ld
diff --git a/ports/stm32f4/boards/STM32F407_fs.ld → ports/stm/boards/STM32F407_fs.ld b/ports/stm32f4/boards/STM32F407_fs.ld → ports/stm/boards/STM32F407_fs.ld
diff --git a/ports/stm32f4/boards/STM32F411VETx_FLASH.ld → ports/stm/boards/STM32F411VETx_FLASH.ld b/ports/stm32f4/boards/STM32F411VETx_FLASH.ld → ports/stm/boards/STM32F411VETx_FLASH.ld
diff --git a/ports/stm32f4/boards/STM32F412ZGTx_FLASH.ld → ports/stm/boards/STM32F412ZGTx_FLASH.ld b/ports/stm32f4/boards/STM32F412ZGTx_FLASH.ld → ports/stm/boards/STM32F412ZGTx_FLASH.ld
diff --git a/ports/stm32f4/boards/board.h → ports/stm/boards/board.h b/ports/stm32f4/boards/board.h → ports/stm/boards/board.h
diff --git a/ports/stm32f4/boards/espruino_pico/README.md → ports/stm/boards/espruino_pico/README.md b/ports/stm32f4/boards/espruino_pico/README.md → ports/stm/boards/espruino_pico/README.md
diff --git a/ports/stm32f4/boards/espruino_pico/board.c → ports/stm/boards/espruino_pico/board.c b/ports/stm32f4/boards/espruino_pico/board.c → ports/stm/boards/espruino_pico/board.c
diff --git a/...32f4/boards/espruino_pico/mpconfigboard.h → .../stm/boards/espruino_pico/mpconfigboard.h b/...32f4/boards/espruino_pico/mpconfigboard.h → .../stm/boards/espruino_pico/mpconfigboard.h
diff --git a/...2f4/boards/espruino_pico/mpconfigboard.mk → ...stm/boards/espruino_pico/mpconfigboard.mk b/...2f4/boards/espruino_pico/mpconfigboard.mk → ...stm/boards/espruino_pico/mpconfigboard.mk
diff --git a/ports/stm32f4/boards/espruino_pico/pins.c → ports/stm/boards/espruino_pico/pins.c b/ports/stm32f4/boards/espruino_pico/pins.c → ports/stm/boards/espruino_pico/pins.c
diff --git a/...boards/espruino_pico/stm32f4xx_hal_conf.h → ...boards/espruino_pico/stm32f4xx_hal_conf.h b/...boards/espruino_pico/stm32f4xx_hal_conf.h → ...boards/espruino_pico/stm32f4xx_hal_conf.h
diff --git a/ports/stm32f4/boards/espruino_wifi/README.MD → ports/stm/boards/espruino_wifi/README.MD b/ports/stm32f4/boards/espruino_wifi/README.MD → ports/stm/boards/espruino_wifi/README.MD
diff --git a/ports/stm32f4/boards/espruino_wifi/board.c → ports/stm/boards/espruino_wifi/board.c b/ports/stm32f4/boards/espruino_wifi/board.c → ports/stm/boards/espruino_wifi/board.c
diff --git a/...32f4/boards/espruino_wifi/mpconfigboard.h → .../stm/boards/espruino_wifi/mpconfigboard.h b/...32f4/boards/espruino_wifi/mpconfigboard.h → .../stm/boards/espruino_wifi/mpconfigboard.h
diff --git a/...2f4/boards/espruino_wifi/mpconfigboard.mk → ...stm/boards/espruino_wifi/mpconfigboard.mk b/...2f4/boards/espruino_wifi/mpconfigboard.mk → ...stm/boards/espruino_wifi/mpconfigboard.mk
diff --git a/ports/stm32f4/boards/espruino_wifi/pins.c → ports/stm/boards/espruino_wifi/pins.c b/ports/stm32f4/boards/espruino_wifi/pins.c → ports/stm/boards/espruino_wifi/pins.c
diff --git a/...boards/espruino_wifi/stm32f4xx_hal_conf.h → ...boards/espruino_wifi/stm32f4xx_hal_conf.h b/...boards/espruino_wifi/stm32f4xx_hal_conf.h → ...boards/espruino_wifi/stm32f4xx_hal_conf.h
diff --git a/.../boards/feather_stm32f405_express/board.c → .../boards/feather_stm32f405_express/board.c b/.../boards/feather_stm32f405_express/board.c → .../boards/feather_stm32f405_express/board.c
diff --git a/...feather_stm32f405_express/mpconfigboard.h → ...feather_stm32f405_express/mpconfigboard.h b/...feather_stm32f405_express/mpconfigboard.h → ...feather_stm32f405_express/mpconfigboard.h
diff --git a/...eather_stm32f405_express/mpconfigboard.mk → ...eather_stm32f405_express/mpconfigboard.mk b/...eather_stm32f405_express/mpconfigboard.mk → ...eather_stm32f405_express/mpconfigboard.mk
diff --git a/...4/boards/feather_stm32f405_express/pins.c → ...m/boards/feather_stm32f405_express/pins.c b/...4/boards/feather_stm32f405_express/pins.c → ...m/boards/feather_stm32f405_express/pins.c
diff --git a/...er_stm32f405_express/stm32f4xx_hal_conf.h → ...er_stm32f405_express/stm32f4xx_hal_conf.h b/...er_stm32f405_express/stm32f4xx_hal_conf.h → ...er_stm32f405_express/stm32f4xx_hal_conf.h
diff --git a/ports/stm32f4/boards/meowbit_v121/board.c → ports/stm/boards/meowbit_v121/board.c b/ports/stm32f4/boards/meowbit_v121/board.c → ports/stm/boards/meowbit_v121/board.c
diff --git a/...m32f4/boards/meowbit_v121/mpconfigboard.h → ...s/stm/boards/meowbit_v121/mpconfigboard.h b/...m32f4/boards/meowbit_v121/mpconfigboard.h → ...s/stm/boards/meowbit_v121/mpconfigboard.h
diff --git a/...32f4/boards/meowbit_v121/mpconfigboard.mk → .../stm/boards/meowbit_v121/mpconfigboard.mk b/...32f4/boards/meowbit_v121/mpconfigboard.mk → .../stm/boards/meowbit_v121/mpconfigboard.mk
diff --git a/ports/stm32f4/boards/meowbit_v121/pins.c → ports/stm/boards/meowbit_v121/pins.c b/ports/stm32f4/boards/meowbit_v121/pins.c → ports/stm/boards/meowbit_v121/pins.c
diff --git a/.../boards/meowbit_v121/stm32f4xx_hal_conf.h → .../boards/meowbit_v121/stm32f4xx_hal_conf.h b/.../boards/meowbit_v121/stm32f4xx_hal_conf.h → .../boards/meowbit_v121/stm32f4xx_hal_conf.h
diff --git a/ports/stm32f4/boards/openocd_stm32f4.cfg → ports/stm/boards/openocd_stm32f4.cfg b/ports/stm32f4/boards/openocd_stm32f4.cfg → ports/stm/boards/openocd_stm32f4.cfg
diff --git a/ports/stm32f4/boards/pyb_nano_v2/board.c → ports/stm/boards/pyb_nano_v2/board.c b/ports/stm32f4/boards/pyb_nano_v2/board.c → ports/stm/boards/pyb_nano_v2/board.c
diff --git a/...tm32f4/boards/pyb_nano_v2/mpconfigboard.h → ports/stm/boards/pyb_nano_v2/mpconfigboard.h b/...tm32f4/boards/pyb_nano_v2/mpconfigboard.h → ports/stm/boards/pyb_nano_v2/mpconfigboard.h
diff --git a/...m32f4/boards/pyb_nano_v2/mpconfigboard.mk → ...s/stm/boards/pyb_nano_v2/mpconfigboard.mk b/...m32f4/boards/pyb_nano_v2/mpconfigboard.mk → ...s/stm/boards/pyb_nano_v2/mpconfigboard.mk
diff --git a/ports/stm32f4/boards/pyb_nano_v2/pins.c → ports/stm/boards/pyb_nano_v2/pins.c b/ports/stm32f4/boards/pyb_nano_v2/pins.c → ports/stm/boards/pyb_nano_v2/pins.c
diff --git a/...4/boards/pyb_nano_v2/stm32f4xx_hal_conf.h → ...m/boards/pyb_nano_v2/stm32f4xx_hal_conf.h b/...4/boards/pyb_nano_v2/stm32f4xx_hal_conf.h → ...m/boards/pyb_nano_v2/stm32f4xx_hal_conf.h
diff --git a/ports/stm32f4/boards/pyboard_v11/board.c → ports/stm/boards/pyboard_v11/board.c b/ports/stm32f4/boards/pyboard_v11/board.c → ports/stm/boards/pyboard_v11/board.c
diff --git a/...tm32f4/boards/pyboard_v11/mpconfigboard.h → ports/stm/boards/pyboard_v11/mpconfigboard.h b/...tm32f4/boards/pyboard_v11/mpconfigboard.h → ports/stm/boards/pyboard_v11/mpconfigboard.h
diff --git a/...m32f4/boards/pyboard_v11/mpconfigboard.mk → ...s/stm/boards/pyboard_v11/mpconfigboard.mk b/...m32f4/boards/pyboard_v11/mpconfigboard.mk → ...s/stm/boards/pyboard_v11/mpconfigboard.mk
diff --git a/ports/stm32f4/boards/pyboard_v11/pins.c → ports/stm/boards/pyboard_v11/pins.c b/ports/stm32f4/boards/pyboard_v11/pins.c → ports/stm/boards/pyboard_v11/pins.c
diff --git a/...4/boards/pyboard_v11/stm32f4xx_hal_conf.h → ...m/boards/pyboard_v11/stm32f4xx_hal_conf.h b/...4/boards/pyboard_v11/stm32f4xx_hal_conf.h → ...m/boards/pyboard_v11/stm32f4xx_hal_conf.h
diff --git a/ports/stm32f4/boards/startup_stm32f401xe.s → ports/stm/boards/startup_stm32f401xe.s b/ports/stm32f4/boards/startup_stm32f401xe.s → ports/stm/boards/startup_stm32f401xe.s
diff --git a/ports/stm32f4/boards/startup_stm32f405xx.s → ports/stm/boards/startup_stm32f405xx.s b/ports/stm32f4/boards/startup_stm32f405xx.s → ports/stm/boards/startup_stm32f405xx.s
diff --git a/ports/stm32f4/boards/startup_stm32f407xx.s → ports/stm/boards/startup_stm32f407xx.s b/ports/stm32f4/boards/startup_stm32f407xx.s → ports/stm/boards/startup_stm32f407xx.s
diff --git a/ports/stm32f4/boards/startup_stm32f411xe.s → ports/stm/boards/startup_stm32f411xe.s b/ports/stm32f4/boards/startup_stm32f411xe.s → ports/stm/boards/startup_stm32f411xe.s
diff --git a/ports/stm32f4/boards/startup_stm32f412zx.s → ports/stm/boards/startup_stm32f412zx.s b/ports/stm32f4/boards/startup_stm32f412zx.s → ports/stm/boards/startup_stm32f412zx.s
diff --git a/...32f4/boards/stm32f411ce_blackpill/board.c → .../stm/boards/stm32f411ce_blackpill/board.c b/...32f4/boards/stm32f411ce_blackpill/board.c → .../stm/boards/stm32f411ce_blackpill/board.c
diff --git a/...rds/stm32f411ce_blackpill/mpconfigboard.h → ...rds/stm32f411ce_blackpill/mpconfigboard.h b/...rds/stm32f411ce_blackpill/mpconfigboard.h → ...rds/stm32f411ce_blackpill/mpconfigboard.h
diff --git a/...ds/stm32f411ce_blackpill/mpconfigboard.mk → ...ds/stm32f411ce_blackpill/mpconfigboard.mk b/...ds/stm32f411ce_blackpill/mpconfigboard.mk → ...ds/stm32f411ce_blackpill/mpconfigboard.mk
diff --git a/...m32f4/boards/stm32f411ce_blackpill/pins.c → ...s/stm/boards/stm32f411ce_blackpill/pins.c b/...m32f4/boards/stm32f411ce_blackpill/pins.c → ...s/stm/boards/stm32f411ce_blackpill/pins.c
diff --git a/...tm32f411ce_blackpill/stm32f4xx_hal_conf.h → ...tm32f411ce_blackpill/stm32f4xx_hal_conf.h b/...tm32f411ce_blackpill/stm32f4xx_hal_conf.h → ...tm32f411ce_blackpill/stm32f4xx_hal_conf.h
diff --git a/...32f4/boards/stm32f411ve_discovery/board.c → .../stm/boards/stm32f411ve_discovery/board.c b/...32f4/boards/stm32f411ve_discovery/board.c → .../stm/boards/stm32f411ve_discovery/board.c
diff --git a/...rds/stm32f411ve_discovery/mpconfigboard.h → ...rds/stm32f411ve_discovery/mpconfigboard.h b/...rds/stm32f411ve_discovery/mpconfigboard.h → ...rds/stm32f411ve_discovery/mpconfigboard.h
diff --git a/...ds/stm32f411ve_discovery/mpconfigboard.mk → ...ds/stm32f411ve_discovery/mpconfigboard.mk b/...ds/stm32f411ve_discovery/mpconfigboard.mk → ...ds/stm32f411ve_discovery/mpconfigboard.mk
diff --git a/...m32f4/boards/stm32f411ve_discovery/pins.c → ...s/stm/boards/stm32f411ve_discovery/pins.c b/...m32f4/boards/stm32f411ve_discovery/pins.c → ...s/stm/boards/stm32f411ve_discovery/pins.c
diff --git a/...tm32f411ve_discovery/stm32f4xx_hal_conf.h → ...tm32f411ve_discovery/stm32f4xx_hal_conf.h b/...tm32f411ve_discovery/stm32f4xx_hal_conf.h → ...tm32f411ve_discovery/stm32f4xx_hal_conf.h
diff --git a/...32f4/boards/stm32f412zg_discovery/board.c → .../stm/boards/stm32f412zg_discovery/board.c b/...32f4/boards/stm32f412zg_discovery/board.c → .../stm/boards/stm32f412zg_discovery/board.c
diff --git a/...rds/stm32f412zg_discovery/mpconfigboard.h → ...rds/stm32f412zg_discovery/mpconfigboard.h b/...rds/stm32f412zg_discovery/mpconfigboard.h → ...rds/stm32f412zg_discovery/mpconfigboard.h
diff --git a/...ds/stm32f412zg_discovery/mpconfigboard.mk → ...ds/stm32f412zg_discovery/mpconfigboard.mk b/...ds/stm32f412zg_discovery/mpconfigboard.mk → ...ds/stm32f412zg_discovery/mpconfigboard.mk
diff --git a/...m32f4/boards/stm32f412zg_discovery/pins.c → ...s/stm/boards/stm32f412zg_discovery/pins.c b/...m32f4/boards/stm32f412zg_discovery/pins.c → ...s/stm/boards/stm32f412zg_discovery/pins.c
diff --git a/...tm32f412zg_discovery/stm32f4xx_hal_conf.h → ...tm32f412zg_discovery/stm32f4xx_hal_conf.h b/...tm32f412zg_discovery/stm32f4xx_hal_conf.h → ...tm32f412zg_discovery/stm32f4xx_hal_conf.h
diff --git a/.../stm32f4/boards/stm32f4_discovery/board.c → ports/stm/boards/stm32f4_discovery/board.c b/.../stm32f4/boards/stm32f4_discovery/board.c → ports/stm/boards/stm32f4_discovery/board.c
diff --git a/.../boards/stm32f4_discovery/mpconfigboard.h → .../boards/stm32f4_discovery/mpconfigboard.h b/.../boards/stm32f4_discovery/mpconfigboard.h → .../boards/stm32f4_discovery/mpconfigboard.h
diff --git a/...boards/stm32f4_discovery/mpconfigboard.mk → ...boards/stm32f4_discovery/mpconfigboard.mk b/...boards/stm32f4_discovery/mpconfigboard.mk → ...boards/stm32f4_discovery/mpconfigboard.mk
diff --git a/...s/stm32f4/boards/stm32f4_discovery/pins.c → ports/stm/boards/stm32f4_discovery/pins.c b/...s/stm32f4/boards/stm32f4_discovery/pins.c → ports/stm/boards/stm32f4_discovery/pins.c
diff --git a/...ds/stm32f4_discovery/stm32f4xx_hal_conf.h → ...ds/stm32f4_discovery/stm32f4xx_hal_conf.h b/...ds/stm32f4_discovery/stm32f4xx_hal_conf.h → ...ds/stm32f4_discovery/stm32f4xx_hal_conf.h
diff --git a/ports/stm32f4/common-hal/analogio/AnalogIn.c → ports/stm/common-hal/analogio/AnalogIn.c b/ports/stm32f4/common-hal/analogio/AnalogIn.c → ports/stm/common-hal/analogio/AnalogIn.c
diff --git a/ports/stm32f4/common-hal/analogio/AnalogIn.h → ports/stm/common-hal/analogio/AnalogIn.h b/ports/stm32f4/common-hal/analogio/AnalogIn.h → ports/stm/common-hal/analogio/AnalogIn.h
diff --git a/...s/stm32f4/common-hal/analogio/AnalogOut.c → ports/stm/common-hal/analogio/AnalogOut.c b/...s/stm32f4/common-hal/analogio/AnalogOut.c → ports/stm/common-hal/analogio/AnalogOut.c
diff --git a/...s/stm32f4/common-hal/analogio/AnalogOut.h → ports/stm/common-hal/analogio/AnalogOut.h b/...s/stm32f4/common-hal/analogio/AnalogOut.h → ports/stm/common-hal/analogio/AnalogOut.h
diff --git a/ports/stm32f4/common-hal/analogio/__init__.c → ports/stm/common-hal/analogio/__init__.c b/ports/stm32f4/common-hal/analogio/__init__.c → ports/stm/common-hal/analogio/__init__.c
diff --git a/ports/stm32f4/common-hal/board/__init__.c → ports/stm/common-hal/board/__init__.c b/ports/stm32f4/common-hal/board/__init__.c → ports/stm/common-hal/board/__init__.c
diff --git a/ports/stm32f4/common-hal/busio/I2C.c → ports/stm/common-hal/busio/I2C.c b/ports/stm32f4/common-hal/busio/I2C.c → ports/stm/common-hal/busio/I2C.c
diff --git a/ports/stm32f4/common-hal/busio/I2C.h → ports/stm/common-hal/busio/I2C.h b/ports/stm32f4/common-hal/busio/I2C.h → ports/stm/common-hal/busio/I2C.h
diff --git a/ports/stm32f4/common-hal/busio/OneWire.h → ports/stm/common-hal/busio/OneWire.h b/ports/stm32f4/common-hal/busio/OneWire.h → ports/stm/common-hal/busio/OneWire.h
diff --git a/ports/stm32f4/common-hal/busio/SPI.c → ports/stm/common-hal/busio/SPI.c b/ports/stm32f4/common-hal/busio/SPI.c → ports/stm/common-hal/busio/SPI.c
diff --git a/ports/stm32f4/common-hal/busio/SPI.h → ports/stm/common-hal/busio/SPI.h b/ports/stm32f4/common-hal/busio/SPI.h → ports/stm/common-hal/busio/SPI.h
diff --git a/ports/stm32f4/common-hal/busio/UART.c → ports/stm/common-hal/busio/UART.c b/ports/stm32f4/common-hal/busio/UART.c → ports/stm/common-hal/busio/UART.c
diff --git a/ports/stm32f4/common-hal/busio/UART.h → ports/stm/common-hal/busio/UART.h b/ports/stm32f4/common-hal/busio/UART.h → ports/stm/common-hal/busio/UART.h
diff --git a/ports/stm32f4/common-hal/busio/__init__.c → ports/stm/common-hal/busio/__init__.c b/ports/stm32f4/common-hal/busio/__init__.c → ports/stm/common-hal/busio/__init__.c
diff --git a/...m32f4/common-hal/digitalio/DigitalInOut.c → ...s/stm/common-hal/digitalio/DigitalInOut.c b/...m32f4/common-hal/digitalio/DigitalInOut.c → ...s/stm/common-hal/digitalio/DigitalInOut.c
diff --git a/...m32f4/common-hal/digitalio/DigitalInOut.h → ...s/stm/common-hal/digitalio/DigitalInOut.h b/...m32f4/common-hal/digitalio/DigitalInOut.h → ...s/stm/common-hal/digitalio/DigitalInOut.h
diff --git a/...s/stm32f4/common-hal/digitalio/__init__.c → ports/stm/common-hal/digitalio/__init__.c b/...s/stm32f4/common-hal/digitalio/__init__.c → ports/stm/common-hal/digitalio/__init__.c
diff --git a/...tm32f4/common-hal/displayio/ParallelBus.c → ports/stm/common-hal/displayio/ParallelBus.c b/...tm32f4/common-hal/displayio/ParallelBus.c → ports/stm/common-hal/displayio/ParallelBus.c
diff --git a/...tm32f4/common-hal/displayio/ParallelBus.h → ports/stm/common-hal/displayio/ParallelBus.h b/...tm32f4/common-hal/displayio/ParallelBus.h → ports/stm/common-hal/displayio/ParallelBus.h
diff --git a/.../stm32f4/common-hal/microcontroller/Pin.c → ports/stm/common-hal/microcontroller/Pin.c b/.../stm32f4/common-hal/microcontroller/Pin.c → ports/stm/common-hal/microcontroller/Pin.c
diff --git a/.../stm32f4/common-hal/microcontroller/Pin.h → ports/stm/common-hal/microcontroller/Pin.h b/.../stm32f4/common-hal/microcontroller/Pin.h → ports/stm/common-hal/microcontroller/Pin.h
diff --git a/...f4/common-hal/microcontroller/Processor.c → ...tm/common-hal/microcontroller/Processor.c b/...f4/common-hal/microcontroller/Processor.c → ...tm/common-hal/microcontroller/Processor.c
diff --git a/...f4/common-hal/microcontroller/Processor.h → ...tm/common-hal/microcontroller/Processor.h b/...f4/common-hal/microcontroller/Processor.h → ...tm/common-hal/microcontroller/Processor.h
diff --git a/...2f4/common-hal/microcontroller/__init__.c → ...stm/common-hal/microcontroller/__init__.c b/...2f4/common-hal/microcontroller/__init__.c → ...stm/common-hal/microcontroller/__init__.c
diff --git a/...32f4/common-hal/neopixel_write/__init__.c → .../stm/common-hal/neopixel_write/__init__.c b/...32f4/common-hal/neopixel_write/__init__.c → .../stm/common-hal/neopixel_write/__init__.c
diff --git a/ports/stm32f4/common-hal/os/__init__.c → ports/stm/common-hal/os/__init__.c b/ports/stm32f4/common-hal/os/__init__.c → ports/stm/common-hal/os/__init__.c
diff --git a/ports/stm32f4/common-hal/pulseio/PWMOut.c → ports/stm/common-hal/pulseio/PWMOut.c b/ports/stm32f4/common-hal/pulseio/PWMOut.c → ports/stm/common-hal/pulseio/PWMOut.c
diff --git a/ports/stm32f4/common-hal/pulseio/PWMOut.h → ports/stm/common-hal/pulseio/PWMOut.h b/ports/stm32f4/common-hal/pulseio/PWMOut.h → ports/stm/common-hal/pulseio/PWMOut.h
diff --git a/ports/stm32f4/common-hal/pulseio/PulseIn.c → ports/stm/common-hal/pulseio/PulseIn.c b/ports/stm32f4/common-hal/pulseio/PulseIn.c → ports/stm/common-hal/pulseio/PulseIn.c
diff --git a/ports/stm32f4/common-hal/pulseio/PulseIn.h → ports/stm/common-hal/pulseio/PulseIn.h b/ports/stm32f4/common-hal/pulseio/PulseIn.h → ports/stm/common-hal/pulseio/PulseIn.h
diff --git a/ports/stm32f4/common-hal/pulseio/PulseOut.c → ports/stm/common-hal/pulseio/PulseOut.c b/ports/stm32f4/common-hal/pulseio/PulseOut.c → ports/stm/common-hal/pulseio/PulseOut.c
diff --git a/ports/stm32f4/common-hal/pulseio/PulseOut.h → ports/stm/common-hal/pulseio/PulseOut.h b/ports/stm32f4/common-hal/pulseio/PulseOut.h → ports/stm/common-hal/pulseio/PulseOut.h
diff --git a/ports/stm32f4/common-hal/pulseio/__init__.c → ports/stm/common-hal/pulseio/__init__.c b/ports/stm32f4/common-hal/pulseio/__init__.c → ports/stm/common-hal/pulseio/__init__.c
diff --git a/...s/stm32f4/common-hal/supervisor/Runtime.c → ports/stm/common-hal/supervisor/Runtime.c b/...s/stm32f4/common-hal/supervisor/Runtime.c → ports/stm/common-hal/supervisor/Runtime.c
diff --git a/...s/stm32f4/common-hal/supervisor/Runtime.h → ports/stm/common-hal/supervisor/Runtime.h b/...s/stm32f4/common-hal/supervisor/Runtime.h → ports/stm/common-hal/supervisor/Runtime.h
diff --git a/.../stm32f4/common-hal/supervisor/__init__.c → ports/stm/common-hal/supervisor/__init__.c b/.../stm32f4/common-hal/supervisor/__init__.c → ports/stm/common-hal/supervisor/__init__.c
diff --git a/ports/stm32f4/common-hal/time/__init__.c → ports/stm/common-hal/time/__init__.c b/ports/stm32f4/common-hal/time/__init__.c → ports/stm/common-hal/time/__init__.c
diff --git a/ports/stm32f4/fatfs_port.c → ports/stm/fatfs_port.c b/ports/stm32f4/fatfs_port.c → ports/stm/fatfs_port.c
diff --git a/ports/stm32f4/mpconfigport.h → ports/stm/mpconfigport.h b/ports/stm32f4/mpconfigport.h → ports/stm/mpconfigport.h
diff --git a/ports/stm32f4/mpconfigport.mk → ports/stm/mpconfigport.mk b/ports/stm32f4/mpconfigport.mk → ports/stm/mpconfigport.mk
diff --git a/ports/stm32f4/mphalport.c → ports/stm/mphalport.c b/ports/stm32f4/mphalport.c → ports/stm/mphalport.c
diff --git a/ports/stm32f4/mphalport.h → ports/stm/mphalport.h b/ports/stm32f4/mphalport.h → ports/stm/mphalport.h
diff --git a/ports/stm32f4/peripherals/stm32f4/clocks.h → ports/stm/peripherals/stm32f4/clocks.h b/ports/stm32f4/peripherals/stm32f4/clocks.h → ports/stm/peripherals/stm32f4/clocks.h
diff --git a/ports/stm32f4/peripherals/stm32f4/gpio.h → ports/stm/peripherals/stm32f4/gpio.h b/ports/stm32f4/peripherals/stm32f4/gpio.h → ports/stm/peripherals/stm32f4/gpio.h
diff --git a/ports/stm32f4/peripherals/stm32f4/periph.h → ports/stm/peripherals/stm32f4/periph.h b/ports/stm32f4/peripherals/stm32f4/periph.h → ports/stm/peripherals/stm32f4/periph.h
diff --git a/ports/stm32f4/peripherals/stm32f4/pins.h → ports/stm/peripherals/stm32f4/pins.h b/ports/stm32f4/peripherals/stm32f4/pins.h → ports/stm/peripherals/stm32f4/pins.h
diff --git a/.../peripherals/stm32f4/stm32f401xe/clocks.c → .../peripherals/stm32f4/stm32f401xe/clocks.c b/.../peripherals/stm32f4/stm32f401xe/clocks.c → .../peripherals/stm32f4/stm32f401xe/clocks.c
diff --git a/...f4/peripherals/stm32f4/stm32f401xe/gpio.c → ...tm/peripherals/stm32f4/stm32f401xe/gpio.c b/...f4/peripherals/stm32f4/stm32f401xe/gpio.c → ...tm/peripherals/stm32f4/stm32f401xe/gpio.c
diff --git a/.../peripherals/stm32f4/stm32f401xe/periph.c → .../peripherals/stm32f4/stm32f401xe/periph.c b/.../peripherals/stm32f4/stm32f401xe/periph.c → .../peripherals/stm32f4/stm32f401xe/periph.c
diff --git a/.../peripherals/stm32f4/stm32f401xe/periph.h → .../peripherals/stm32f4/stm32f401xe/periph.h b/.../peripherals/stm32f4/stm32f401xe/periph.h → .../peripherals/stm32f4/stm32f401xe/periph.h
diff --git a/...f4/peripherals/stm32f4/stm32f401xe/pins.c → ...tm/peripherals/stm32f4/stm32f401xe/pins.c b/...f4/peripherals/stm32f4/stm32f401xe/pins.c → ...tm/peripherals/stm32f4/stm32f401xe/pins.c
diff --git a/...f4/peripherals/stm32f4/stm32f401xe/pins.h → ...tm/peripherals/stm32f4/stm32f401xe/pins.h b/...f4/peripherals/stm32f4/stm32f401xe/pins.h → ...tm/peripherals/stm32f4/stm32f401xe/pins.h
diff --git a/.../peripherals/stm32f4/stm32f405xx/clocks.c → .../peripherals/stm32f4/stm32f405xx/clocks.c b/.../peripherals/stm32f4/stm32f405xx/clocks.c → .../peripherals/stm32f4/stm32f405xx/clocks.c
diff --git a/...f4/peripherals/stm32f4/stm32f405xx/gpio.c → ...tm/peripherals/stm32f4/stm32f405xx/gpio.c b/...f4/peripherals/stm32f4/stm32f405xx/gpio.c → ...tm/peripherals/stm32f4/stm32f405xx/gpio.c
diff --git a/.../peripherals/stm32f4/stm32f405xx/periph.c → .../peripherals/stm32f4/stm32f405xx/periph.c b/.../peripherals/stm32f4/stm32f405xx/periph.c → .../peripherals/stm32f4/stm32f405xx/periph.c
diff --git a/.../peripherals/stm32f4/stm32f405xx/periph.h → .../peripherals/stm32f4/stm32f405xx/periph.h b/.../peripherals/stm32f4/stm32f405xx/periph.h → .../peripherals/stm32f4/stm32f405xx/periph.h
diff --git a/...f4/peripherals/stm32f4/stm32f405xx/pins.c → ...tm/peripherals/stm32f4/stm32f405xx/pins.c b/...f4/peripherals/stm32f4/stm32f405xx/pins.c → ...tm/peripherals/stm32f4/stm32f405xx/pins.c
diff --git a/...f4/peripherals/stm32f4/stm32f405xx/pins.h → ...tm/peripherals/stm32f4/stm32f405xx/pins.h b/...f4/peripherals/stm32f4/stm32f405xx/pins.h → ...tm/peripherals/stm32f4/stm32f405xx/pins.h
diff --git a/.../peripherals/stm32f4/stm32f407xx/clocks.c → .../peripherals/stm32f4/stm32f407xx/clocks.c b/.../peripherals/stm32f4/stm32f407xx/clocks.c → .../peripherals/stm32f4/stm32f407xx/clocks.c
diff --git a/...f4/peripherals/stm32f4/stm32f407xx/gpio.c → ...tm/peripherals/stm32f4/stm32f407xx/gpio.c b/...f4/peripherals/stm32f4/stm32f407xx/gpio.c → ...tm/peripherals/stm32f4/stm32f407xx/gpio.c
diff --git a/.../peripherals/stm32f4/stm32f407xx/periph.c → .../peripherals/stm32f4/stm32f407xx/periph.c b/.../peripherals/stm32f4/stm32f407xx/periph.c → .../peripherals/stm32f4/stm32f407xx/periph.c
diff --git a/.../peripherals/stm32f4/stm32f407xx/periph.h → .../peripherals/stm32f4/stm32f407xx/periph.h b/.../peripherals/stm32f4/stm32f407xx/periph.h → .../peripherals/stm32f4/stm32f407xx/periph.h
diff --git a/...f4/peripherals/stm32f4/stm32f407xx/pins.c → ...tm/peripherals/stm32f4/stm32f407xx/pins.c b/...f4/peripherals/stm32f4/stm32f407xx/pins.c → ...tm/peripherals/stm32f4/stm32f407xx/pins.c
diff --git a/...f4/peripherals/stm32f4/stm32f407xx/pins.h → ...tm/peripherals/stm32f4/stm32f407xx/pins.h b/...f4/peripherals/stm32f4/stm32f407xx/pins.h → ...tm/peripherals/stm32f4/stm32f407xx/pins.h
diff --git a/.../peripherals/stm32f4/stm32f411xe/clocks.c → .../peripherals/stm32f4/stm32f411xe/clocks.c b/.../peripherals/stm32f4/stm32f411xe/clocks.c → .../peripherals/stm32f4/stm32f411xe/clocks.c
diff --git a/...f4/peripherals/stm32f4/stm32f411xe/gpio.c → ...tm/peripherals/stm32f4/stm32f411xe/gpio.c b/...f4/peripherals/stm32f4/stm32f411xe/gpio.c → ...tm/peripherals/stm32f4/stm32f411xe/gpio.c
diff --git a/.../peripherals/stm32f4/stm32f411xe/periph.c → .../peripherals/stm32f4/stm32f411xe/periph.c b/.../peripherals/stm32f4/stm32f411xe/periph.c → .../peripherals/stm32f4/stm32f411xe/periph.c
diff --git a/.../peripherals/stm32f4/stm32f411xe/periph.h → .../peripherals/stm32f4/stm32f411xe/periph.h b/.../peripherals/stm32f4/stm32f411xe/periph.h → .../peripherals/stm32f4/stm32f411xe/periph.h
diff --git a/...f4/peripherals/stm32f4/stm32f411xe/pins.c → ...tm/peripherals/stm32f4/stm32f411xe/pins.c b/...f4/peripherals/stm32f4/stm32f411xe/pins.c → ...tm/peripherals/stm32f4/stm32f411xe/pins.c
diff --git a/...f4/peripherals/stm32f4/stm32f411xe/pins.h → ...tm/peripherals/stm32f4/stm32f411xe/pins.h b/...f4/peripherals/stm32f4/stm32f411xe/pins.h → ...tm/peripherals/stm32f4/stm32f411xe/pins.h
diff --git a/.../peripherals/stm32f4/stm32f412zx/clocks.c → .../peripherals/stm32f4/stm32f412zx/clocks.c b/.../peripherals/stm32f4/stm32f412zx/clocks.c → .../peripherals/stm32f4/stm32f412zx/clocks.c
diff --git a/...f4/peripherals/stm32f4/stm32f412zx/gpio.c → ...tm/peripherals/stm32f4/stm32f412zx/gpio.c b/...f4/peripherals/stm32f4/stm32f412zx/gpio.c → ...tm/peripherals/stm32f4/stm32f412zx/gpio.c
diff --git a/.../peripherals/stm32f4/stm32f412zx/periph.c → .../peripherals/stm32f4/stm32f412zx/periph.c b/.../peripherals/stm32f4/stm32f412zx/periph.c → .../peripherals/stm32f4/stm32f412zx/periph.c
diff --git a/.../peripherals/stm32f4/stm32f412zx/periph.h → .../peripherals/stm32f4/stm32f412zx/periph.h b/.../peripherals/stm32f4/stm32f412zx/periph.h → .../peripherals/stm32f4/stm32f412zx/periph.h
diff --git a/...f4/peripherals/stm32f4/stm32f412zx/pins.c → ...tm/peripherals/stm32f4/stm32f412zx/pins.c b/...f4/peripherals/stm32f4/stm32f412zx/pins.c → ...tm/peripherals/stm32f4/stm32f412zx/pins.c
diff --git a/...f4/peripherals/stm32f4/stm32f412zx/pins.h → ...tm/peripherals/stm32f4/stm32f412zx/pins.h b/...f4/peripherals/stm32f4/stm32f412zx/pins.h → ...tm/peripherals/stm32f4/stm32f412zx/pins.h
diff --git a/ports/stm32f4/qstrdefsport.h → ports/stm/qstrdefsport.h b/ports/stm32f4/qstrdefsport.h → ports/stm/qstrdefsport.h
diff --git a/ports/stm32f4/stm32f4 → ports/stm/stm32f4 b/ports/stm32f4/stm32f4 → ports/stm/stm32f4
diff --git a/ports/stm32f4/supervisor/cpu.s → ports/stm/supervisor/cpu.s b/ports/stm32f4/supervisor/cpu.s → ports/stm/supervisor/cpu.s
diff --git a/ports/stm32f4/supervisor/internal_flash.c → ports/stm/supervisor/internal_flash.c b/ports/stm32f4/supervisor/internal_flash.c → ports/stm/supervisor/internal_flash.c
diff --git a/ports/stm32f4/supervisor/internal_flash.h → ports/stm/supervisor/internal_flash.h b/ports/stm32f4/supervisor/internal_flash.h → ports/stm/supervisor/internal_flash.h
diff --git a/...supervisor/internal_flash_root_pointers.h → ...supervisor/internal_flash_root_pointers.h b/...supervisor/internal_flash_root_pointers.h → ...supervisor/internal_flash_root_pointers.h
diff --git a/ports/stm32f4/supervisor/port.c → ports/stm/supervisor/port.c b/ports/stm32f4/supervisor/port.c → ports/stm/supervisor/port.c
diff --git a/ports/stm32f4/supervisor/qspi_flash.c → ports/stm/supervisor/qspi_flash.c b/ports/stm32f4/supervisor/qspi_flash.c → ports/stm/supervisor/qspi_flash.c
diff --git a/ports/stm32f4/supervisor/serial.c → ports/stm/supervisor/serial.c b/ports/stm32f4/supervisor/serial.c → ports/stm/supervisor/serial.c
diff --git a/ports/stm32f4/supervisor/usb.c → ports/stm/supervisor/usb.c b/ports/stm32f4/supervisor/usb.c → ports/stm/supervisor/usb.c
diff --git a/ports/stm32f4/system_stm32f4xx.c → ports/stm/system_stm32f4xx.c b/ports/stm32f4/system_stm32f4xx.c → ports/stm/system_stm32f4xx.c
diff --git a/ports/stm32f4/tick.c → ports/stm/tick.c b/ports/stm32f4/tick.c → ports/stm/tick.c
diff --git a/ports/stm32f4/tick.h → ports/stm/tick.h b/ports/stm32f4/tick.h → ports/stm/tick.h
diff --git a/tools/build_board_info.py b/tools/build_board_info.py
@@ -12,7 +12,7 @@
 sys.path.append("adabot")
 import adabot.github_requests as github
 
-SUPPORTED_PORTS = ["nrf", "atmel-samd", "stm32f4", "cxd56", "mimxrt10xx"]
+SUPPORTED_PORTS = ["nrf", "atmel-samd", "stm", "cxd56", "mimxrt10xx"]
 
 BIN = ('bin',)
 UF2 = ('uf2',)
@@ -29,7 +29,7 @@
 extension_by_port = {
     "nrf": UF2,
     "atmel-samd": UF2,
-    "stm32f4": BIN,
+    "stm": BIN,
     "cxd56": SPK,
     "mimxrt10xx": HEX_UF2,
 }