system: allow reading devicetree properties outside of chosen

Signed-off-by: Leonard Göhrs <[email protected]>

Author: hnez

src/system.rs

@@ -24,22 +24,28 @@ use crate::broker::{BrokerBuilder, Topic};
 #[cfg(feature = "demo_mode")]
 mod read_dt_props {
     const DEMO_DATA_STR: &[(&str, &str)] = &[
-        ("barebox-version", "barebox-2022.11.0-20221121-1"),
+        ("chosen/barebox-version", "barebox-2022.11.0-20221121-1"),
         (
-            "baseboard-factory-data/pcba-hardware-release",
+            "chosen/baseboard-factory-data/pcba-hardware-release",
             "lxatac-S01-R03-B02-C00",
         ),
         (
-            "powerboard-factory-data/pcba-hardware-release",
+            "chosen/powerboard-factory-data/pcba-hardware-release",
             "lxatac-S05-R03-V01-C00",
         ),
     ];
 
     const DEMO_DATA_NUM: &[(&str, u32)] = &[
-        ("baseboard-factory-data/modification", 0),
-        ("baseboard-factory-data/factory-timestamp", 1678086417),
-        ("powerboard-factory-data/modification", 0),
-        ("powerboard-factory-data/factory-timestamp", 1678086418),
+        ("chosen/baseboard-factory-data/modification", 0),
+        (
+            "chosen/baseboard-factory-data/factory-timestamp",
+            1678086417,
+        ),
+        ("chosen/powerboard-factory-data/modification", 0),
+        (
+            "chosen/powerboard-factory-data/factory-timestamp",
+            1678086418,
+        ),
     ];
 
     pub fn read_dt_property(path: &str) -> String {
@@ -58,10 +64,10 @@ mod read_dt_props {
     use std::fs::read;
     use std::str::from_utf8;
 
-    const DT_CHOSEN: &str = "/sys/firmware/devicetree/base/chosen/";
+    const DT_BASE: &str = "/sys/firmware/devicetree/base/";
 
     pub fn read_dt_property(path: &str) -> String {
-        let bytes = read([DT_CHOSEN, path].join("/")).unwrap();
+        let bytes = read([DT_BASE, path].join("/")).unwrap();
         from_utf8(bytes.strip_suffix(&[0]).unwrap())
             .unwrap()
             .to_string()
@@ -110,24 +116,26 @@ impl Barebox {
     fn get() -> Self {
         // Get info from devicetree chosen
         Self {
-            version: read_dt_property("barebox-version"),
+            version: read_dt_property("chosen/barebox-version"),
             baseboard_release: {
-                let template = read_dt_property("baseboard-factory-data/pcba-hardware-release");
-                let changeset = read_dt_property_u32("baseboard-factory-data/modification");
+                let template =
+                    read_dt_property("chosen/baseboard-factory-data/pcba-hardware-release");
+                let changeset = read_dt_property_u32("chosen/baseboard-factory-data/modification");
 
                 template.replace("-C??", &format!("-C{changeset:02}"))
             },
             powerboard_release: {
-                let template = read_dt_property("powerboard-factory-data/pcba-hardware-release");
-                let changeset = read_dt_property_u32("powerboard-factory-data/modification");
+                let template =
+                    read_dt_property("chosen/powerboard-factory-data/pcba-hardware-release");
+                let changeset = read_dt_property_u32("chosen/powerboard-factory-data/modification");
 
                 template.replace("-C??", &format!("-C{changeset:02}"))
             },
             baseboard_timestamp: {
-                read_dt_property_u32("baseboard-factory-data/factory-timestamp")
+                read_dt_property_u32("chosen/baseboard-factory-data/factory-timestamp")
             },
             powerboard_timestamp: {
-                read_dt_property_u32("powerboard-factory-data/factory-timestamp")
+                read_dt_property_u32("chosen/powerboard-factory-data/factory-timestamp")
             },
         }
     }