stmhal: Clean up some header includes.

20 files changed, 8 insertions, 46 deletions

diff --git a/stmhal/boards/LIMIFROG/mpconfigboard.h b/stmhal/boards/LIMIFROG/mpconfigboard.h
index d04634ac38..42b862fcf5 100644
--- a/stmhal/boards/LIMIFROG/mpconfigboard.h
+++ b/stmhal/boards/LIMIFROG/mpconfigboard.h
@@ -1,5 +1,3 @@
-#include STM32_HAL_H
-
 #define MICROPY_HW_BOARD_NAME       "LIMIFROG"
 #define MICROPY_HW_MCU_NAME         "STM32L476"
 
diff --git a/stmhal/boards/NUCLEO_F429ZI/mpconfigboard.h b/stmhal/boards/NUCLEO_F429ZI/mpconfigboard.h
index fcbc382a93..42cc9d68cd 100644
--- a/stmhal/boards/NUCLEO_F429ZI/mpconfigboard.h
+++ b/stmhal/boards/NUCLEO_F429ZI/mpconfigboard.h
@@ -1,5 +1,3 @@
-#include STM32_HAL_H
-
 #define MICROPY_HW_BOARD_NAME       "NUCLEO-F429ZI"
 #define MICROPY_HW_MCU_NAME         "STM32F429"
 
diff --git a/stmhal/boards/STM32F429DISC/mpconfigboard.h b/stmhal/boards/STM32F429DISC/mpconfigboard.h
index a8e379020c..fc07020252 100644
--- a/stmhal/boards/STM32F429DISC/mpconfigboard.h
+++ b/stmhal/boards/STM32F429DISC/mpconfigboard.h
@@ -1,5 +1,3 @@
-#include STM32_HAL_H
-
 #define MICROPY_HW_BOARD_NAME       "F429I-DISCO"
 #define MICROPY_HW_MCU_NAME         "STM32F429"
 
diff --git a/stmhal/boards/STM32L476DISC/mpconfigboard.h b/stmhal/boards/STM32L476DISC/mpconfigboard.h
index 258a86b606..9dbadd5300 100644
--- a/stmhal/boards/STM32L476DISC/mpconfigboard.h
+++ b/stmhal/boards/STM32L476DISC/mpconfigboard.h
@@ -1,5 +1,3 @@
-#include STM32_HAL_H
-
 #define MICROPY_BOARD_EARLY_INIT    STM32L476DISC_board_early_init
 void STM32L476DISC_board_early_init(void);
 
diff --git a/stmhal/dac.c b/stmhal/dac.c
index 1c372f73c4..243aa08c3e 100644
--- a/stmhal/dac.c
+++ b/stmhal/dac.c
@@ -28,9 +28,6 @@
 #include <stdint.h>
 #include <string.h>
 
-#include STM32_HAL_H
-
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "timer.h"
 #include "dac.h"
diff --git a/stmhal/dma.c b/stmhal/dma.c
index 04c874dc27..e43b67e73d 100644
--- a/stmhal/dma.c
+++ b/stmhal/dma.c
@@ -27,10 +27,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
-#include STM32_HAL_H
 
-#include "dma.h"
 #include "py/obj.h"
+#include "dma.h"
 #include "irq.h"
 
 typedef enum {
diff --git a/stmhal/flash.c b/stmhal/flash.c
index 29de8b8daa..e374be0e50 100644
--- a/stmhal/flash.c
+++ b/stmhal/flash.c
@@ -24,11 +24,9 @@
  * THE SOFTWARE.
  */
 
-#include STM32_HAL_H
-
-#include "flash.h"
-#include "mpconfigport.h"
+#include "py/mpconfig.h"
 #include "py/misc.h"
+#include "flash.h"
 
 typedef struct {
     uint32_t base_address;
diff --git a/stmhal/modpyb.c b/stmhal/modpyb.c
index b8da948ab5..7322c6a5ba 100644
--- a/stmhal/modpyb.c
+++ b/stmhal/modpyb.c
@@ -27,8 +27,6 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include STM32_HAL_H
-
 #include "py/mpstate.h"
 #include "py/nlr.h"
 #include "py/obj.h"
diff --git a/stmhal/modstm.c b/stmhal/modstm.c
index 18882fa47a..eabbf08e4a 100644
--- a/stmhal/modstm.c
+++ b/stmhal/modstm.c
@@ -27,15 +27,11 @@
 #include <stdio.h>
 #include <stdint.h>
 
-#include STM32_HAL_H
-
-#include "py/nlr.h"
 #include "py/obj.h"
-#include "extmod/machine_mem.h"
-#include "portmodules.h"
-
 #include "py/objint.h"
+#include "extmod/machine_mem.h"
 #include "genhdr/modstm_mpz.h"
+#include "portmodules.h"
 
 STATIC const mp_rom_map_elem_t stm_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_stm) },
diff --git a/stmhal/modutime.c b/stmhal/modutime.c
index 97af35c491..58c43a55eb 100644
--- a/stmhal/modutime.c
+++ b/stmhal/modutime.c
@@ -26,9 +26,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include STM32_HAL_H
 
-#include "py/nlr.h"
+#include "py/runtime.h"
 #include "py/smallint.h"
 #include "py/obj.h"
 #include "lib/timeutils/timeutils.h"
diff --git a/stmhal/pendsv.c b/stmhal/pendsv.c
index 200d13a5a9..7b3906f250 100644
--- a/stmhal/pendsv.c
+++ b/stmhal/pendsv.c
@@ -25,7 +25,6 @@
  */
 
 #include <stdlib.h>
-#include STM32_HAL_H
 
 #include "py/mpstate.h"
 #include "py/runtime.h"
diff --git a/stmhal/rng.c b/stmhal/rng.c
index 2571bc3a01..a5a9874d1c 100644
--- a/stmhal/rng.c
+++ b/stmhal/rng.c
@@ -26,8 +26,6 @@
 
 #include <string.h>
 
-#include STM32_HAL_H
-
 #include "py/obj.h"
 #include "rng.h"
 
diff --git a/stmhal/rtc.c b/stmhal/rtc.c
index bc9c889c26..755684570d 100644
--- a/stmhal/rtc.c
+++ b/stmhal/rtc.c
@@ -26,12 +26,9 @@
 
 #include <stdio.h>
 
-#include STM32_HAL_H
-
 #include "py/runtime.h"
 #include "rtc.h"
 #include "irq.h"
-#include "mphalport.h"
 
 /// \moduleref pyb
 /// \class RTC - real time clock
diff --git a/stmhal/servo.c b/stmhal/servo.c
index 1f1aa5a2d2..6ea6938ada 100644
--- a/stmhal/servo.c
+++ b/stmhal/servo.c
@@ -26,8 +26,6 @@
 
 #include <stdio.h>
 
-#include STM32_HAL_H
-
 #include "py/nlr.h"
 #include "py/runtime.h"
 #include "timer.h"
diff --git a/stmhal/stm32_it.c b/stmhal/stm32_it.c
index 913f1c9315..357b6d79d7 100644
--- a/stmhal/stm32_it.c
+++ b/stmhal/stm32_it.c
@@ -67,12 +67,10 @@
 
 #include <stdio.h>
 
-#include "stm32_it.h"
-#include STM32_HAL_H
-
 #include "py/mpstate.h"
 #include "py/obj.h"
 #include "py/mphal.h"
+#include "stm32_it.h"
 #include "pendsv.h"
 #include "irq.h"
 #include "pybthread.h"
diff --git a/stmhal/system_stm32.c b/stmhal/system_stm32.c
index 266b8a92a5..a63bd3c570 100644
--- a/stmhal/system_stm32.c
+++ b/stmhal/system_stm32.c
@@ -87,8 +87,7 @@
   * @{
   */
 
-#include "mpconfigboard.h"
-#include STM32_HAL_H
+#include "py/mphal.h"
 
 void __fatal_error(const char *msg);
 
diff --git a/stmhal/timer.c b/stmhal/timer.c
index 64d445111a..7db15f6492 100644
--- a/stmhal/timer.c
+++ b/stmhal/timer.c
@@ -28,11 +28,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include STM32_HAL_H
 #include "usbd_cdc_msc_hid.h"
 #include "usbd_cdc_interface.h"
 
-#include "py/nlr.h"
 #include "py/runtime.h"
 #include "py/gc.h"
 #include "timer.h"
diff --git a/stmhal/usbd_conf.c b/stmhal/usbd_conf.c
index 1da987d89a..e2bd6c949f 100644
--- a/stmhal/usbd_conf.c
+++ b/stmhal/usbd_conf.c
@@ -30,7 +30,6 @@
   */

 

 /* Includes ------------------------------------------------------------------*/

-#include STM32_HAL_H

 #include "usbd_core.h"

 #include "py/obj.h"

 #include "irq.h"

diff --git a/stmhal/usbd_conf.h b/stmhal/usbd_conf.h
index 5415eb10b4..b69ba52c2f 100644
--- a/stmhal/usbd_conf.h
+++ b/stmhal/usbd_conf.h
@@ -34,7 +34,6 @@
 #define __USBD_CONF_H

 

 /* Includes ------------------------------------------------------------------*/

-#include STM32_HAL_H

 #include <stdio.h>

 #include <stdlib.h>

 #include <string.h>

diff --git a/stmhal/wdt.c b/stmhal/wdt.c
index 272c575ef5..2b4967a434 100644
--- a/stmhal/wdt.c
+++ b/stmhal/wdt.c
@@ -26,8 +26,6 @@
 
 #include <stdio.h>
 
-#include STM32_HAL_H
-
 #include "py/runtime.h"
 #include "wdt.h"