sandbox: add test of CONFIG_ENV_IMPORT_FDT

Check that a variable defined in /config/environment is found in the
run-time environment, and that clearing fdt_env_path from within that
node works.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
[trini: Conditionalize the test being linked in]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 6fd56c351cfde79606f7a00b616435e102ed3e2a..fe26ced31dcdd5bb42284426ab1d4e7de62696a7 100644 (file)
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -53,6 +53,13 @@
                osd0 = "/osd";
        };
 
+       config {
+               environment {
+                       from_fdt = "yes";
+                       fdt_env_path = "";
+               };
+       };
+
        audio: audio-codec {
                compatible = "sandbox,audio-codec";
                #sound-dai-cells = <1>;

diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig
index 80c5be2067aff1909be81904dbf7d729ba178c47..9a373bab6fe3bf8d6f5aba9dabaab6a0cc4f8345 100644 (file)
--- a/configs/sandbox64_defconfig
+++ b/configs/sandbox64_defconfig
@@ -91,6 +91,7 @@ CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_EXT4=y
 CONFIG_ENV_EXT4_INTERFACE="host"
 CONFIG_ENV_EXT4_DEVICE_AND_PART="0:0"
+CONFIG_ENV_IMPORT_FDT=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_NETCONSOLE=y
 CONFIG_IP_DEFRAG=y

diff --git a/configs/sandbox_defconfig b/configs/sandbox_defconfig
index 570af61cbd412527d8cb3c06bb1ec18664d021b3..bdbf714e2bd9fc63f6f0722f6713d88cefc39451 100644 (file)
--- a/configs/sandbox_defconfig
+++ b/configs/sandbox_defconfig
@@ -106,6 +106,7 @@ CONFIG_ENV_IS_NOWHERE=y
 CONFIG_ENV_IS_IN_EXT4=y
 CONFIG_ENV_EXT4_INTERFACE="host"
 CONFIG_ENV_EXT4_DEVICE_AND_PART="0:0"
+CONFIG_ENV_IMPORT_FDT=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
 CONFIG_NETCONSOLE=y
 CONFIG_IP_DEFRAG=y

diff --git a/test/env/Makefile b/test/env/Makefile
index 5c8eae31b0f61aa449f1b503a94a0d9c078893e1..9a98fd47966b13825d8de9e118643692a12e13df 100644 (file)
--- a/test/env/Makefile
+++ b/test/env/Makefile
@@ -5,3 +5,4 @@
 obj-y += cmd_ut_env.o
 obj-y += attr.o
 obj-y += hashtable.o
+obj-$(CONFIG_ENV_IMPORT_FDT) += fdt.o

diff --git a/test/env/fdt.c b/test/env/fdt.c
new file mode 100644 (file)
index 0000000..30bfa88
--- /dev/null
+++ b/test/env/fdt.c
@@ -0,0 +1,20 @@
+#include <common.h>
+#include <command.h>
+#include <env_attr.h>
+#include <test/env.h>
+#include <test/ut.h>
+
+static int env_test_fdt_import(struct unit_test_state *uts)
+{
+       const char *val;
+
+       val = env_get("from_fdt");
+       ut_assertnonnull(val);
+       ut_asserteq_str("yes", val);
+
+       val = env_get("fdt_env_path");
+       ut_assertnull(val);
+
+       return 0;
+}
+ENV_TEST(env_test_fdt_import, 0);