Skip to content

storage: Correct when we check for USB mounts #4462

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 22, 2021

Conversation

jepler
Copy link

@jepler jepler commented Mar 22, 2021

Closes #4417

I only compile-tested this for feather rp2040 with

diff --git a/ports/raspberrypi/boards/adafruit_feather_rp2040/mpconfigboard.mk b/ports/raspberrypi/boards/adafruit_feather_rp2040/mpconfigboard.mk
index f4106b94a..f891c3668 100644
--- a/ports/raspberrypi/boards/adafruit_feather_rp2040/mpconfigboard.mk
+++ b/ports/raspberrypi/boards/adafruit_feather_rp2040/mpconfigboard.mk
@@ -7,3 +7,5 @@ CHIP_VARIANT = RP2040
 CHIP_FAMILY = rp2
 
 INTERNAL_FLASH_FILESYSTEM = 1
+
+CIRCUITPY_USB_MSC = 0

@ArielWolle @miclooking please test with this change and let us know if it resolves the problem for you.

Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that we should also guard the usb_msc... declarationsinsupervisor/usb.hwith#if CIRCUITPY_USB_MSC`.

@miclooking
Copy link

please test with this change and let us know if it resolves the problem for you

This change resolves the problem for me.
Thanks.

@jepler
Copy link
Author

jepler commented Mar 22, 2021

I think that we should also guard the usb_msc... declarationsinsupervisor/usb.hwith#if CIRCUITPY_USB_MSC`.

Good idea, done. Please re-review @dhalbert

Copy link
Collaborator

@dhalbert dhalbert left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Tested that building Trinket M0 and Feather RP2040 don't fail when CIRCUITPY_USB_MSC = 0 is added to mpconfigboardk.mk.

@tannewt tannewt merged commit d526628 into adafruit:main Mar 22, 2021
@jepler jepler deleted the disable-usb-cdc branch March 23, 2021 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Can't disable mass storage for the Pimoroni tiny 2040
4 participants