expo: Move cedit theme under bootstd

This is related to standard boot, so put it under the same node. This may
simplify schema upstreaming later.

Mention themes in the documentation while we are here.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/sandbox/dts/sandbox.dtsi b/arch/sandbox/dts/sandbox.dtsi
index 8aaf911a41a77bce5081dc20493c04fd586f9fbc..ff7e5584c5580c861e9e177e3ea59a2e503e3f5e 100644 (file)
--- a/arch/sandbox/dts/sandbox.dtsi
+++ b/arch/sandbox/dts/sandbox.dtsi
@@ -16,12 +16,6 @@
                stdout-path = "/serial";
        };
 
-       cedit-theme {
-               font-size = <30>;
-               menu-inset = <3>;
-               menuitem-gap-y = <1>;
-       };
-
        alarm_wdt: alarm-wdt {
                compatible = "sandbox,alarm-wdt";
                timeout-sec = <5>;
@@ -36,6 +30,12 @@
        bootstd {
                compatible = "u-boot,boot-std";
                filename-prefixes = "./";
+
+               cedit-theme {
+                       font-size = <30>;
+                       menu-inset = <3>;
+                       menuitem-gap-y = <1>;
+               };
        };
 
        buttons {

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index f351d5cb84b0c5431a16204760db4fe67785cad0..084cb88a232eeb44621b7af25b3dcd8fb54c2d1b 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -100,6 +100,12 @@
                        menuitem-gap-y = <1>;
                };
 
+               cedit-theme {
+                       font-size = <30>;
+                       menu-inset = <3>;
+                       menuitem-gap-y = <1>;
+               };
+
                /*
                 * This is used for the VBE OS-request tests. A FAT filesystem
                 * created in a partition with the VBE information appearing
@@ -144,12 +150,6 @@
        cedit: cedit {
        };
 
-       cedit-theme {
-               font-size = <30>;
-               menu-inset = <3>;
-               menuitem-gap-y = <1>;
-       };
-
        fuzzing-engine {
                compatible = "sandbox,fuzzing-engine";
        };

diff --git a/cmd/cedit.c b/cmd/cedit.c
index 5f0e84403f5be83a2a0550edc6eff7237b798bf3..e98121b067b2a889d47e4936fc5c62f03f64607e 100644 (file)
--- a/cmd/cedit.c
+++ b/cmd/cedit.c
@@ -65,7 +65,7 @@ static int do_cedit_run(struct cmd_tbl *cmdtp, int flag, int argc,
                return CMD_RET_FAILURE;
        }
 
-       node = ofnode_path("/cedit-theme");
+       node = ofnode_path("/bootstd/cedit-theme");
        if (ofnode_valid(node)) {
                ret = expo_apply_theme(cur_exp, node);
                if (ret)

diff --git a/doc/develop/cedit.rst b/doc/develop/cedit.rst
index 48262ee535e9c0d4aaf4066aa9b8ad3d86654c2b..8f0a554ae91808aff7de04b56a6b59018d3ae081 100644 (file)
--- a/doc/develop/cedit.rst
+++ b/doc/develop/cedit.rst
@@ -145,3 +145,10 @@ Multiple scenes
 Expo supports multiple scenes but has no pre-determined way of moving between
 them. You could use selection of a menu item as a signal to change the scene,
 but this is not currently implemented in the cedit code (see `cedit_run()`).
+
+
+Themes
+------
+
+The configuration editor uses simple expo themes. The theme is read from
+`/bootstd/cedit-theme` in the devicetree.