Now that Linux has accepted these tags, update the dtoc tool to use them.
Signed-off-by: Simon Glass
---
(no changes since v1)
tools/dtoc/dtb_platdata.py | 10 +-
tools/dtoc/test/dtoc_test_add_prop.dts | 4 ++--
tools/dtoc/test/dtoc_test_addr32.dts | 4 ++--
tools/dtoc/test/dtoc_test_addr32_64.dts| 6 +++---
tools/dtoc/test/dtoc_test_addr64.dts | 6 +++---
tools/dtoc/test/dtoc_test_addr64_32.dts| 6 +++---
tools/dtoc/test/dtoc_test_alias_bad.dts| 6 +++---
tools/dtoc/test/dtoc_test_alias_bad_path.dts | 6 +++---
tools/dtoc/test/dtoc_test_alias_bad_uc.dts | 6 +++---
tools/dtoc/test/dtoc_test_aliases.dts | 4 ++--
tools/dtoc/test/dtoc_test_driver_alias.dts | 2 +-
tools/dtoc/test/dtoc_test_inst.dts | 6 +++---
tools/dtoc/test/dtoc_test_invalid_driver.dts | 2 +-
tools/dtoc/test/dtoc_test_noparent.dts | 6 +++---
tools/dtoc/test/dtoc_test_noprops.dts | 2 +-
tools/dtoc/test/dtoc_test_phandle.dts | 10 +-
tools/dtoc/test/dtoc_test_phandle_bad.dts | 2 +-
tools/dtoc/test/dtoc_test_phandle_bad2.dts | 4 ++--
tools/dtoc/test/dtoc_test_phandle_cd_gpios.dts | 10 +-
tools/dtoc/test/dtoc_test_phandle_reorder.dts | 4 ++--
tools/dtoc/test/dtoc_test_phandle_single.dts | 4 ++--
tools/dtoc/test/dtoc_test_simple.dts | 10 +-
tools/dtoc/test/dtoc_test_single_reg.dts | 4 ++--
23 files changed, 62 insertions(+), 62 deletions(-)
diff --git a/tools/dtoc/dtb_platdata.py b/tools/dtoc/dtb_platdata.py
index a69a7889ce1..39f416cfd80 100644
--- a/tools/dtoc/dtb_platdata.py
+++ b/tools/dtoc/dtb_platdata.py
@@ -35,9 +35,9 @@ PROP_IGNORE_LIST = [
'linux,phandle',
"status",
'phandle',
-'u-boot,dm-pre-reloc',
-'u-boot,dm-tpl',
-'u-boot,dm-spl',
+'bootph-all',
+'bootph-pre-sram',
+'bootph-pre-ram',
]
# C type declarations for the types we support
@@ -442,7 +442,7 @@ class DtbPlatdata():
"""
parent = node.parent
if parent and not parent.props:
-raise ValueError("Parent node '%s' has no properties - do you need
u-boot,dm-spl or similar?" %
+raise ValueError("Parent node '%s' has no properties - do you need
bootph-pre-ram or similar?" %
parent.path)
num_addr, num_size = 2, 2
if parent:
@@ -754,7 +754,7 @@ class DtbPlatdata():
# This might indicate that the parent node is not in the
# SPL/TPL devicetree but the child is. For example if we are
# dealing with of-platdata in TPL, the parent has a
-# u-boot,dm-tpl tag but the child has u-boot,dm-pre-reloc. In
+# bootph-pre-sram tag but the child has bootph-all. In
# this case the child node exists in TPL but the parent does
# not.
raise ValueError("Node '%s' requires parent node '%s' but it
is not in the valid list" %
diff --git a/tools/dtoc/test/dtoc_test_add_prop.dts
b/tools/dtoc/test/dtoc_test_add_prop.dts
index fa296e55527..8225de36d27 100644
--- a/tools/dtoc/test/dtoc_test_add_prop.dts
+++ b/tools/dtoc/test/dtoc_test_add_prop.dts
@@ -11,13 +11,13 @@
#address-cells = <1>;
#size-cells = <1>;
spl-test {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
intval = <1>;
};
spl-test2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "sandbox,spl-test";
intarray = <5>;
};
diff --git a/tools/dtoc/test/dtoc_test_addr32.dts
b/tools/dtoc/test/dtoc_test_addr32.dts
index 239045497c6..3e7dc567292 100644
--- a/tools/dtoc/test/dtoc_test_addr32.dts
+++ b/tools/dtoc/test/dtoc_test_addr32.dts
@@ -12,13 +12,13 @@
#size-cells = <1>;
test1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "test1";
reg = <0x1234 0x5678>;
};
test2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
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
index 7599d5b0a59..7ce16feef1a 100644
--- a/tools/dtoc/test/dtoc_test_addr32_64.dts
+++ b/tools/dtoc/test/dtoc_test_addr32_64.dts
@@ -12,19 +12,19 @@
#size-cells = <2>;
test1 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "test1";
reg = <0x1234 0x5678 0x0>;
};
test2 {
- u-boot,dm-pre-reloc;
+ bootph-all;
compatible = "test2";
reg = <0x12345678 0x98765432 0x10987654>;
};
test3 {
-