Requested changes, general cleanup

Author: hierophect

.gitmodules

@@ -77,7 +77,6 @@
 	path = lib/tinyusb
 	url = https://github.com/hathach/tinyusb.git
 	branch = develop
-	ignore = dirty
 [submodule "tools/huffman"]
 	path = tools/huffman
 	url = https://github.com/tannewt/huffman.git
@@ -98,4 +97,4 @@
 	url = https://github.com/python-ugame/circuitpython-stage.git
 [submodule "ports/stm32f4/stm32f4"]
 	path = ports/stm32f4/stm32f4
-	url = https://github.com/hierophect/stm32f4.git
+	url = https://github.com/adafruit/stm32f4.git

main.c

@@ -190,7 +190,9 @@ void cleanup_after_vm(supervisor_allocation* heap) {
     supervisor_move_memory();
 
     reset_port();
+    #if CIRCUITPY_BOARD
     reset_board_busses();
+    #endif
     reset_board();
     reset_status_led();
 }

ports/stm32f4/Makefile

@@ -40,6 +40,7 @@ include ../../py/mkenv.mk
 include boards/$(BOARD)/mpconfigboard.mk
 # Port-specific
 include mpconfigport.mk
+
 # CircuitPython-specific
 include $(TOP)/py/circuitpy_mpconfig.mk
 
@@ -99,9 +100,6 @@ ifeq ($(MCU_SUB_VARIANT), stm32f411xe)
 C_DEFS =  \
 	-DUSE_HAL_DRIVER \
 	-DSTM32F411xE
-CIRCUITPY_BOARD = 0
-CIRCUITPY_DIGITALIO = 0
-CIRCUITPY_MICROCONTROLLER = 0
 endif
 
 #TODO: Add ASM Flags? -Werror
@@ -185,7 +183,8 @@ SRC_C += \
 	mphalport.c \
 	tick.c \
 	boards/$(BOARD)/board.c \
-	boards/$(BOARD)/pins.c \
+	peripherals/stm32f4/$(MCU_SUB_VARIANT)/clocks.c \
+	peripherals/stm32f4/$(MCU_SUB_VARIANT)/gpio.c \
 	lib/libc/string0.c \
 	lib/mp-readline/readline.c \
 	lib/oofatfs/ff.c \
@@ -204,7 +203,8 @@ SRC_C += lib/tinyusb/src/portable/st/stm32f4/dcd_stm32f4.c
 endif
 
 ifeq ($(MCU_SUB_VARIANT), stm32f412zx)
-SRC_C += peripherals/stm32f4/stm32f412zg/pins.c
+SRC_C += peripherals/stm32f4/stm32f412zx/pins.c
+SRC_C += boards/$(BOARD)/pins.c
 endif
 
 SRC_S = \

ports/stm32f4/background.h

@@ -32,4 +32,4 @@
 void background_tasks_reset(void);
 void run_background_tasks(void);
 
-#endif  // MICROPY_INCLUDED_NRF_BACKGROUND_H
+#endif  // MICROPY_INCLUDED_STM32F4_BACKGROUND_H