djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

supervisor.mk: Compute USB_DEVICES; remove from boards and ports

Browse Source 
Since Actions passed on the previous commit, where this computed value
was checked against the specified value (if any), this is no net change,
except that we no longer need to specify it for particular boards or
ports.
This commit is contained in:
Jeff Epler 2020-06-15 19:12:04 -05:00 committed by Jeff Epler
parent 93d3629da2
commit f232aef786
29 changed files with 1 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/atmel-samd/boards/8086_commander/mpconfigboard.mk
View File

@ -3,8 +3,6 @@ USB_PID = 0x0101
USB_PRODUCT = "Commander" USB_PRODUCT = "Commander"
USB_MANUFACTURER = "8086 Consultancy" USB_MANUFACTURER = "8086 Consultancy"
USB_DEVICES= "CDC,MSC,HID"
CHIP_VARIANT = SAMD21G18A CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21 CHIP_FAMILY = samd21

2
ports/atmel-samd/boards/pewpew10/mpconfigboard.mk
View File

@ -24,5 +24,3 @@ SUPEROPT_GC = 0
FROZEN_MPY_DIRS += $(TOP)/frozen/pew-pewpew-standalone-10.x FROZEN_MPY_DIRS += $(TOP)/frozen/pew-pewpew-standalone-10.x
CFLAGS_BOARD = --param max-inline-insns-auto=15 CFLAGS_BOARD = --param max-inline-insns-auto=15
USB_DEVICES="CDC,MSC,HID"

2
ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
View File

@ -46,8 +46,6 @@ CIRCUITPY_MATH = 1
FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pewpew_m4 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pewpew_m4
CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf
USB_DEVICES = "CDC,MSC"
# Tweak inlining depending on language. # Tweak inlining depending on language.
ifeq ($(TRANSLATION), zh_Latn_pinyin) ifeq ($(TRANSLATION), zh_Latn_pinyin)
CFLAGS_INLINE_LIMIT = 45 CFLAGS_INLINE_LIMIT = 45

2
ports/atmel-samd/boards/ugame10/mpconfigboard.mk
View File

@ -39,5 +39,3 @@ CFLAGS_INLINE_LIMIT = 45
else else
CFLAGS_INLINE_LIMIT = 70 CFLAGS_INLINE_LIMIT = 70
endif endif
USB_DEVICES="CDC,MSC"

1
ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk
View File

@ -4,7 +4,6 @@ USB_VID = 0x239A
USB_PID = 0x6005 USB_PID = 0x6005
USB_PRODUCT = "Big Honking Button" USB_PRODUCT = "Big Honking Button"
USB_MANUFACTURER = "Winterbloom" USB_MANUFACTURER = "Winterbloom"
USB_DEVICES = "CDC,MSC"
CHIP_VARIANT = SAMD21G18A CHIP_VARIANT = SAMD21G18A
CHIP_FAMILY = samd21 CHIP_FAMILY = samd21

1
ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
View File

@ -6,7 +6,6 @@ USB_PID = 0x8062
USB_PRODUCT = "Sol" USB_PRODUCT = "Sol"
USB_MANUFACTURER = "Winterbloom" USB_MANUFACTURER = "Winterbloom"
USB_INTERFACE_NAME = "Sol" USB_INTERFACE_NAME = "Sol"
USB_DEVICES = "CDC,MSC,AUDIO"
CHIP_VARIANT = SAMD51J20A CHIP_VARIANT = SAMD51J20A
CHIP_FAMILY = samd51 CHIP_FAMILY = samd51

2
ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk
View File

@ -28,5 +28,3 @@ CIRCUITPY_COUNTIO=0
# Include these Python libraries in firmware. # Include these Python libraries in firmware.
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
USB_DEVICES="CDC,MSC,HID"

1
ports/cxd56/mpconfigport.mk
View File

@ -1,5 +1,4 @@
USB_SERIAL_NUMBER_LENGTH = 10 USB_SERIAL_NUMBER_LENGTH = 10
USB_DEVICES = "CDC,MSC"
USB_MSC_MAX_PACKET_SIZE = 512 USB_MSC_MAX_PACKET_SIZE = 512
USB_RENUMBER_ENDPOINTS = 0 USB_RENUMBER_ENDPOINTS = 0
USB_CDC_EP_NUM_NOTIFICATION = 3 USB_CDC_EP_NUM_NOTIFICATION = 3

1
ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x80A8 USB_PID = 0x80A8
USB_PRODUCT = "Saola 1 w/WROOM" USB_PRODUCT = "Saola 1 w/WROOM"
USB_MANUFACTURER = "Espressif" USB_MANUFACTURER = "Espressif"
USB_DEVICES = "CDC,MSC,HID"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ

1
ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x80A6 USB_PID = 0x80A6
USB_PRODUCT = "Saola 1 w/WROVER" USB_PRODUCT = "Saola 1 w/WROVER"
USB_MANUFACTURER = "Espressif" USB_MANUFACTURER = "Espressif"
USB_DEVICES = "CDC,MSC,HID"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ

1
ports/litex/boards/fomu/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x1209
USB_PID = 0x5BF0 USB_PID = 0x5BF0
USB_PRODUCT = "Fomu" USB_PRODUCT = "Fomu"
USB_MANUFACTURER = "Foosn" USB_MANUFACTURER = "Foosn"
USB_DEVICES = "CDC,MSC,AUDIO,HID"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = MPZ LONGINT_IMPL = MPZ

1
ports/mimxrt10xx/mpconfigport.mk
View File

@ -14,7 +14,6 @@ endif
INTERNAL_LIBM = 1 INTERNAL_LIBM = 1
USB_DEVICES = "CDC,MSC,HID"
USB_SERIAL_NUMBER_LENGTH = 32 USB_SERIAL_NUMBER_LENGTH = 32
USB_MSC_MAX_PACKET_SIZE = 512 USB_MSC_MAX_PACKET_SIZE = 512

1
ports/stm/boards/espruino_pico/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x808E USB_PID = 0x808E
USB_PRODUCT = "Espruino Pico" USB_PRODUCT = "Espruino Pico"
USB_MANUFACTURER = "Espruino" USB_MANUFACTURER = "Espruino"
USB_DEVICES = "CDC,MSC"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1

1
ports/stm/boards/espruino_wifi/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x8090 USB_PID = 0x8090
USB_PRODUCT = "Espruino Wifi" USB_PRODUCT = "Espruino Wifi"
USB_MANUFACTURER = "Espruino" USB_MANUFACTURER = "Espruino"
USB_DEVICES = "CDC,MSC"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1

1
ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x805A USB_PID = 0x805A
USB_PRODUCT = "Feather STM32F405 Express" USB_PRODUCT = "Feather STM32F405 Express"
USB_MANUFACTURER = "Adafruit Industries LLC" USB_MANUFACTURER = "Adafruit Industries LLC"
USB_DEVICES = "CDC,MSC"
SPI_FLASH_FILESYSTEM = 1 SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICE_COUNT = 1 EXTERNAL_FLASH_DEVICE_COUNT = 1

1
ports/stm/boards/meowbit_v121/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x805A USB_PID = 0x805A
USB_PRODUCT = "Meowbit" USB_PRODUCT = "Meowbit"
USB_MANUFACTURER = "Kittenbot" USB_MANUFACTURER = "Kittenbot"
USB_DEVICES = "CDC,MSC"
SPI_FLASH_FILESYSTEM = 1 SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICE_COUNT = 1 EXTERNAL_FLASH_DEVICE_COUNT = 1

1
ports/stm/boards/nucleo_f746zg/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x809E USB_PID = 0x809E
USB_PRODUCT = "Nucleo F746zg - CPy" USB_PRODUCT = "Nucleo F746zg - CPy"
USB_MANUFACTURER = "STMicroelectronics" USB_MANUFACTURER = "STMicroelectronics"
USB_DEVICES = "CDC,MSC"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1

1
ports/stm/boards/nucleo_f767zi/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x809A USB_PID = 0x809A
USB_PRODUCT = "Nucleo F767ZI - CPy" USB_PRODUCT = "Nucleo F767ZI - CPy"
USB_MANUFACTURER = "STMicroelectronics" USB_MANUFACTURER = "STMicroelectronics"
USB_DEVICES = "CDC,MSC"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1

1
ports/stm/boards/nucleo_h743zi_2/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x8098 USB_PID = 0x8098
USB_PRODUCT = "Nucleo H743ZI - CPy" USB_PRODUCT = "Nucleo H743ZI - CPy"
USB_MANUFACTURER = "STMicroelectronics" USB_MANUFACTURER = "STMicroelectronics"
USB_DEVICES = "CDC,MSC"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1

1
ports/stm/boards/openmv_h7/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x80A4 USB_PID = 0x80A4
USB_PRODUCT = "OpenMV-H7 R1" USB_PRODUCT = "OpenMV-H7 R1"
USB_MANUFACTURER = "OpenMV, LLC" USB_MANUFACTURER = "OpenMV, LLC"
USB_DEVICES = "CDC,MSC"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1

1
ports/stm/boards/pyb_nano_v2/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x8068 USB_PID = 0x8068
USB_PRODUCT = "PYB LR Nano V2" USB_PRODUCT = "PYB LR Nano V2"
USB_MANUFACTURER = "MicroPython Chinese Community" USB_MANUFACTURER = "MicroPython Chinese Community"
USB_DEVICES = "CDC,MSC"
SPI_FLASH_FILESYSTEM = 1 SPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICE_COUNT = 1 EXTERNAL_FLASH_DEVICE_COUNT = 1

1
ports/stm/boards/pyboard_v11/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x805C USB_PID = 0x805C
USB_PRODUCT = "Pyboard Version 1.1" USB_PRODUCT = "Pyboard Version 1.1"
USB_MANUFACTURER = "George Robotic" USB_MANUFACTURER = "George Robotic"
USB_DEVICES = "CDC,MSC"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1

1
ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x806A USB_PID = 0x806A
USB_PRODUCT = "stm32f411ce blackpill" USB_PRODUCT = "stm32f411ce blackpill"
USB_MANUFACTURER = "Unknown" USB_MANUFACTURER = "Unknown"
USB_DEVICES = "CDC,MSC"
# SPI_FLASH_FILESYSTEM = 1 # SPI_FLASH_FILESYSTEM = 1
# EXTERNAL_FLASH_DEVICE_COUNT = 1 # EXTERNAL_FLASH_DEVICE_COUNT = 1

1
ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x805E USB_PID = 0x805E
USB_PRODUCT = "STM32F411VE Discovery Board - CPy" USB_PRODUCT = "STM32F411VE Discovery Board - CPy"
USB_MANUFACTURER = "STMicroelectronics" USB_MANUFACTURER = "STMicroelectronics"
USB_DEVICES = "CDC,MSC"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1

1
ports/stm/boards/stm32f412zg_discovery/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x8056 USB_PID = 0x8056
USB_PRODUCT = "STM32F412ZG Discovery Board - CPy" USB_PRODUCT = "STM32F412ZG Discovery Board - CPy"
USB_MANUFACTURER = "STMicroelectronics" USB_MANUFACTURER = "STMicroelectronics"
USB_DEVICES = "CDC,MSC,HID"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1

1
ports/stm/boards/stm32f4_discovery/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x808A USB_PID = 0x808A
USB_PRODUCT = "STM32F407VG Discovery Board - CPy" USB_PRODUCT = "STM32F407VG Discovery Board - CPy"
USB_MANUFACTURER = "STMicroelectronics" USB_MANUFACTURER = "STMicroelectronics"
USB_DEVICES = "CDC,MSC"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1

1
ports/stm/boards/stm32f746g_discovery/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x809C USB_PID = 0x809C
USB_PRODUCT = "ST STM32F746G Discovery - CPy" USB_PRODUCT = "ST STM32F746G Discovery - CPy"
USB_MANUFACTURER = "STMicroelectronics" USB_MANUFACTURER = "STMicroelectronics"
USB_DEVICES = "CDC,MSC"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1

1
ports/stm/boards/thunderpack/mpconfigboard.mk
View File

@ -2,7 +2,6 @@ USB_VID = 0x239A
USB_PID = 0x806A USB_PID = 0x806A
USB_PRODUCT = "Thunderpack STM32F411" USB_PRODUCT = "Thunderpack STM32F411"
USB_MANUFACTURER = "Jeremy Gillick" USB_MANUFACTURER = "Jeremy Gillick"
USB_DEVICES = "CDC,MSC"
INTERNAL_FLASH_FILESYSTEM = 1 INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = NONE LONGINT_IMPL = NONE

12
supervisor/supervisor.mk
View File

@ -115,10 +115,6 @@ ifndef USB_INTERFACE_NAME
USB_INTERFACE_NAME = "CircuitPython" USB_INTERFACE_NAME = "CircuitPython"
endif endif
ifndef USB_DEVICES
USB_DEVICES = "CDC,MSC,AUDIO,HID"
endif
USB_DEVICES_COMPUTED := CDC,MSC USB_DEVICES_COMPUTED := CDC,MSC
ifeq ($(CIRCUITPY_USB_MIDI),1) ifeq ($(CIRCUITPY_USB_MIDI),1)
USB_DEVICES_COMPUTED := $(USB_DEVICES_COMPUTED),AUDIO USB_DEVICES_COMPUTED := $(USB_DEVICES_COMPUTED),AUDIO
@ -126,18 +122,12 @@ endif
ifeq ($(CIRCUITPY_USB_HID),1) ifeq ($(CIRCUITPY_USB_HID),1)
USB_DEVICES_COMPUTED := $(USB_DEVICES_COMPUTED),HID USB_DEVICES_COMPUTED := $(USB_DEVICES_COMPUTED),HID
endif endif
USB_DEVICES_COMPUTED := "$(USB_DEVICES_COMPUTED)" USB_DEVICES := "$(USB_DEVICES_COMPUTED)"
ifndef USB_HID_DEVICES ifndef USB_HID_DEVICES
USB_HID_DEVICES = "KEYBOARD,MOUSE,CONSUMER,GAMEPAD" USB_HID_DEVICES = "KEYBOARD,MOUSE,CONSUMER,GAMEPAD"
endif endif
# During a transitional period, check that the COMPUTED values match.
# Once they do all match, we can remove all the hard-coded ones.
ifneq ($(USB_DEVICES),$(USB_DEVICES_COMPUTED))
$(error Computed USB devices '$(USB_DEVICES_COMPUTED)' different than hard-coded USB devices '$(USB_DEVICES)')
endif
ifndef USB_MSC_MAX_PACKET_SIZE ifndef USB_MSC_MAX_PACKET_SIZE
USB_MSC_MAX_PACKET_SIZE = 64 USB_MSC_MAX_PACKET_SIZE = 64
endif endif