fix some builds

2021-02-18 14:24:58 -05:00 · 2021-02-18 14:24:58 -05:00 · e344c6d684
commit e344c6d684
parent 5c37b73c6d
5 changed files with 4 additions and 4 deletions
--- a/ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/sparkfun_samd21_mini/mpconfigboard.mk
@ -11,3 +11,4 @@ LONGINT_IMPL = NONE
 CIRCUITPY_FULL_BUILD = 0

 SUPEROPT_GC = 0
+SUPEROPT_VM = 0
--- a/ports/cxd56/mpconfigport.mk
+++ b/ports/cxd56/mpconfigport.mk
@ -8,7 +8,7 @@ USB_MSC_EP_NUM_OUT = 5
 USB_MSC_EP_NUM_IN = 4

 # Number of USB endpoint pairs.
-USB_NUM_EP = 5
+USB_NUM_EP = 6

 MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz

--- a/ports/nrf/boards/pca10100/mpconfigboard.mk
+++ b/ports/nrf/boards/pca10100/mpconfigboard.mk
@ -29,6 +29,7 @@ CIRCUITPY_BUSDEVICE = 0
 MICROPY_PY_ASYNC_AWAIT = 0

 SUPEROPT_GC = 0
+SUPEROPT_VM = 0

 # Override optimization to keep binary small
 OPTIMIZATION_FLAGS = -Os
--- a/ports/stm/boards/stm32f412zg_discovery/mpconfigboard.mk
+++ b/ports/stm/boards/stm32f412zg_discovery/mpconfigboard.mk
@ -16,5 +16,3 @@ MCU_PACKAGE = LQFP144

 LD_COMMON = boards/common_default.ld
 LD_FILE = boards/STM32F412_fs.ld
-
-CIRCUITPY_USB_HID = 1
--- a/supervisor/shared/usb/usb.c
+++ b/supervisor/shared/usb/usb.c
@ -219,7 +219,7 @@ bool tud_vendor_control_xfer_cb(uint8_t rhport, uint8_t stage, tusb_control_requ

  return true;
 }
-#endif CIRCUITPY_USB_VENDOR
+#endif // CIRCUITPY_USB_VENDOR


 #if MICROPY_KBD_EXCEPTION