dtoc: Move test files into a test/ directory

It is confusing to have the test files in the same places as the
implementation. Move them into a separate directory.

Add a helper function for test_dtoc, to avoid repeating the same
path.

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

diff --git a/tools/dtoc/dtoc_test.dts b/tools/dtoc/dtoc_test.dts
deleted file mode 100644 (file)
index b225948..0000000
--- a/tools/dtoc/dtoc_test.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2017 Google, Inc
- */
-
- /dts-v1/;
-
-/ {
-};

diff --git a/tools/dtoc/dtoc_test_add_prop.dts b/tools/dtoc/dtoc_test_add_prop.dts
deleted file mode 100644 (file)
index fa296e5..0000000
--- a/tools/dtoc/dtoc_test_add_prop.dts
+++ /dev/null
@@ -1,24 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2018 Google, Inc
- */
-
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-       spl-test {
-               u-boot,dm-pre-reloc;
-               compatible = "sandbox,spl-test";
-               intval = <1>;
-       };
-
-       spl-test2 {
-               u-boot,dm-pre-reloc;
-               compatible = "sandbox,spl-test";
-               intarray = <5>;
-       };
-};

diff --git a/tools/dtoc/dtoc_test_addr32.dts b/tools/dtoc/dtoc_test_addr32.dts
deleted file mode 100644 (file)
index 2390454..0000000
--- a/tools/dtoc/dtoc_test_addr32.dts
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2017 Google, Inc
- */
-
- /dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-
-       test1 {
-               u-boot,dm-pre-reloc;
-               compatible = "test1";
-               reg = <0x1234 0x5678>;
-       };
-
-       test2 {
-               u-boot,dm-pre-reloc;
-               compatible = "test2";
-               reg = <0x12345678 0x98765432 2 3>;
-       };
-
-};

diff --git a/tools/dtoc/dtoc_test_addr32_64.dts b/tools/dtoc/dtoc_test_addr32_64.dts
deleted file mode 100644 (file)
index 7599d5b..0000000
--- a/tools/dtoc/dtoc_test_addr32_64.dts
+++ /dev/null
@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2017 Google, Inc
- */
-
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <2>;
-
-       test1 {
-               u-boot,dm-pre-reloc;
-               compatible = "test1";
-               reg = <0x1234 0x5678 0x0>;
-       };
-
-       test2 {
-               u-boot,dm-pre-reloc;
-               compatible = "test2";
-               reg = <0x12345678 0x98765432 0x10987654>;
-       };
-
-       test3 {
-               u-boot,dm-pre-reloc;
-               compatible = "test3";
-               reg = <0x12345678 0x98765432 0x10987654 2 0 3>;
-       };
-
-};

diff --git a/tools/dtoc/dtoc_test_addr64.dts b/tools/dtoc/dtoc_test_addr64.dts
deleted file mode 100644 (file)
index 263d251..0000000
--- a/tools/dtoc/dtoc_test_addr64.dts
+++ /dev/null
@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2017 Google, Inc
- */
-
- /dts-v1/;
-
-/ {
-       #address-cells = <2>;
-       #size-cells = <2>;
-
-       test1 {
-               u-boot,dm-pre-reloc;
-               compatible = "test1";
-               reg = /bits/ 64 <0x1234 0x5678>;
-       };
-
-       test2 {
-               u-boot,dm-pre-reloc;
-               compatible = "test2";
-               reg = /bits/ 64 <0x1234567890123456 0x9876543210987654>;
-       };
-
-       test3 {
-               u-boot,dm-pre-reloc;
-               compatible = "test3";
-               reg = /bits/ 64 <0x1234567890123456 0x9876543210987654 2 3>;
-       };
-
-};

diff --git a/tools/dtoc/dtoc_test_addr64_32.dts b/tools/dtoc/dtoc_test_addr64_32.dts
deleted file mode 100644 (file)
index 85e4f5f..0000000
--- a/tools/dtoc/dtoc_test_addr64_32.dts
+++ /dev/null
@@ -1,32 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2017 Google, Inc
- */
-
-/dts-v1/;
-
-/ {
-       #address-cells = <2>;
-       #size-cells = <1>;
-
-       test1 {
-               u-boot,dm-pre-reloc;
-               compatible = "test1";
-               reg = <0x1234 0x0 0x5678>;
-       };
-
-       test2 {
-               u-boot,dm-pre-reloc;
-               compatible = "test2";
-               reg = <0x12345678 0x90123456 0x98765432>;
-       };
-
-       test3 {
-               u-boot,dm-pre-reloc;
-               compatible = "test3";
-               reg = <0x12345678 0x90123456 0x98765432 0 2 3>;
-       };
-
-};

diff --git a/tools/dtoc/dtoc_test_aliases.dts b/tools/dtoc/dtoc_test_aliases.dts
deleted file mode 100644 (file)
index ae33716..0000000
--- a/tools/dtoc/dtoc_test_aliases.dts
+++ /dev/null
@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2017 Google, Inc
- */
-
- /dts-v1/;
-
-/ {
-       spl-test {
-               u-boot,dm-pre-reloc;
-               compatible = "compat1", "compat2.1-fred", "compat3";
-               intval = <1>;
-       };
-
-       spl-test2 {
-               u-boot,dm-pre-reloc;
-               compatible = "compat1", "simple_bus";
-               intval = <1>;
-       };
-};

diff --git a/tools/dtoc/dtoc_test_bad_reg.dts b/tools/dtoc/dtoc_test_bad_reg.dts
deleted file mode 100644 (file)
index 1312acb..0000000
--- a/tools/dtoc/dtoc_test_bad_reg.dts
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2018 Google, Inc
- */
-
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-       spl-test {
-       compatible = "test";
-               reg = "fre";
-       };
-};

diff --git a/tools/dtoc/dtoc_test_bad_reg2.dts b/tools/dtoc/dtoc_test_bad_reg2.dts
deleted file mode 100644 (file)
index 3e9efa4..0000000
--- a/tools/dtoc/dtoc_test_bad_reg2.dts
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2018 Google, Inc
- */
-
-/dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-       spl-test {
-       compatible = "test";
-               reg = <1 2 3>;
-       };
-};

diff --git a/tools/dtoc/dtoc_test_driver_alias.dts b/tools/dtoc/dtoc_test_driver_alias.dts
deleted file mode 100644 (file)
index da7973b..0000000
--- a/tools/dtoc/dtoc_test_driver_alias.dts
+++ /dev/null
@@ -1,20 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2020 Collabora Ltd.
- */
-
-/dts-v1/;
-
-/ {
-       gpio_a: gpios@0 {
-               u-boot,dm-pre-reloc;
-               gpio-controller;
-               compatible = "sandbox_gpio_alias";
-               #gpio-cells = <1>;
-               gpio-bank-name = "a";
-               sandbox,gpio-count = <20>;
-       };
-
-};

diff --git a/tools/dtoc/dtoc_test_empty.dts b/tools/dtoc/dtoc_test_empty.dts
deleted file mode 100644 (file)
index b225948..0000000
--- a/tools/dtoc/dtoc_test_empty.dts
+++ /dev/null
@@ -1,11 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2017 Google, Inc
- */
-
- /dts-v1/;
-
-/ {
-};

diff --git a/tools/dtoc/dtoc_test_invalid_driver.dts b/tools/dtoc/dtoc_test_invalid_driver.dts
deleted file mode 100644 (file)
index 914ac3e..0000000
--- a/tools/dtoc/dtoc_test_invalid_driver.dts
+++ /dev/null
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2017 Google, Inc
- */
-
-/dts-v1/;
-
-/ {
-       spl-test {
-               u-boot,dm-pre-reloc;
-               compatible = "invalid";
-       };
-};

diff --git a/tools/dtoc/dtoc_test_phandle.dts b/tools/dtoc/dtoc_test_phandle.dts
deleted file mode 100644 (file)
index a71acff..0000000
--- a/tools/dtoc/dtoc_test_phandle.dts
+++ /dev/null
@@ -1,42 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2017 Google, Inc
- */
-
- /dts-v1/;
-
-/ {
-       phandle: phandle-target {
-               u-boot,dm-pre-reloc;
-               compatible = "target";
-               intval = <0>;
-                #clock-cells = <0>;
-       };
-
-       phandle_1: phandle2-target {
-               u-boot,dm-pre-reloc;
-               compatible = "target";
-               intval = <1>;
-               #clock-cells = <1>;
-       };
-       phandle_2: phandle3-target {
-               u-boot,dm-pre-reloc;
-               compatible = "target";
-               intval = <2>;
-               #clock-cells = <2>;
-       };
-
-       phandle-source {
-               u-boot,dm-pre-reloc;
-               compatible = "source";
-               clocks = <&phandle &phandle_1 11 &phandle_2 12 13 &phandle>;
-       };
-
-       phandle-source2 {
-               u-boot,dm-pre-reloc;
-               compatible = "source";
-               clocks = <&phandle>;
-       };
-};

diff --git a/tools/dtoc/dtoc_test_phandle_bad.dts b/tools/dtoc/dtoc_test_phandle_bad.dts
deleted file mode 100644 (file)
index a3ddc59..0000000
--- a/tools/dtoc/dtoc_test_phandle_bad.dts
+++ /dev/null
@@ -1,16 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2018 Google, Inc
- */
-
-/dts-v1/;
-
-/ {
-       phandle-source {
-               u-boot,dm-pre-reloc;
-               compatible = "source";
-               clocks = <20>;    /* Invalid phandle */
-       };
-};

diff --git a/tools/dtoc/dtoc_test_phandle_bad2.dts b/tools/dtoc/dtoc_test_phandle_bad2.dts
deleted file mode 100644 (file)
index fe25f56..0000000
--- a/tools/dtoc/dtoc_test_phandle_bad2.dts
+++ /dev/null
@@ -1,22 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2018 Google, Inc
- */
-
-/dts-v1/;
-
-/ {
-       phandle: phandle-target {
-               u-boot,dm-pre-reloc;
-               compatible = "target";
-               intval = <0>;
-       };
-
-       phandle-source2 {
-               u-boot,dm-pre-reloc;
-               compatible = "source";
-               clocks = <&phandle>;
-       };
-};

diff --git a/tools/dtoc/dtoc_test_phandle_cd_gpios.dts b/tools/dtoc/dtoc_test_phandle_cd_gpios.dts
deleted file mode 100644 (file)
index 241743e..0000000
--- a/tools/dtoc/dtoc_test_phandle_cd_gpios.dts
+++ /dev/null
@@ -1,42 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2020 Collabora Ltd.
- */
-
-/dts-v1/;
-
-/ {
-       phandle: phandle-target {
-               u-boot,dm-pre-reloc;
-               compatible = "target";
-               intval = <0>;
-               #gpio-cells = <0>;
-       };
-
-       phandle_1: phandle2-target {
-               u-boot,dm-pre-reloc;
-               compatible = "target";
-               intval = <1>;
-               #gpio-cells = <1>;
-       };
-       phandle_2: phandle3-target {
-               u-boot,dm-pre-reloc;
-               compatible = "target";
-               intval = <2>;
-               #gpio-cells = <2>;
-       };
-
-       phandle-source {
-               u-boot,dm-pre-reloc;
-               compatible = "source";
-               cd-gpios = <&phandle &phandle_1 11 &phandle_2 12 13 &phandle>;
-       };
-
-       phandle-source2 {
-               u-boot,dm-pre-reloc;
-               compatible = "source";
-               cd-gpios = <&phandle>;
-       };
-};

diff --git a/tools/dtoc/dtoc_test_phandle_reorder.dts b/tools/dtoc/dtoc_test_phandle_reorder.dts
deleted file mode 100644 (file)
index aa71d56..0000000
--- a/tools/dtoc/dtoc_test_phandle_reorder.dts
+++ /dev/null
@@ -1,23 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2018 Google, Inc
- */
-
-/dts-v1/;
-
-/ {
-
-       phandle-source2 {
-               u-boot,dm-pre-reloc;
-               compatible = "source";
-               clocks = <&phandle>;
-       };
-
-       phandle: phandle-target {
-               u-boot,dm-pre-reloc;
-               compatible = "target";
-               #clock-cells = <0>;
-       };
-};

diff --git a/tools/dtoc/dtoc_test_phandle_single.dts b/tools/dtoc/dtoc_test_phandle_single.dts
deleted file mode 100644 (file)
index aacd0b1..0000000
--- a/tools/dtoc/dtoc_test_phandle_single.dts
+++ /dev/null
@@ -1,23 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2018 Google, Inc
- */
-
-/dts-v1/;
-
-/ {
-       phandle: phandle-target {
-               u-boot,dm-pre-reloc;
-               compatible = "target";
-               intval = <0>;
-               #clock-cells = <0>;
-       };
-
-       phandle-source2 {
-               u-boot,dm-pre-reloc;
-               compatible = "source";
-               clocks = <&phandle>;
-       };
-};

diff --git a/tools/dtoc/dtoc_test_scan_drivers.cxx b/tools/dtoc/dtoc_test_scan_drivers.cxx
deleted file mode 100644 (file)
index f448767..0000000
--- a/tools/dtoc/dtoc_test_scan_drivers.cxx
+++ /dev/null
@@ -1 +0,0 @@
-DM_DRIVER_ALIAS(sandbox_gpio, sandbox_gpio_alias2)

diff --git a/tools/dtoc/dtoc_test_simple.dts b/tools/dtoc/dtoc_test_simple.dts
deleted file mode 100644 (file)
index 1c87b89..0000000
--- a/tools/dtoc/dtoc_test_simple.dts
+++ /dev/null
@@ -1,59 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+
-/*
- * Test device tree file for dtoc
- *
- * Copyright 2017 Google, Inc
- */
-
- /dts-v1/;
-
-/ {
-       #address-cells = <1>;
-       #size-cells = <1>;
-       spl-test {
-               u-boot,dm-pre-reloc;
-               compatible = "sandbox,spl-test";
-               boolval;
-               intval = <1>;
-               intarray = <2 3 4>;
-               byteval = [05];
-               bytearray = [06];
-               longbytearray = [09 0a 0b 0c 0d 0e 0f 10 11];
-               stringval = "message";
-               stringarray = "multi-word", "message";
-               notstring = [20 21 22 10 00];
-       };
-
-       spl-test2 {
-               u-boot,dm-pre-reloc;
-               compatible = "sandbox,spl-test";
-               intval = <3>;
-               intarray = <5>;
-               byteval = [08];
-               bytearray = [01 23 34];
-               longbytearray = [09 0a 0b 0c];
-               stringval = "message2";
-               stringarray = "another", "multi-word", "message";
-               acpi-name =  "\\_SB.GPO0";
-       };
-
-       spl-test3 {
-               u-boot,dm-pre-reloc;
-               compatible = "sandbox,spl-test";
-               stringarray = "one";
-               longbytearray = [09 0a 0b 0c 0d 0e 0f 10];
-       };
-
-       i2c@0 {
-               compatible = "sandbox,i2c-test";
-               u-boot,dm-pre-reloc;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               pmic@9 {
-                       compatible = "sandbox,pmic-test";
-                       u-boot,dm-pre-reloc;
-                       reg = <9>;
-                       low-power;
-               };
-       };
-};

diff --git a/tools/dtoc/test/dtoc_test.dts b/tools/dtoc/test/dtoc_test.dts
new file mode 100644 (file)
index 0000000..b225948
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test.dts
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2017 Google, Inc
+ */
+
+ /dts-v1/;
+
+/ {
+};

diff --git a/tools/dtoc/test/dtoc_test_add_prop.dts b/tools/dtoc/test/dtoc_test_add_prop.dts
new file mode 100644 (file)
index 0000000..fa296e5
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_add_prop.dts
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2018 Google, Inc
+ */
+
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+       spl-test {
+               u-boot,dm-pre-reloc;
+               compatible = "sandbox,spl-test";
+               intval = <1>;
+       };
+
+       spl-test2 {
+               u-boot,dm-pre-reloc;
+               compatible = "sandbox,spl-test";
+               intarray = <5>;
+       };
+};

diff --git a/tools/dtoc/test/dtoc_test_addr32.dts b/tools/dtoc/test/dtoc_test_addr32.dts
new file mode 100644 (file)
index 0000000..2390454
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_addr32.dts
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2017 Google, Inc
+ */
+
+ /dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+
+       test1 {
+               u-boot,dm-pre-reloc;
+               compatible = "test1";
+               reg = <0x1234 0x5678>;
+       };
+
+       test2 {
+               u-boot,dm-pre-reloc;
+               compatible = "test2";
+               reg = <0x12345678 0x98765432 2 3>;
+       };
+
+};

diff --git a/tools/dtoc/test/dtoc_test_addr32_64.dts b/tools/dtoc/test/dtoc_test_addr32_64.dts
new file mode 100644 (file)
index 0000000..7599d5b
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_addr32_64.dts
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2017 Google, Inc
+ */
+
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <2>;
+
+       test1 {
+               u-boot,dm-pre-reloc;
+               compatible = "test1";
+               reg = <0x1234 0x5678 0x0>;
+       };
+
+       test2 {
+               u-boot,dm-pre-reloc;
+               compatible = "test2";
+               reg = <0x12345678 0x98765432 0x10987654>;
+       };
+
+       test3 {
+               u-boot,dm-pre-reloc;
+               compatible = "test3";
+               reg = <0x12345678 0x98765432 0x10987654 2 0 3>;
+       };
+
+};

diff --git a/tools/dtoc/test/dtoc_test_addr64.dts b/tools/dtoc/test/dtoc_test_addr64.dts
new file mode 100644 (file)
index 0000000..263d251
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_addr64.dts
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2017 Google, Inc
+ */
+
+ /dts-v1/;
+
+/ {
+       #address-cells = <2>;
+       #size-cells = <2>;
+
+       test1 {
+               u-boot,dm-pre-reloc;
+               compatible = "test1";
+               reg = /bits/ 64 <0x1234 0x5678>;
+       };
+
+       test2 {
+               u-boot,dm-pre-reloc;
+               compatible = "test2";
+               reg = /bits/ 64 <0x1234567890123456 0x9876543210987654>;
+       };
+
+       test3 {
+               u-boot,dm-pre-reloc;
+               compatible = "test3";
+               reg = /bits/ 64 <0x1234567890123456 0x9876543210987654 2 3>;
+       };
+
+};

diff --git a/tools/dtoc/test/dtoc_test_addr64_32.dts b/tools/dtoc/test/dtoc_test_addr64_32.dts
new file mode 100644 (file)
index 0000000..85e4f5f
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_addr64_32.dts
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2017 Google, Inc
+ */
+
+/dts-v1/;
+
+/ {
+       #address-cells = <2>;
+       #size-cells = <1>;
+
+       test1 {
+               u-boot,dm-pre-reloc;
+               compatible = "test1";
+               reg = <0x1234 0x0 0x5678>;
+       };
+
+       test2 {
+               u-boot,dm-pre-reloc;
+               compatible = "test2";
+               reg = <0x12345678 0x90123456 0x98765432>;
+       };
+
+       test3 {
+               u-boot,dm-pre-reloc;
+               compatible = "test3";
+               reg = <0x12345678 0x90123456 0x98765432 0 2 3>;
+       };
+
+};

diff --git a/tools/dtoc/test/dtoc_test_aliases.dts b/tools/dtoc/test/dtoc_test_aliases.dts
new file mode 100644 (file)
index 0000000..ae33716
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_aliases.dts
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2017 Google, Inc
+ */
+
+ /dts-v1/;
+
+/ {
+       spl-test {
+               u-boot,dm-pre-reloc;
+               compatible = "compat1", "compat2.1-fred", "compat3";
+               intval = <1>;
+       };
+
+       spl-test2 {
+               u-boot,dm-pre-reloc;
+               compatible = "compat1", "simple_bus";
+               intval = <1>;
+       };
+};

diff --git a/tools/dtoc/test/dtoc_test_bad_reg.dts b/tools/dtoc/test/dtoc_test_bad_reg.dts
new file mode 100644 (file)
index 0000000..1312acb
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_bad_reg.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2018 Google, Inc
+ */
+
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+       spl-test {
+       compatible = "test";
+               reg = "fre";
+       };
+};

diff --git a/tools/dtoc/test/dtoc_test_bad_reg2.dts b/tools/dtoc/test/dtoc_test_bad_reg2.dts
new file mode 100644 (file)
index 0000000..3e9efa4
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_bad_reg2.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2018 Google, Inc
+ */
+
+/dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+       spl-test {
+       compatible = "test";
+               reg = <1 2 3>;
+       };
+};

diff --git a/tools/dtoc/test/dtoc_test_driver_alias.dts b/tools/dtoc/test/dtoc_test_driver_alias.dts
new file mode 100644 (file)
index 0000000..da7973b
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_driver_alias.dts
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2020 Collabora Ltd.
+ */
+
+/dts-v1/;
+
+/ {
+       gpio_a: gpios@0 {
+               u-boot,dm-pre-reloc;
+               gpio-controller;
+               compatible = "sandbox_gpio_alias";
+               #gpio-cells = <1>;
+               gpio-bank-name = "a";
+               sandbox,gpio-count = <20>;
+       };
+
+};

diff --git a/tools/dtoc/test/dtoc_test_empty.dts b/tools/dtoc/test/dtoc_test_empty.dts
new file mode 100644 (file)
index 0000000..b225948
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_empty.dts
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2017 Google, Inc
+ */
+
+ /dts-v1/;
+
+/ {
+};

diff --git a/tools/dtoc/test/dtoc_test_invalid_driver.dts b/tools/dtoc/test/dtoc_test_invalid_driver.dts
new file mode 100644 (file)
index 0000000..914ac3e
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_invalid_driver.dts
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2017 Google, Inc
+ */
+
+/dts-v1/;
+
+/ {
+       spl-test {
+               u-boot,dm-pre-reloc;
+               compatible = "invalid";
+       };
+};

diff --git a/tools/dtoc/test/dtoc_test_phandle.dts b/tools/dtoc/test/dtoc_test_phandle.dts
new file mode 100644 (file)
index 0000000..a71acff
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_phandle.dts
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2017 Google, Inc
+ */
+
+ /dts-v1/;
+
+/ {
+       phandle: phandle-target {
+               u-boot,dm-pre-reloc;
+               compatible = "target";
+               intval = <0>;
+                #clock-cells = <0>;
+       };
+
+       phandle_1: phandle2-target {
+               u-boot,dm-pre-reloc;
+               compatible = "target";
+               intval = <1>;
+               #clock-cells = <1>;
+       };
+       phandle_2: phandle3-target {
+               u-boot,dm-pre-reloc;
+               compatible = "target";
+               intval = <2>;
+               #clock-cells = <2>;
+       };
+
+       phandle-source {
+               u-boot,dm-pre-reloc;
+               compatible = "source";
+               clocks = <&phandle &phandle_1 11 &phandle_2 12 13 &phandle>;
+       };
+
+       phandle-source2 {
+               u-boot,dm-pre-reloc;
+               compatible = "source";
+               clocks = <&phandle>;
+       };
+};

diff --git a/tools/dtoc/test/dtoc_test_phandle_bad.dts b/tools/dtoc/test/dtoc_test_phandle_bad.dts
new file mode 100644 (file)
index 0000000..a3ddc59
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_phandle_bad.dts
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2018 Google, Inc
+ */
+
+/dts-v1/;
+
+/ {
+       phandle-source {
+               u-boot,dm-pre-reloc;
+               compatible = "source";
+               clocks = <20>;    /* Invalid phandle */
+       };
+};

diff --git a/tools/dtoc/test/dtoc_test_phandle_bad2.dts b/tools/dtoc/test/dtoc_test_phandle_bad2.dts
new file mode 100644 (file)
index 0000000..fe25f56
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_phandle_bad2.dts
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2018 Google, Inc
+ */
+
+/dts-v1/;
+
+/ {
+       phandle: phandle-target {
+               u-boot,dm-pre-reloc;
+               compatible = "target";
+               intval = <0>;
+       };
+
+       phandle-source2 {
+               u-boot,dm-pre-reloc;
+               compatible = "source";
+               clocks = <&phandle>;
+       };
+};

diff --git a/tools/dtoc/test/dtoc_test_phandle_cd_gpios.dts b/tools/dtoc/test/dtoc_test_phandle_cd_gpios.dts
new file mode 100644 (file)
index 0000000..241743e
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_phandle_cd_gpios.dts
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2020 Collabora Ltd.
+ */
+
+/dts-v1/;
+
+/ {
+       phandle: phandle-target {
+               u-boot,dm-pre-reloc;
+               compatible = "target";
+               intval = <0>;
+               #gpio-cells = <0>;
+       };
+
+       phandle_1: phandle2-target {
+               u-boot,dm-pre-reloc;
+               compatible = "target";
+               intval = <1>;
+               #gpio-cells = <1>;
+       };
+       phandle_2: phandle3-target {
+               u-boot,dm-pre-reloc;
+               compatible = "target";
+               intval = <2>;
+               #gpio-cells = <2>;
+       };
+
+       phandle-source {
+               u-boot,dm-pre-reloc;
+               compatible = "source";
+               cd-gpios = <&phandle &phandle_1 11 &phandle_2 12 13 &phandle>;
+       };
+
+       phandle-source2 {
+               u-boot,dm-pre-reloc;
+               compatible = "source";
+               cd-gpios = <&phandle>;
+       };
+};

diff --git a/tools/dtoc/test/dtoc_test_phandle_reorder.dts b/tools/dtoc/test/dtoc_test_phandle_reorder.dts
new file mode 100644 (file)
index 0000000..aa71d56
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_phandle_reorder.dts
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2018 Google, Inc
+ */
+
+/dts-v1/;
+
+/ {
+
+       phandle-source2 {
+               u-boot,dm-pre-reloc;
+               compatible = "source";
+               clocks = <&phandle>;
+       };
+
+       phandle: phandle-target {
+               u-boot,dm-pre-reloc;
+               compatible = "target";
+               #clock-cells = <0>;
+       };
+};

diff --git a/tools/dtoc/test/dtoc_test_phandle_single.dts b/tools/dtoc/test/dtoc_test_phandle_single.dts
new file mode 100644 (file)
index 0000000..aacd0b1
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_phandle_single.dts
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2018 Google, Inc
+ */
+
+/dts-v1/;
+
+/ {
+       phandle: phandle-target {
+               u-boot,dm-pre-reloc;
+               compatible = "target";
+               intval = <0>;
+               #clock-cells = <0>;
+       };
+
+       phandle-source2 {
+               u-boot,dm-pre-reloc;
+               compatible = "source";
+               clocks = <&phandle>;
+       };
+};

diff --git a/tools/dtoc/test/dtoc_test_scan_drivers.cxx b/tools/dtoc/test/dtoc_test_scan_drivers.cxx
new file mode 100644 (file)
index 0000000..f448767
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_scan_drivers.cxx
@@ -0,0 +1 @@
+DM_DRIVER_ALIAS(sandbox_gpio, sandbox_gpio_alias2)

diff --git a/tools/dtoc/test/dtoc_test_simple.dts b/tools/dtoc/test/dtoc_test_simple.dts
new file mode 100644 (file)
index 0000000..1c87b89
--- /dev/null
+++ b/tools/dtoc/test/dtoc_test_simple.dts
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Test device tree file for dtoc
+ *
+ * Copyright 2017 Google, Inc
+ */
+
+ /dts-v1/;
+
+/ {
+       #address-cells = <1>;
+       #size-cells = <1>;
+       spl-test {
+               u-boot,dm-pre-reloc;
+               compatible = "sandbox,spl-test";
+               boolval;
+               intval = <1>;
+               intarray = <2 3 4>;
+               byteval = [05];
+               bytearray = [06];
+               longbytearray = [09 0a 0b 0c 0d 0e 0f 10 11];
+               stringval = "message";
+               stringarray = "multi-word", "message";
+               notstring = [20 21 22 10 00];
+       };
+
+       spl-test2 {
+               u-boot,dm-pre-reloc;
+               compatible = "sandbox,spl-test";
+               intval = <3>;
+               intarray = <5>;
+               byteval = [08];
+               bytearray = [01 23 34];
+               longbytearray = [09 0a 0b 0c];
+               stringval = "message2";
+               stringarray = "another", "multi-word", "message";
+               acpi-name =  "\\_SB.GPO0";
+       };
+
+       spl-test3 {
+               u-boot,dm-pre-reloc;
+               compatible = "sandbox,spl-test";
+               stringarray = "one";
+               longbytearray = [09 0a 0b 0c 0d 0e 0f 10];
+       };
+
+       i2c@0 {
+               compatible = "sandbox,i2c-test";
+               u-boot,dm-pre-reloc;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               pmic@9 {
+                       compatible = "sandbox,pmic-test";
+                       u-boot,dm-pre-reloc;
+                       reg = <9>;
+                       low-power;
+               };
+       };
+};

diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py
index 6865d949a05ab9809ab7a13e8e5241ae89fd37f0..523f0a923ebc880de233c21bb6e665f06229210b 100755 (executable)
--- a/tools/dtoc/test_dtoc.py
+++ b/tools/dtoc/test_dtoc.py
@@ -72,7 +72,7 @@ def get_dtb_file(dts_fname, capture_stderr=False):
     Returns:
         str: Filename of compiled file in output directory
     """
-    return fdt_util.EnsureCompiled(os.path.join(OUR_PATH, dts_fname),
+    return fdt_util.EnsureCompiled(os.path.join(OUR_PATH, 'test', dts_fname),
                                    capture_stderr=capture_stderr)
 
 

diff --git a/tools/dtoc/test_fdt.py b/tools/dtoc/test_fdt.py
index e8fbbd5d10aa987e40a85d33221dd3fcea2b144e..1c3a8a2ab1ea192d510fc975d07a10b220ce7387 100755 (executable)
--- a/tools/dtoc/test_fdt.py
+++ b/tools/dtoc/test_fdt.py
@@ -48,6 +48,17 @@ def _GetPropertyValue(dtb, node, prop_name):
     data = dtb.GetContents()[offset:offset + len(prop.value)]
     return prop, [chr(x) for x in data]
 
+def find_dtb_file(dts_fname):
+    """Locate a test file in the test/ directory
+
+    Args:
+        dts_fname (str): Filename to find, e.g. 'dtoc_test_simple.dts]
+
+    Returns:
+        str: Path to the test filename
+    """
+    return os.path.join('tools/dtoc/test', dts_fname)
+
 
 class TestFdt(unittest.TestCase):
     """Tests for the Fdt module
@@ -64,7 +75,7 @@ class TestFdt(unittest.TestCase):
         tools.FinaliseOutputDir()
 
     def setUp(self):
-        self.dtb = fdt.FdtScan('tools/dtoc/dtoc_test_simple.dts')
+        self.dtb = fdt.FdtScan(find_dtb_file('dtoc_test_simple.dts'))
 
     def testFdt(self):
         """Test that we can open an Fdt"""
@@ -141,7 +152,7 @@ class TestNode(unittest.TestCase):
         tools.FinaliseOutputDir()
 
     def setUp(self):
-        self.dtb = fdt.FdtScan('tools/dtoc/dtoc_test_simple.dts')
+        self.dtb = fdt.FdtScan(find_dtb_file('dtoc_test_simple.dts'))
         self.node = self.dtb.GetNode('/spl-test')
 
     def testOffset(self):
@@ -203,7 +214,7 @@ class TestNode(unittest.TestCase):
 
     def testLookupPhandle(self):
         """Test looking up a single phandle"""
-        dtb = fdt.FdtScan('tools/dtoc/dtoc_test_phandle.dts')
+        dtb = fdt.FdtScan(find_dtb_file('dtoc_test_phandle.dts'))
         node = dtb.GetNode('/phandle-source2')
         prop = node.props['clocks']
         target = dtb.GetNode('/phandle-target')
@@ -222,7 +233,7 @@ class TestProp(unittest.TestCase):
         tools.FinaliseOutputDir()
 
     def setUp(self):
-        self.dtb = fdt.FdtScan('tools/dtoc/dtoc_test_simple.dts')
+        self.dtb = fdt.FdtScan(find_dtb_file('dtoc_test_simple.dts'))
         self.node = self.dtb.GetNode('/spl-test')
         self.fdt = self.dtb.GetFdtObj()
 
@@ -230,7 +241,7 @@ class TestProp(unittest.TestCase):
         self.assertEqual(None, self.dtb.GetNode('missing'))
 
     def testPhandle(self):
-        dtb = fdt.FdtScan('tools/dtoc/dtoc_test_phandle.dts')
+        dtb = fdt.FdtScan(find_dtb_file('dtoc_test_phandle.dts'))
         node = dtb.GetNode('/phandle-source2')
         prop = node.props['clocks']
         self.assertTrue(fdt32_to_cpu(prop.value) > 0)
@@ -488,7 +499,7 @@ class TestFdtUtil(unittest.TestCase):
         tools.FinaliseOutputDir()
 
     def setUp(self):
-        self.dtb = fdt.FdtScan('tools/dtoc/dtoc_test_simple.dts')
+        self.dtb = fdt.FdtScan(find_dtb_file('dtoc_test_simple.dts'))
         self.node = self.dtb.GetNode('/spl-test')
 
     def testGetInt(self):
@@ -531,7 +542,7 @@ class TestFdtUtil(unittest.TestCase):
                       str(e.exception))
 
     def testGetPhandleList(self):
-        dtb = fdt.FdtScan('tools/dtoc/dtoc_test_phandle.dts')
+        dtb = fdt.FdtScan(find_dtb_file('dtoc_test_phandle.dts'))
         node = dtb.GetNode('/phandle-source2')
         self.assertEqual([1], fdt_util.GetPhandleList(node, 'clocks'))
         node = dtb.GetNode('/phandle-source')
@@ -551,7 +562,7 @@ class TestFdtUtil(unittest.TestCase):
         self.assertEqual(0, fdt_util.fdt_cells_to_cpu(val, 0))
         self.assertEqual(2, fdt_util.fdt_cells_to_cpu(val, 1))
 
-        dtb2 = fdt.FdtScan('tools/dtoc/dtoc_test_addr64.dts')
+        dtb2 = fdt.FdtScan(find_dtb_file('dtoc_test_addr64.dts'))
         node1 = dtb2.GetNode('/test1')
         val = node1.props['reg'].value
         self.assertEqual(0x1234, fdt_util.fdt_cells_to_cpu(val, 2))
@@ -565,7 +576,7 @@ class TestFdtUtil(unittest.TestCase):
 
     def testEnsureCompiled(self):
         """Test a degenerate case of this function (file already compiled)"""
-        dtb = fdt_util.EnsureCompiled('tools/dtoc/dtoc_test_simple.dts')
+        dtb = fdt_util.EnsureCompiled(find_dtb_file('dtoc_test_simple.dts'))
         self.assertEqual(dtb, fdt_util.EnsureCompiled(dtb))
 
     def testEnsureCompiledTmpdir(self):
@@ -574,7 +585,7 @@ class TestFdtUtil(unittest.TestCase):
             old_outdir = tools.outdir
             tools.outdir= None
             tmpdir = tempfile.mkdtemp(prefix='test_fdt.')
-            dtb = fdt_util.EnsureCompiled('tools/dtoc/dtoc_test_simple.dts',
+            dtb = fdt_util.EnsureCompiled(find_dtb_file('dtoc_test_simple.dts'),
                                           tmpdir)
             self.assertEqual(tmpdir, os.path.dirname(dtb))
             shutil.rmtree(tmpdir)

diff --git a/tools/dtoc/test_src_scan.py b/tools/dtoc/test_src_scan.py
index a0b0e097eb29744493370d78dba282ada0e531d8..a7eba3005e5ffb11473b274d1f858e9ac79640d5 100644 (file)
--- a/tools/dtoc/test_src_scan.py
+++ b/tools/dtoc/test_src_scan.py
@@ -59,7 +59,8 @@ class TestSrcScan(unittest.TestCase):
     def test_additional(self):
         """Test with additional drivers to scan"""
         scan = src_scan.Scanner(
-            None, True, [None, '', 'tools/dtoc/dtoc_test_scan_drivers.cxx'])
+            None, True,
+            [None, '', 'tools/dtoc/test/dtoc_test_scan_drivers.cxx'])
         scan.scan_drivers()
         self.assertIn('sandbox_gpio_alias2', scan._driver_aliases)
         self.assertEqual('sandbox_gpio',