From f232aef7865c4e094f060f9766418f60fb9f86ea Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@unpythonic.net>
Date: Mon, 15 Jun 2020 19:12:04 -0500
Subject: supervisor.mk: Compute USB_DEVICES; remove from boards and ports

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.
---
 ports/atmel-samd/boards/8086_commander/mpconfigboard.mk                 | 2 --
 ports/atmel-samd/boards/pewpew10/mpconfigboard.mk                       | 2 --
 ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk                      | 2 --
 ports/atmel-samd/boards/ugame10/mpconfigboard.mk                        | 2 --
 ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk | 1 -
 ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk                | 1 -
 ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk                   | 2 --
 ports/cxd56/mpconfigport.mk                                             | 1 -
 ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.mk           | 1 -
 ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk          | 1 -
 ports/litex/boards/fomu/mpconfigboard.mk                                | 1 -
 ports/mimxrt10xx/mpconfigport.mk                                        | 1 -
 ports/stm/boards/espruino_pico/mpconfigboard.mk                         | 1 -
 ports/stm/boards/espruino_wifi/mpconfigboard.mk                         | 1 -
 ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk             | 1 -
 ports/stm/boards/meowbit_v121/mpconfigboard.mk                          | 1 -
 ports/stm/boards/nucleo_f746zg/mpconfigboard.mk                         | 1 -
 ports/stm/boards/nucleo_f767zi/mpconfigboard.mk                         | 1 -
 ports/stm/boards/nucleo_h743zi_2/mpconfigboard.mk                       | 1 -
 ports/stm/boards/openmv_h7/mpconfigboard.mk                             | 1 -
 ports/stm/boards/pyb_nano_v2/mpconfigboard.mk                           | 1 -
 ports/stm/boards/pyboard_v11/mpconfigboard.mk                           | 1 -
 ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk                 | 1 -
 ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk                 | 1 -
 ports/stm/boards/stm32f412zg_discovery/mpconfigboard.mk                 | 1 -
 ports/stm/boards/stm32f4_discovery/mpconfigboard.mk                     | 1 -
 ports/stm/boards/stm32f746g_discovery/mpconfigboard.mk                  | 1 -
 ports/stm/boards/thunderpack/mpconfigboard.mk                           | 1 -
 28 files changed, 33 deletions(-)

(limited to 'ports')

diff --git a/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk b/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk
index 8f8f508ea..4b0377be2 100644
--- a/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/8086_commander/mpconfigboard.mk
@@ -3,8 +3,6 @@ USB_PID = 0x0101
 USB_PRODUCT = "Commander"
 USB_MANUFACTURER = "8086 Consultancy"
 
-USB_DEVICES= "CDC,MSC,HID"
-
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
 
diff --git a/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk
index 1ad2553a3..7305abf73 100644
--- a/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew10/mpconfigboard.mk
@@ -24,5 +24,3 @@ SUPEROPT_GC = 0
 FROZEN_MPY_DIRS += $(TOP)/frozen/pew-pewpew-standalone-10.x
 
 CFLAGS_BOARD = --param max-inline-insns-auto=15
-
-USB_DEVICES="CDC,MSC,HID"
diff --git a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
index 87f92ae9e..864d31909 100644
--- a/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pewpew_m4/mpconfigboard.mk
@@ -46,8 +46,6 @@ CIRCUITPY_MATH = 1
 FROZEN_MPY_DIRS += $(TOP)/frozen/circuitpython-stage/pewpew_m4
 CIRCUITPY_DISPLAY_FONT = $(TOP)/ports/atmel-samd/boards/ugame10/brutalist-6.bdf
 
-USB_DEVICES = "CDC,MSC"
-
 # Tweak inlining depending on language.
 ifeq ($(TRANSLATION), zh_Latn_pinyin)
 CFLAGS_INLINE_LIMIT = 45
diff --git a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
index 2ccaa9bdb..1c4336907 100644
--- a/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/ugame10/mpconfigboard.mk
@@ -39,5 +39,3 @@ CFLAGS_INLINE_LIMIT = 45
 else
 CFLAGS_INLINE_LIMIT = 70
 endif
-
-USB_DEVICES="CDC,MSC"
diff --git a/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk b/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk
index d2477e9fd..de9b61764 100644
--- a/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/winterbloom_big_honking_button/mpconfigboard.mk
@@ -4,7 +4,6 @@ USB_VID = 0x239A
 USB_PID = 0x6005
 USB_PRODUCT = "Big Honking Button"
 USB_MANUFACTURER = "Winterbloom"
-USB_DEVICES = "CDC,MSC"
 
 CHIP_VARIANT = SAMD21G18A
 CHIP_FAMILY = samd21
diff --git a/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk b/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
index 6a78a4ff9..e96497b3e 100644
--- a/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/winterbloom_sol/mpconfigboard.mk
@@ -6,7 +6,6 @@ USB_PID = 0x8062
 USB_PRODUCT = "Sol"
 USB_MANUFACTURER = "Winterbloom"
 USB_INTERFACE_NAME = "Sol"
-USB_DEVICES = "CDC,MSC,AUDIO"
 
 CHIP_VARIANT = SAMD51J20A
 CHIP_FAMILY = samd51
diff --git a/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk b/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk
index 372b1f491..9309fdce0 100644
--- a/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/xinabox_cs11/mpconfigboard.mk
@@ -28,5 +28,3 @@ CIRCUITPY_COUNTIO=0
 # Include these Python libraries in firmware.
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_BusDevice
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_SD
-
-USB_DEVICES="CDC,MSC,HID"
diff --git a/ports/cxd56/mpconfigport.mk b/ports/cxd56/mpconfigport.mk
index 5894b9b73..d91458aca 100644
--- a/ports/cxd56/mpconfigport.mk
+++ b/ports/cxd56/mpconfigport.mk
@@ -1,5 +1,4 @@
 USB_SERIAL_NUMBER_LENGTH = 10
-USB_DEVICES = "CDC,MSC"
 USB_MSC_MAX_PACKET_SIZE = 512
 USB_RENUMBER_ENDPOINTS = 0
 USB_CDC_EP_NUM_NOTIFICATION = 3
diff --git a/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.mk b/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.mk
index cd2735615..d9ad56886 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.mk
+++ b/ports/esp32s2/boards/espressif_saola_1_wroom/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x80A8
 USB_PRODUCT = "Saola 1 w/WROOM"
 USB_MANUFACTURER = "Espressif"
-USB_DEVICES = "CDC,MSC,HID"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
diff --git a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk
index 0b847de94..558b1144a 100644
--- a/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk
+++ b/ports/esp32s2/boards/espressif_saola_1_wrover/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x80A6
 USB_PRODUCT = "Saola 1 w/WROVER"
 USB_MANUFACTURER = "Espressif"
-USB_DEVICES = "CDC,MSC,HID"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
diff --git a/ports/litex/boards/fomu/mpconfigboard.mk b/ports/litex/boards/fomu/mpconfigboard.mk
index 4787803cc..c8de94e9c 100644
--- a/ports/litex/boards/fomu/mpconfigboard.mk
+++ b/ports/litex/boards/fomu/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x1209
 USB_PID = 0x5BF0
 USB_PRODUCT = "Fomu"
 USB_MANUFACTURER = "Foosn"
-USB_DEVICES = "CDC,MSC,AUDIO,HID"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = MPZ
diff --git a/ports/mimxrt10xx/mpconfigport.mk b/ports/mimxrt10xx/mpconfigport.mk
index 8162d4327..49d998508 100644
--- a/ports/mimxrt10xx/mpconfigport.mk
+++ b/ports/mimxrt10xx/mpconfigport.mk
@@ -14,7 +14,6 @@ endif
 
 INTERNAL_LIBM = 1
 
-USB_DEVICES = "CDC,MSC,HID"
 USB_SERIAL_NUMBER_LENGTH = 32
 USB_MSC_MAX_PACKET_SIZE = 512
 
diff --git a/ports/stm/boards/espruino_pico/mpconfigboard.mk b/ports/stm/boards/espruino_pico/mpconfigboard.mk
index 054937c33..201237c9d 100644
--- a/ports/stm/boards/espruino_pico/mpconfigboard.mk
+++ b/ports/stm/boards/espruino_pico/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x808E
 USB_PRODUCT = "Espruino Pico"
 USB_MANUFACTURER = "Espruino"
-USB_DEVICES = "CDC,MSC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
diff --git a/ports/stm/boards/espruino_wifi/mpconfigboard.mk b/ports/stm/boards/espruino_wifi/mpconfigboard.mk
index ee82095ff..9500a5f18 100644
--- a/ports/stm/boards/espruino_wifi/mpconfigboard.mk
+++ b/ports/stm/boards/espruino_wifi/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x8090
 USB_PRODUCT = "Espruino Wifi"
 USB_MANUFACTURER = "Espruino"
-USB_DEVICES = "CDC,MSC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
diff --git a/ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk b/ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk
index d98bd29ec..2b2c0d6db 100644
--- a/ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk
+++ b/ports/stm/boards/feather_stm32f405_express/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x805A
 USB_PRODUCT = "Feather STM32F405 Express"
 USB_MANUFACTURER = "Adafruit Industries LLC"
-USB_DEVICES = "CDC,MSC"
 
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
diff --git a/ports/stm/boards/meowbit_v121/mpconfigboard.mk b/ports/stm/boards/meowbit_v121/mpconfigboard.mk
index cf60c89c2..127cdb60e 100644
--- a/ports/stm/boards/meowbit_v121/mpconfigboard.mk
+++ b/ports/stm/boards/meowbit_v121/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x805A
 USB_PRODUCT = "Meowbit"
 USB_MANUFACTURER = "Kittenbot"
-USB_DEVICES = "CDC,MSC"
 
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
diff --git a/ports/stm/boards/nucleo_f746zg/mpconfigboard.mk b/ports/stm/boards/nucleo_f746zg/mpconfigboard.mk
index 651f3c229..1c8edecc3 100644
--- a/ports/stm/boards/nucleo_f746zg/mpconfigboard.mk
+++ b/ports/stm/boards/nucleo_f746zg/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x809E
 USB_PRODUCT = "Nucleo F746zg - CPy"
 USB_MANUFACTURER = "STMicroelectronics"
-USB_DEVICES = "CDC,MSC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
diff --git a/ports/stm/boards/nucleo_f767zi/mpconfigboard.mk b/ports/stm/boards/nucleo_f767zi/mpconfigboard.mk
index c5d956b99..0c712a0f4 100644
--- a/ports/stm/boards/nucleo_f767zi/mpconfigboard.mk
+++ b/ports/stm/boards/nucleo_f767zi/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x809A
 USB_PRODUCT = "Nucleo F767ZI - CPy"
 USB_MANUFACTURER = "STMicroelectronics"
-USB_DEVICES = "CDC,MSC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
diff --git a/ports/stm/boards/nucleo_h743zi_2/mpconfigboard.mk b/ports/stm/boards/nucleo_h743zi_2/mpconfigboard.mk
index ea99a1e10..35f47e193 100644
--- a/ports/stm/boards/nucleo_h743zi_2/mpconfigboard.mk
+++ b/ports/stm/boards/nucleo_h743zi_2/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x8098
 USB_PRODUCT = "Nucleo H743ZI - CPy"
 USB_MANUFACTURER = "STMicroelectronics"
-USB_DEVICES = "CDC,MSC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
diff --git a/ports/stm/boards/openmv_h7/mpconfigboard.mk b/ports/stm/boards/openmv_h7/mpconfigboard.mk
index 4ff0f18d5..a837dc9ec 100644
--- a/ports/stm/boards/openmv_h7/mpconfigboard.mk
+++ b/ports/stm/boards/openmv_h7/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x80A4
 USB_PRODUCT = "OpenMV-H7 R1"
 USB_MANUFACTURER = "OpenMV, LLC"
-USB_DEVICES = "CDC,MSC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
diff --git a/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk b/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk
index 08a266816..237dba921 100644
--- a/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk
+++ b/ports/stm/boards/pyb_nano_v2/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x8068
 USB_PRODUCT = "PYB LR Nano V2"
 USB_MANUFACTURER = "MicroPython Chinese Community"
-USB_DEVICES = "CDC,MSC"
 
 SPI_FLASH_FILESYSTEM = 1
 EXTERNAL_FLASH_DEVICE_COUNT = 1
diff --git a/ports/stm/boards/pyboard_v11/mpconfigboard.mk b/ports/stm/boards/pyboard_v11/mpconfigboard.mk
index c0c0f5f6c..78b96e55f 100644
--- a/ports/stm/boards/pyboard_v11/mpconfigboard.mk
+++ b/ports/stm/boards/pyboard_v11/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x805C
 USB_PRODUCT = "Pyboard Version 1.1"
 USB_MANUFACTURER = "George Robotic"
-USB_DEVICES = "CDC,MSC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
diff --git a/ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk b/ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk
index 0054232e1..9b45a0fac 100644
--- a/ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk
+++ b/ports/stm/boards/stm32f411ce_blackpill/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x806A
 USB_PRODUCT = "stm32f411ce blackpill"
 USB_MANUFACTURER = "Unknown"
-USB_DEVICES = "CDC,MSC"
 
 # SPI_FLASH_FILESYSTEM = 1
 # EXTERNAL_FLASH_DEVICE_COUNT = 1
diff --git a/ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk b/ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk
index ca2f10ba3..3cb7162a4 100644
--- a/ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk
+++ b/ports/stm/boards/stm32f411ve_discovery/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x805E
 USB_PRODUCT = "STM32F411VE Discovery Board - CPy"
 USB_MANUFACTURER = "STMicroelectronics"
-USB_DEVICES = "CDC,MSC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
diff --git a/ports/stm/boards/stm32f412zg_discovery/mpconfigboard.mk b/ports/stm/boards/stm32f412zg_discovery/mpconfigboard.mk
index a2a322dfa..c99eb1a00 100644
--- a/ports/stm/boards/stm32f412zg_discovery/mpconfigboard.mk
+++ b/ports/stm/boards/stm32f412zg_discovery/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x8056
 USB_PRODUCT = "STM32F412ZG Discovery Board - CPy"
 USB_MANUFACTURER = "STMicroelectronics"
-USB_DEVICES = "CDC,MSC,HID"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
diff --git a/ports/stm/boards/stm32f4_discovery/mpconfigboard.mk b/ports/stm/boards/stm32f4_discovery/mpconfigboard.mk
index 09652d9ad..7eece5896 100644
--- a/ports/stm/boards/stm32f4_discovery/mpconfigboard.mk
+++ b/ports/stm/boards/stm32f4_discovery/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x808A
 USB_PRODUCT = "STM32F407VG Discovery Board - CPy"
 USB_MANUFACTURER = "STMicroelectronics"
-USB_DEVICES = "CDC,MSC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
diff --git a/ports/stm/boards/stm32f746g_discovery/mpconfigboard.mk b/ports/stm/boards/stm32f746g_discovery/mpconfigboard.mk
index 94a50853c..c1c754ab5 100644
--- a/ports/stm/boards/stm32f746g_discovery/mpconfigboard.mk
+++ b/ports/stm/boards/stm32f746g_discovery/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x809C
 USB_PRODUCT = "ST STM32F746G Discovery - CPy"
 USB_MANUFACTURER = "STMicroelectronics"
-USB_DEVICES = "CDC,MSC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 
diff --git a/ports/stm/boards/thunderpack/mpconfigboard.mk b/ports/stm/boards/thunderpack/mpconfigboard.mk
index 007b00cdd..afd0ffd75 100644
--- a/ports/stm/boards/thunderpack/mpconfigboard.mk
+++ b/ports/stm/boards/thunderpack/mpconfigboard.mk
@@ -2,7 +2,6 @@ USB_VID = 0x239A
 USB_PID = 0x806A
 USB_PRODUCT = "Thunderpack STM32F411"
 USB_MANUFACTURER = "Jeremy Gillick"
-USB_DEVICES = "CDC,MSC"
 
 INTERNAL_FLASH_FILESYSTEM = 1
 LONGINT_IMPL = NONE
-- 
cgit v1.2.3