sandbox: Drop unnecessary test node

The spl-test4 node deliberately has an invalid compatible string. This
causes a warning from dtoc and the check it does is not really necessary.
Drop it, to avoid the warning and associated confusion.

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

diff --git a/arch/sandbox/dts/sandbox.dtsi b/arch/sandbox/dts/sandbox.dtsi
index 81cdc55b0d4d10205bc7c7f052ac9c91e2a4cf1a..7b4fc94495a9eaac688e27a5a80ce764fe67d5cd 100644 (file)
--- a/arch/sandbox/dts/sandbox.dtsi
+++ b/arch/sandbox/dts/sandbox.dtsi
@@ -248,11 +248,6 @@
                stringarray = "one";
        };
 
-       spl-test4 {
-               u-boot,dm-pre-reloc;
-               compatible = "sandbox,spl-test.2";
-       };
-
        spl-test5 {
                u-boot,dm-tpl;
                compatible = "sandbox,spl-test";

diff --git a/test/py/tests/test_ofplatdata.py b/test/py/tests/test_ofplatdata.py
index 78837a3c0081f9fd69a933f13c0a18428014ec76..d55338e37e6f2fb1440f8ee98069236118e642f7 100644 (file)
--- a/test/py/tests/test_ofplatdata.py
+++ b/test/py/tests/test_ofplatdata.py
@@ -17,7 +17,6 @@ def test_spl_devicetree(u_boot_console):
     assert "u-boot,dm-spl" not in output
     assert "u-boot,dm-tpl" not in output
 
-    assert "spl-test4" in output
     assert "spl-test5" not in output
     assert "spl-test6" not in output
     assert "spl-test7" in output

diff --git a/tools/dtoc/dtoc_test_simple.dts b/tools/dtoc/dtoc_test_simple.dts
index fd168cb593175b3aa0e187c00704867344f6a976..1c87b891929f8b0ed403fdd824552190e054b58d 100644 (file)
--- a/tools/dtoc/dtoc_test_simple.dts
+++ b/tools/dtoc/dtoc_test_simple.dts
@@ -44,11 +44,6 @@
                longbytearray = [09 0a 0b 0c 0d 0e 0f 10];
        };
 
-       spl-test4 {
-               u-boot,dm-pre-reloc;
-               compatible = "sandbox,spl-test.2";
-       };
-
        i2c@0 {
                compatible = "sandbox,i2c-test";
                u-boot,dm-pre-reloc;

diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py
index 4913d95021801406b1d51c46d8934efbff214ce8..49ab75b85dab79b8842e4bf3614c6fb8e15fd513 100755 (executable)
--- a/tools/dtoc/test_dtoc.py
+++ b/tools/dtoc/test_dtoc.py
@@ -204,8 +204,6 @@ struct dtd_sandbox_spl_test {
 \tconst char *\tstringarray[3];
 \tconst char *\tstringval;
 };
-struct dtd_sandbox_spl_test_2 {
-};
 ''', data)
 
         self.run_test(['platdata'], dtb_file, output)
@@ -286,16 +284,6 @@ U_BOOT_DEVICE(spl_test3) = {
 \t.parent_idx\t= -1,
 };
 
-/* Node /spl-test4 index 5 */
-static struct dtd_sandbox_spl_test_2 dtv_spl_test4 = {
-};
-U_BOOT_DEVICE(spl_test4) = {
-\t.name\t\t= "sandbox_spl_test_2",
-\t.plat\t= &dtv_spl_test4,
-\t.plat_size\t= sizeof(dtv_spl_test4),
-\t.parent_idx\t= -1,
-};
-
 ''' + C_EMPTY_POPULATE_PHANDLE_DATA, data)
 
     def test_driver_alias(self):