Cherry pick "Remove platform singletons from the LVBS platform and OP-TEE shim"

.github/workflows/ci.yml

@@ -327,12 +327,6 @@ jobs:
           # - `litebox_platform_lvbs` has a custom target (`no_std`), so it does
           #   not work with the current no_std checker.
           #
-          # - `litebox_platform_multiplex` is allowed to have `std` access (in
-          #   its default feature set) because `litebox_platform_linux_userland`
-          #   has access, and this is just a multiplexer. Ideally, we'd do a
-          #   more precise check, but as long as we are tracking the underlying
-          #   platforms, we are unlikely to hit any significant issues here.
-          #
           # - `litebox_runner_linux_on_windows_userland` is allowed to have `std`
           #   access since it needs to actually access the file-system, pull in
           #   relevant files, and then actually trigger LiteBox itself.
@@ -396,7 +390,6 @@ jobs:
             -not -path './litebox_runner_linux_on_windows_userland/Cargo.toml' \
             -not -path './litebox_runner_windows_on_linux_userland/Cargo.toml' \
             -not -path './litebox_platform_lvbs/Cargo.toml' \
-            -not -path './litebox_platform_multiplex/Cargo.toml' \
             -not -path './litebox_runner_linux_userland/Cargo.toml' \
             -not -path './litebox_runner_windows_userland/Cargo.toml' \
             -not -path './litebox_runner_lvbs/Cargo.toml' \

Cargo.toml

@@ -22,7 +22,6 @@ members = [
     "litebox_platform_linux_userland",
     "litebox_platform_windows_userland",
     "litebox_platform_lvbs",
-    "litebox_platform_multiplex",
     "litebox_runner_linux_userland",
     "litebox_runner_linux_on_windows_userland",
     "litebox_runner_windows_on_linux_userland",
@@ -64,7 +63,6 @@ default-members = [
     "litebox_platform_linux_userland",
     "litebox_platform_windows_userland",
     "litebox_platform_lvbs",
-    "litebox_platform_multiplex",
     "litebox_runner_linux_userland",
     "litebox_runner_linux_on_windows_userland",
     "litebox_runner_windows_on_linux_userland",

dev_tests/src/ratchet.rs

@@ -34,22 +34,21 @@ fn ratchet_globals() -> Result<()> {
     ratchet(
         &[
             ("dev_bench/", 1),
+            ("litebox/", 7),
             ("litebox_broker_core/", 1),
             ("litebox_broker_transport_linux_userland/", 1),
             ("litebox_broker_userland/", 1),
-            ("litebox/", 7),
             ("litebox_platform/", 2),
             ("litebox_platform_linux_kernel/", 5),
             ("litebox_platform_linux_userland/", 5),
-            ("litebox_platform_lvbs/", 22),
-            ("litebox_platform_multiplex/", 1),
+            ("litebox_platform_lvbs/", 21),
             ("litebox_platform_windows_userland/", 8),
-            ("litebox_runner_lvbs/", 6),
+            ("litebox_runner_lvbs/", 8),
             ("litebox_runner_snp/", 2),
+            ("litebox_runner_windows_userland/", 2),
             ("litebox_shim_linux/", 2),
             ("litebox_shim_optee/", 6),
             ("litebox_shim_windows/", 1),
-            ("litebox_runner_windows_userland/", 2),
         ],
         |file| {
             Ok(file