Skip to content

Commit a5d7003

Browse files
authored
Merge pull request micropython#5065 from jepler/remote-settings-txt
Remove settings.py/txt as alternatives for boot.py
2 parents b9fa06c + 4e78649 commit a5d7003

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

README.rst

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ Behavior
140140
- Autoreload is disabled while the REPL is active.
141141
- Main is one of these: ``code.txt``, ``code.py``, ``main.py``,
142142
``main.txt``
143-
- Boot is one of these: ``settings.txt``, ``settings.py``, ``boot.py``,
144-
``boot.txt``
143+
- Boot is one of these: ``boot.py``, ``boot.txt``
145144

146145
API
147146
~~~

main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ STATIC void __attribute__ ((noinline)) run_boot_py(safe_mode_t safe_mode) {
631631
&& safe_mode == NO_SAFE_MODE
632632
&& MP_STATE_VM(vfs_mount_table) != NULL;
633633

634-
static const char * const boot_py_filenames[] = STRING_LIST("settings.txt", "settings.py", "boot.py", "boot.txt");
634+
static const char * const boot_py_filenames[] = STRING_LIST("boot.py", "boot.txt");
635635
bool skip_boot_output = false;
636636

637637
if (ok_to_run) {

0 commit comments

Comments
 (0)