Another batch of changes for boot.py

beryllium-org · Dec 18, 2023 · fbdfa3e · fbdfa3e
1 parent 3e2b88b
commit fbdfa3e
Show file tree

Hide file tree

Showing 20 changed files with 54 additions and 17 deletions.
diff --git a/Boardfiles/Seeed_XIAO_nRF52840_Sense/settings.toml b/Boardfiles/Seeed_XIAO_nRF52840_Sense/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 6144
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = true
 usb_hid_available = true

diff --git a/Boardfiles/adafruit_feather_esp32s2/settings.toml b/Boardfiles/adafruit_feather_esp32s2/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 12288
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = true
 usb_hid_available = true

diff --git a/Boardfiles/adafruit_feather_esp32s3_tft/settings.toml b/Boardfiles/adafruit_feather_esp32s3_tft/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 12288
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = true
 usb_hid_available = true

diff --git a/Boardfiles/adafruit_kb2040/settings.toml b/Boardfiles/adafruit_kb2040/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 4608
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = true
 usb_hid_available = true

diff --git a/Boardfiles/beetle-esp32-c3/settings.toml b/Boardfiles/beetle-esp32-c3/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 4608
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = false
 usb_hid_available = false

diff --git a/Boardfiles/firebeetle2_esp32s3/settings.toml b/Boardfiles/firebeetle2_esp32s3/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 12288
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = true
 usb_hid_available = true

diff --git a/Boardfiles/lolin_s2_mini/settings.toml b/Boardfiles/lolin_s2_mini/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 12288
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = true
 usb_hid_available = true

diff --git a/Boardfiles/m5stack_timer_camera_x/settings.toml b/Boardfiles/m5stack_timer_camera_x/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 12288
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = false
 usb_hid_available = false

diff --git a/Boardfiles/pimoroni_picolipo_16mb/settings.toml b/Boardfiles/pimoroni_picolipo_16mb/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 4608
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = true
 usb_hid_available = true

diff --git a/Boardfiles/pimoroni_picolipo_4mb/settings.toml b/Boardfiles/pimoroni_picolipo_4mb/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 4608
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = true
 usb_hid_available = true

diff --git a/Boardfiles/raspberry_pi_pico/settings.toml b/Boardfiles/raspberry_pi_pico/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 4608
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = true
 usb_hid_available = true

diff --git a/Boardfiles/raspberry_pi_pico_w/settings.toml b/Boardfiles/raspberry_pi_pico_w/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 4608
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = true
 usb_hid_available = true

diff --git a/Boardfiles/waveshare_esp32s2_pico/settings.toml b/Boardfiles/waveshare_esp32s2_pico/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 12288
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = true
 usb_hid_available = true

diff --git a/Boardfiles/waveshare_rp2040_zero/settings.toml b/Boardfiles/waveshare_rp2040_zero/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 4608
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = true
 usb_hid_available = true

diff --git a/Boardfiles/weact_esp32c6_n4/settings.toml b/Boardfiles/weact_esp32c6_n4/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 12288
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = false
 usb_hid_available = false

diff --git a/Boardfiles/weact_esp32c6_n8/settings.toml b/Boardfiles/weact_esp32c6_n8/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 12288
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = false
 usb_hid_available = false

diff --git a/Boardfiles/yd_esp32_s3_n16r8/settings.toml b/Boardfiles/yd_esp32_s3_n16r8/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 12288
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = true
 usb_hid_available = true

diff --git a/Boardfiles/yd_esp32_s3_n8r8/settings.toml b/Boardfiles/yd_esp32_s3_n8r8/settings.toml
@@ -3,6 +3,8 @@ CIRCUITPY_PYSTACK_SIZE = 12288
 [LJINUX]
 setup = true
 
+fs_label = "LJINUX"
+
 serial_console_enabled = true
 usb_msc_available = true
 usb_hid_available = true

diff --git a/rootfilesystem/boot.py b/rootfilesystem/boot.py
@@ -1,12 +1,12 @@
+print("Early boot log:\n")
+
 from storage import getmount, remount, disable_usb_drive
 from supervisor import runtime, status_bar
 from cptoml import fetch
 
 runtime.autoreload = False
 status_bar.console = False
 
-stash = ""
-
 lj_mount = getmount("/")
 
 desired_label = fetch("fs_label", "LJINUX")
@@ -15,42 +15,42 @@
     if lj_mount.label != desired_label:
         remount("/", False)
         lj_mount.label = desired_label
-        stash += "Reset filesystem label.\n\n"
+        print("Reset filesystem label.\n")
         remount("/", True)
 
 if fetch("usb_msc_available", "LJINUX"):
-    stash += "This board supports USB filesystem enumeration.\n"
+    print("This board supports USB filesystem enumeration.")
     if fetch("usb_msc_enabled", "LJINUX"):
-        stash += "USB filesystem is enabled.\nLjinux will access root Read-Only!\n\n"
+        print("The USB filesystem is enabled.\nLjinux will access root Read-Only!\n")
     else:
         disable_usb_drive()
-        stash += (
-            "USB filesystem is disabled.\nLjinux will operate in root Read-Write.\n\n"
-        )
+        print("The USB filesystem is disabled.\nLjinux will operate normally.\n")
 else:
-    stash += "This board does not support USB filesystem enumeration.\n\n"
+    print("This board does not support USB filesystem enumeration.\n")
 
 
 if fetch("usb_hid_available", "LJINUX"):
     import usb_hid
 
-    stash += "This board supports HID enumeration.\n"
+    print("This board supports HID enumeration.")
 
     if fetch("usb_hid_enabled", "LJINUX"):
-        stash += "HID Enabled.\n\n"
+        print("HID Enabled.\n")
     else:
         usb_hid.disable()
-        stash += "Disabled HID.\n\n"
+        print("HID Disabled.\n")
+else:
+    print("This board does not support HID enumeration.\n")
 
 if fetch("usb_midi_available", "LJINUX"):
     import usb_midi
 
-    stash += "This board supports MIDI enumeration.\n"
+    print("This board supports MIDI enumeration.")
 
     if fetch("usb_midi_enabled", "LJINUX"):
-        stash += "HID Enabled.\n\n"
+        print("MIDI Enabled.")
         usb_midi.enable()
     else:
-        stash += "Disabled HID.\n\n"
-
-print("Early boot log:\n" + stash)
+        print("MIDI Disabled.")
+else:
+    print("This board does not support MIDI enumeration.")
diff --git a/source/ljinux.py b/source/ljinux.py
@@ -343,6 +343,7 @@ def dmtex(
     "usb_msc_enabled": (False, bool, False),
     "usb_hid_enabled": (False, bool, False),
     "usb_midi_enabled": (False, bool, False),
+    "fs_label": ("LJINUX", str, False),
     "DEBUG": (False, bool, False),
     "root_SCLK": (-1, int, True),
     "root_SCSn": (-1, int, True),