Skip to content

Commit 87835c7

Browse files
jeplerjepler
authored
Merge pull request #3038 from jepler/compute-usb-devices
Compute USB_DEVICES instead of requiring it to be specified
2 parents 741e1d9 + bf460dd commit 87835c7

File tree

28 files changed

+64
-76
lines changed

28 files changed

+64
-76
lines changed

‎ports/atmel-samd/boards/8086_commander/mpconfigboard.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ USB_PID = 0x0101
33
USB_PRODUCT = "Commander"
44
USB_MANUFACTURER = "8086 Consultancy"
55

6-
USB_DEVICES= "CDC,MSC,HID"
7-
86
CHIP_VARIANT = SAMD21G18A
97
CHIP_FAMILY = samd21
108

@@ -14,6 +12,7 @@ EXTERNAL_FLASH_DEVICES = "W25Q128JV_SQ"
1412

1513
LONGINT_IMPL = NONE
1614
CIRCUITPY_FULL_BUILD = 0
15+
CIRCUITPY_USB_MIDI = 0
1716

1817
SUPEROPT_GC = 0
1918

‎ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ CIRCUITPY_MATH = 1
4646
FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pewpew_m4
4747
CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf
4848

49-
USB_DEVICES = "CDC,MSC"
50-
5149
# Tweak inlining depending on language.
5250
ifeq ($(TRANSLATION), zh_Latn_pinyin)
5351
CFLAGS_INLINE_LIMIT = 45

‎ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ USB_VID = 0x239A
44
USB_PID = 0x6005
55
USB_PRODUCT = "Big Honking Button"
66
USB_MANUFACTURER = "Winterbloom"
7-
USB_DEVICES = "CDC,MSC"
87

98
CHIP_VARIANT = SAMD21G18A
109
CHIP_FAMILY = samd21
@@ -31,4 +30,5 @@ CIRCUITPY_TOUCHIO = 0
3130
CIRCUITPY_RGBMATRIX = 0
3231
CIRCUITPY_PS2IO = 0
3332
CIRCUITPY_USB_HID = 0
33+
CIRCUITPY_USB_MIDI = 0
3434
CIRCUITPY_RTC = 0

‎ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ USB_PID = 0x8062
66
USB_PRODUCT = "Sol"
77
USB_MANUFACTURER = "Winterbloom"
88
USB_INTERFACE_NAME = "Sol"
9-
USB_DEVICES = "CDC,MSC,AUDIO"
109

1110
CHIP_VARIANT = SAMD51J20A
1211
CHIP_FAMILY = samd51

‎ports/cxd56/mpconfigport.mk

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
USB_SERIAL_NUMBER_LENGTH = 10
2-
USB_DEVICES = "CDC,MSC"
32
USB_MSC_MAX_PACKET_SIZE = 512
43
USB_RENUMBER_ENDPOINTS = 0
54
USB_CDC_EP_NUM_NOTIFICATION = 3
@@ -8,15 +7,17 @@ USB_CDC_EP_NUM_DATA_IN = 1
87
USB_MSC_EP_NUM_OUT = 5
98
USB_MSC_EP_NUM_IN = 4
109

11-
CIRCUITPY_AUDIOIO = 0
1210
CIRCUITPY_AUDIOBUSIO = 0
13-
CIRCUITPY_I2CSLAVE = 0
14-
CIRCUITPY_ROTARYIO = 0
15-
CIRCUITPY_TOUCHIO = 0
11+
CIRCUITPY_AUDIOIO = 0
12+
CIRCUITPY_COUNTIO = 0
13+
CIRCUITPY_DISPLAYIO = 0
14+
CIRCUITPY_FREQUENCYIO = 0
1615
CIRCUITPY_GAMEPAD = 0
16+
CIRCUITPY_I2CSLAVE = 0
1717
CIRCUITPY_NEOPIXEL_WRITE = 0
1818
CIRCUITPY_NVM = 0
19-
CIRCUITPY_DISPLAYIO = 0
20-
CIRCUITPY_FREQUENCYIO = 0
21-
CIRCUITPY_COUNTIO = 0
19+
CIRCUITPY_ROTARYIO = 0
20+
CIRCUITPY_TOUCHIO = 0
21+
CIRCUITPY_USB_HID = 0
22+
CIRCUITPY_USB_MIDI = 0
2223
INTERNAL_LIBM = 1

‎ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x80A8
33
USB_PRODUCT = "Saola 1 w/WROOM"
44
USB_MANUFACTURER = "Espressif"
5-
USB_DEVICES = "CDC,MSC,HID"
65

76
INTERNAL_FLASH_FILESYSTEM = 1
87
LONGINT_IMPL = MPZ

‎ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x80A6
33
USB_PRODUCT = "Saola 1 w/WROVER"
44
USB_MANUFACTURER = "Espressif"
5-
USB_DEVICES = "CDC,MSC,HID"
65

76
INTERNAL_FLASH_FILESYSTEM = 1
87
LONGINT_IMPL = MPZ

‎ports/esp32s2/mpconfigport.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ CIRCUITPY_ROTARYIO = 0
3030
CIRCUITPY_RTC = 0
3131
CIRCUITPY_TOUCHIO = 0
3232

33-
# Enable USB support
33+
# Enable USB HID support
3434
CIRCUITPY_USB_HID = 1
35-
CIRCUITPY_USB_MIDI = 1
35+
CIRCUITPY_USB_MIDI = 0
3636

3737
CIRCUITPY_MODULE ?= none

‎ports/litex/boards/fomu/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x1209
22
USB_PID = 0x5BF0
33
USB_PRODUCT = "Fomu"
44
USB_MANUFACTURER = "Foosn"
5-
USB_DEVICES = "CDC,MSC,AUDIO,HID"
65

76
INTERNAL_FLASH_FILESYSTEM = 1
87
LONGINT_IMPL = MPZ

‎ports/mimxrt10xx/mpconfigport.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ endif
1414

1515
INTERNAL_LIBM = 1
1616

17-
USB_DEVICES = "CDC,MSC,HID"
1817
USB_SERIAL_NUMBER_LENGTH = 32
1918
USB_MSC_MAX_PACKET_SIZE = 512
2019

@@ -27,4 +26,5 @@ CIRCUITPY_I2CSLAVE = 0
2726
CIRCUITPY_NVM = 0
2827
CIRCUITPY_ROTARYIO = 0
2928
CIRCUITPY_COUNTIO = 0
29+
CIRCUITPY_USB_MIDI = 0
3030
LONGINT_IMPL = MPZ

‎ports/stm/boards/espruino_pico/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x808E
33
USB_PRODUCT = "Espruino Pico"
44
USB_MANUFACTURER = "Espruino"
5-
USB_DEVICES = "CDC,MSC"
65

76
INTERNAL_FLASH_FILESYSTEM = 1
87

‎ports/stm/boards/espruino_wifi/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x8090
33
USB_PRODUCT = "Espruino Wifi"
44
USB_MANUFACTURER = "Espruino"
5-
USB_DEVICES = "CDC,MSC"
65

76
INTERNAL_FLASH_FILESYSTEM = 1
87

‎ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x805A
33
USB_PRODUCT = "Feather STM32F405 Express"
44
USB_MANUFACTURER = "Adafruit Industries LLC"
5-
USB_DEVICES = "CDC,MSC"
65

76
SPI_FLASH_FILESYSTEM = 1
87
EXTERNAL_FLASH_DEVICE_COUNT = 1

‎ports/stm/boards/meowbit_v121/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x805A
33
USB_PRODUCT = "Meowbit"
44
USB_MANUFACTURER = "Kittenbot"
5-
USB_DEVICES = "CDC,MSC"
65

76
SPI_FLASH_FILESYSTEM = 1
87
EXTERNAL_FLASH_DEVICE_COUNT = 1

‎ports/stm/boards/nucleo_f746zg/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x809E
33
USB_PRODUCT = "Nucleo F746zg - CPy"
44
USB_MANUFACTURER = "STMicroelectronics"
5-
USB_DEVICES = "CDC,MSC"
65

76
INTERNAL_FLASH_FILESYSTEM = 1
87

‎ports/stm/boards/nucleo_f767zi/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x809A
33
USB_PRODUCT = "Nucleo F767ZI - CPy"
44
USB_MANUFACTURER = "STMicroelectronics"
5-
USB_DEVICES = "CDC,MSC"
65

76
INTERNAL_FLASH_FILESYSTEM = 1
87

‎ports/stm/boards/nucleo_h743zi_2/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x8098
33
USB_PRODUCT = "Nucleo H743ZI - CPy"
44
USB_MANUFACTURER = "STMicroelectronics"
5-
USB_DEVICES = "CDC,MSC"
65

76
INTERNAL_FLASH_FILESYSTEM = 1
87

‎ports/stm/boards/openmv_h7/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x80A4
33
USB_PRODUCT = "OpenMV-H7 R1"
44
USB_MANUFACTURER = "OpenMV, LLC"
5-
USB_DEVICES = "CDC,MSC"
65

76
INTERNAL_FLASH_FILESYSTEM = 1
87

‎ports/stm/boards/pyb_nano_v2/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x8068
33
USB_PRODUCT = "PYB LR Nano V2"
44
USB_MANUFACTURER = "MicroPython Chinese Community"
5-
USB_DEVICES = "CDC,MSC"
65

76
SPI_FLASH_FILESYSTEM = 1
87
EXTERNAL_FLASH_DEVICE_COUNT = 1

‎ports/stm/boards/pyboard_v11/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x805C
33
USB_PRODUCT = "Pyboard Version 1.1"
44
USB_MANUFACTURER = "George Robotic"
5-
USB_DEVICES = "CDC,MSC"
65

76
INTERNAL_FLASH_FILESYSTEM = 1
87

‎ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x806A
33
USB_PRODUCT = "stm32f411ce blackpill"
44
USB_MANUFACTURER = "Unknown"
5-
USB_DEVICES = "CDC,MSC"
65

76
# SPI_FLASH_FILESYSTEM = 1
87
# EXTERNAL_FLASH_DEVICE_COUNT = 1

‎ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x805E
33
USB_PRODUCT = "STM32F411VE Discovery Board - CPy"
44
USB_MANUFACTURER = "STMicroelectronics"
5-
USB_DEVICES = "CDC,MSC"
65

76
INTERNAL_FLASH_FILESYSTEM = 1
87

‎ports/stm/boards/stm32f412zg_discovery/mpconfigboard.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x8056
33
USB_PRODUCT = "STM32F412ZG Discovery Board - CPy"
44
USB_MANUFACTURER = "STMicroelectronics"
5-
USB_DEVICES = "CDC,MSC,HID"
65

76
INTERNAL_FLASH_FILESYSTEM = 1
87

@@ -17,3 +16,5 @@ MCU_PACKAGE = LQFP144
1716

1817
LD_COMMON = boards/common_default.ld
1918
LD_FILE = boards/STM32F412_fs.ld
19+
20+
CIRCUITPY_USB_HID = 1

‎ports/stm/boards/stm32f4_discovery/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x808A
33
USB_PRODUCT = "STM32F407VG Discovery Board - CPy"
44
USB_MANUFACTURER = "STMicroelectronics"
5-
USB_DEVICES = "CDC,MSC"
65

76
INTERNAL_FLASH_FILESYSTEM = 1
87

‎ports/stm/boards/stm32f746g_discovery/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x809C
33
USB_PRODUCT = "ST STM32F746G Discovery - CPy"
44
USB_MANUFACTURER = "STMicroelectronics"
5-
USB_DEVICES = "CDC,MSC"
65

76
INTERNAL_FLASH_FILESYSTEM = 1
87

‎ports/stm/boards/thunderpack/mpconfigboard.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ USB_VID = 0x239A
22
USB_PID = 0x806A
33
USB_PRODUCT = "Thunderpack STM32F411"
44
USB_MANUFACTURER = "Jeremy Gillick"
5-
USB_DEVICES = "CDC,MSC"
65

76
INTERNAL_FLASH_FILESYSTEM = 1
87
LONGINT_IMPL = NONE

‎ports/stm/mpconfigport.mk

Lines changed: 41 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,56 @@
1-
MPY_TOOL_LONGINT_IMPL = -mlongint-impl=mpz
2-
LONGINT_IMPL = MPZ
3-
INTERNAL_LIBM = 1
4-
USB_SERIAL_NUMBER_LENGTH = 24
1+
MPY_TOOL_LONGINT_IMPL ?= -mlongint-impl=mpz
2+
LONGINT_IMPL ?= MPZ
3+
INTERNAL_LIBM ?= 1
4+
USB_SERIAL_NUMBER_LENGTH ?= 24
55

66
ifeq ($(MCU_VARIANT),STM32F405xx)
7-
CIRCUITPY_FRAMEBUFFERIO = 1
8-
CIRCUITPY_RGBMATRIX = 1
7+
CIRCUITPY_FRAMEBUFFERIO ?= 1
8+
CIRCUITPY_RGBMATRIX ?= 1
99
endif
1010

1111
ifeq ($(MCU_SERIES),F4)
1212
# Not yet implemented common-hal modules:
13-
CIRCUITPY_AUDIOBUSIO = 0
14-
CIRCUITPY_AUDIOIO = 0
15-
CIRCUITPY_ROTARYIO = 0
16-
CIRCUITPY_COUNTIO = 0
17-
CIRCUITPY_RTC = 0
18-
CIRCUITPY_FREQUENCYIO = 0
19-
CIRCUITPY_I2CSLAVE = 0
20-
# Can be overridden on board level
21-
ifndef CIRCUITPY_NVM
22-
CIRCUITPY_NVM = 0
23-
endif
13+
CIRCUITPY_AUDIOBUSIO ?= 0
14+
CIRCUITPY_AUDIOIO ?= 0
15+
CIRCUITPY_COUNTIO ?= 0
16+
CIRCUITPY_FREQUENCYIO ?= 0
17+
CIRCUITPY_I2CSLAVE ?= 0
18+
CIRCUITPY_NVM ?= 0
19+
CIRCUITPY_ROTARYIO ?= 0
20+
CIRCUITPY_RTC ?= 0
21+
CIRCUITPY_USB_MIDI ?= 0
22+
CIRCUITPY_USB_HID ?= 0
2423
endif
2524

2625
ifeq ($(MCU_SERIES),H7)
2726
# Not yet implemented common-hal modules:
28-
CIRCUITPY_ANALOGIO = 0
29-
CIRCUITPY_NEOPIXEL_WRITE = 0
30-
CIRCUITPY_PULSEIO = 0
31-
CIRCUITPY_NVM = 0
32-
CIRCUITPY_AUDIOBUSIO = 0
33-
CIRCUITPY_AUDIOIO = 0
34-
CIRCUITPY_COUNTIO = 0
35-
CIRCUITPY_ROTARYIO = 0
36-
CIRCUITPY_RTC = 0
37-
CIRCUITPY_FREQUENCYIO = 0
38-
CIRCUITPY_I2CSLAVE = 0
27+
CIRCUITPY_ANALOGIO ?= 0
28+
CIRCUITPY_AUDIOBUSIO ?= 0
29+
CIRCUITPY_AUDIOIO ?= 0
30+
CIRCUITPY_COUNTIO ?= 0
31+
CIRCUITPY_FREQUENCYIO ?= 0
32+
CIRCUITPY_I2CSLAVE ?= 0
33+
CIRCUITPY_NEOPIXEL_WRITE ?= 0
34+
CIRCUITPY_NVM ?= 0
35+
CIRCUITPY_PULSEIO ?= 0
36+
CIRCUITPY_ROTARYIO ?= 0
37+
CIRCUITPY_RTC ?= 0
38+
CIRCUITPY_USB_HID ?= 0
39+
CIRCUITPY_USB_MIDI ?= 0
3940
endif
4041

4142
ifeq ($(MCU_SERIES),F7)
4243
# Not yet implemented common-hal modules:
43-
CIRCUITPY_ANALOGIO = 0
44-
CIRCUITPY_NEOPIXEL_WRITE = 0
45-
CIRCUITPY_NVM = 0
46-
CIRCUITPY_AUDIOBUSIO = 0
47-
CIRCUITPY_AUDIOIO = 0
48-
CIRCUITPY_ROTARYIO = 0
49-
CIRCUITPY_COUNTIO = 0
50-
CIRCUITPY_RTC = 0
51-
CIRCUITPY_FREQUENCYIO = 0
52-
CIRCUITPY_I2CSLAVE = 0
44+
CIRCUITPY_ANALOGIO ?= 0
45+
CIRCUITPY_AUDIOBUSIO ?= 0
46+
CIRCUITPY_AUDIOIO ?= 0
47+
CIRCUITPY_COUNTIO ?= 0
48+
CIRCUITPY_FREQUENCYIO ?= 0
49+
CIRCUITPY_I2CSLAVE ?= 0
50+
CIRCUITPY_NEOPIXEL_WRITE ?= 0
51+
CIRCUITPY_NVM ?= 0
52+
CIRCUITPY_ROTARYIO ?= 0
53+
CIRCUITPY_RTC ?= 0
54+
CIRCUITPY_USB_HID ?= 0
55+
CIRCUITPY_USB_MIDI ?= 0
5356
endif

‎supervisor/supervisor.mk

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,14 @@ ifndef USB_INTERFACE_NAME
115115
USB_INTERFACE_NAME = "CircuitPython"
116116
endif
117117

118-
ifndef USB_DEVICES
119-
USB_DEVICES = "CDC,MSC,AUDIO,HID"
118+
USB_DEVICES_COMPUTED := CDC,MSC
119+
ifeq ($(CIRCUITPY_USB_MIDI),1)
120+
USB_DEVICES_COMPUTED := $(USB_DEVICES_COMPUTED),AUDIO
120121
endif
122+
ifeq ($(CIRCUITPY_USB_HID),1)
123+
USB_DEVICES_COMPUTED := $(USB_DEVICES_COMPUTED),HID
124+
endif
125+
USB_DEVICES ?= "$(USB_DEVICES_COMPUTED)"
121126

122127
ifndef USB_HID_DEVICES
123128
USB_HID_DEVICES = "KEYBOARD,MOUSE,CONSUMER,GAMEPAD"

0 commit comments

Comments
 (0)