Fix silabs

tannewt · tannewt · commit 0da83a9d374c · 2024-04-26T13:35:02.000-07:00
diff --git a/ports/silabs/boards/devkit_xg24_brd2601b/mpconfigboard.mk b/ports/silabs/boards/devkit_xg24_brd2601b/mpconfigboard.mk
@@ -8,7 +8,6 @@ EXTERNAL_FLASH_DEVICES = MX25R3235F
 MCU_SERIES = MG24
 MCU_VARIANT = EFR32MG24B310F1536IM48
 
-CIRCUITPY_USB = 0
 CIRCUITPY_SDCARDIO = 1
 
 CIRCUITPY_CREATOR_ID = 0x19960000
diff --git a/ports/silabs/boards/explorerkit_xg24_brd2703a/mpconfigboard.mk b/ports/silabs/boards/explorerkit_xg24_brd2703a/mpconfigboard.mk
@@ -6,7 +6,6 @@ SPI_FLASH_FILESYSTEM = 0
 MCU_SERIES = MG24
 MCU_VARIANT = EFR32MG24B210F1536IM48
 
-CIRCUITPY_USB = 0
 CIRCUITPY_SDCARDIO = 1
 
 CIRCUITPY_CREATOR_ID = 0x19960000
diff --git a/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/mpconfigboard.mk b/ports/silabs/boards/sparkfun_thingplus_matter_mgm240p_brd2704a/mpconfigboard.mk
@@ -7,7 +7,6 @@ SPI_FLASH_FILESYSTEM = 0
 MCU_SERIES = MG24
 MCU_VARIANT = MGM240PB32VNA
 
-CIRCUITPY_USB = 0
 CIRCUITPY_SDCARDIO = 1
 
 CIRCUITPY_CREATOR_ID = 0x19960000
diff --git a/ports/silabs/mpconfigport.mk b/ports/silabs/mpconfigport.mk
@@ -12,6 +12,7 @@ CIRCUITPY_FRAMEBUFFERIO ?= 1
 CIRCUITPY_NVM ?= 1
 CIRCUITPY_PWMIO ?= 1
 CIRCUITPY_RTC ?= 1
+CIRCUITPY_USB_DEVICE = 0
 CIRCUITPY_WATCHDOG ?=1
 
 ifeq ($(MCU_SERIES),MG24)
diff --git a/tools/ci_check_duplicate_usb_vid_pid.py b/tools/ci_check_duplicate_usb_vid_pid.py
@@ -96,7 +96,7 @@ def check_vid_pid(files, clusterlist):
     """
 
     usb_pattern = re.compile(
-        r"^CIRCUITPY_USB_DEVICE\s*=\s*0$|^IDF_TARGET = (esp32|esp32c3|esp32c6|esp32h2)$",
+        r"^CIRCUITPY_USB_DEVICE\s*=\s*0$|^IDF_TARGET = (esp32|esp32c3|esp32c6|esp32h2)$|^MCU_SERIES = MG24$",
         flags=re.M,
     )
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ def check_vid_pid(files, clusterlist):`
`96`	`96`	`"""`
`97`	`97`
`98`	`98`	`usb_pattern = re.compile(`
`99`		`- r"^CIRCUITPY_USB_DEVICE\s=\s0$\|^IDF_TARGET = (esp32\|esp32c3\|esp32c6\|esp32h2)$",`
	`99`	`+ r"^CIRCUITPY_USB_DEVICE\s=\s0$\|^IDF_TARGET = (esp32\|esp32c3\|esp32c6\|esp32h2)$\|^MCU_SERIES = MG24$",`
`100`	`100`	`flags=re.M,`
`101`	`101`	`)`
`102`	`102`