From 3fc7c8e35c24942f1b44eb99e0aba9cf77ab984c Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Fri, 31 May 2019 21:39:34 +1000
Subject: [PATCH] stm32/usb: Include py/mpconfig.h instead of mpconfigboard.h.

Because py/mpconfig.h has header include guards.
---
 ports/stm32/usbd_desc.c                         | 2 +-
 ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ports/stm32/usbd_desc.c b/ports/stm32/usbd_desc.c
index a7de71ef2..d28f9aec6 100644
--- a/ports/stm32/usbd_desc.c
+++ b/ports/stm32/usbd_desc.c
@@ -37,7 +37,7 @@
 #include "py/mphal.h"
 
 // need this header for any overrides to the below constants
-#include "mpconfigboard.h"
+#include "py/mpconfig.h"
 
 #ifndef USBD_LANGID_STRING
 #define USBD_LANGID_STRING            0x409
diff --git a/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h b/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h
index d4a218a4a..d46f763d1 100644
--- a/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h
+++ b/ports/stm32/usbdev/class/inc/usbd_cdc_msc_hid.h
@@ -7,8 +7,7 @@
 #include  "usbd_ioreq.h"
 
 // These are included to get direct access the MICROPY_HW_USB_xxx config
-#include "mpconfigboard.h"
-#include "mpconfigboard_common.h"
+#include "py/mpconfig.h"
 
 // Work out if we should support USB high-speed device mode
 #if MICROPY_HW_USB_HS \
-- 
GitLab