Skip to content
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.

Sign up for GitHub

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

2.x: Fix regression preventing remount as readwrite in boot.py #812

Merged
merged 1 commit into from
May 7, 2018
Merged

2.x: Fix regression preventing remount as readwrite in boot.py #812

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion atmel-samd/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,6 +762,11 @@ int main(void) {
// USB isn't up, so we can write the file.
flash_set_usb_writeable(false);
f_open(fs, boot_output_file, CIRCUITPY_BOOT_OUTPUT_FILE, FA_WRITE | FA_CREATE_ALWAYS);

// Switch the filesystem back to non-writable by Python now instead of later,
// since boot.py might change it back to writable.
flash_set_usb_writeable(true);

// Write version info to boot_out.txt.
mp_hal_stdout_tx_str(MICROPY_FULL_VERSION_INFO);
mp_hal_stdout_tx_str("\r\n");
Expand All @@ -779,7 +784,6 @@ int main(void) {
flash_flush();
boot_output_file = NULL;
}
flash_set_usb_writeable(true);
#endif

// Reset to remove any state that boot.py setup. It should only be used to
Expand Down