From fba5805ed826ca556434911f67cd7a0aed987990 Mon Sep 17 00:00:00 2001
From: SzuWei Lin <szuweilin@google.com>
Date: Mon, 20 Mar 2017 16:11:17 +0800
Subject: Handle overlaying without node __symbols__

In new version of dtc, it does not always generate __symbols__ node:

https://github.com/dgibson/dtc/commit/e3c769aa9c16e7b94051c5eaae6635e79ac19385

Revises libufdt to handle main DT without node __symbols__.

Bug: 35230516
Test: tests/run_tests.sh
Change-Id: Ie086abc93ed4d45e4fe28c1d8c48fd37873256c1
---
 tests/run_tests.sh                            |  9 +++++++++
 tests/testdata/base_no_symbols-base.dts       |  7 +++++++
 tests/testdata/base_no_symbols-overlay.dts    | 10 ++++++++++
 tests/testdata/empty_overlay-base.dts         |  4 ++++
 tests/testdata/empty_overlay-overlay.dts      |  4 ++++
 tests/testdata/overlay_no_symbols-base.dts    |  7 +++++++
 tests/testdata/overlay_no_symbols-overlay.dts |  4 ++++
 7 files changed, 45 insertions(+)
 create mode 100644 tests/testdata/base_no_symbols-base.dts
 create mode 100644 tests/testdata/base_no_symbols-overlay.dts
 create mode 100644 tests/testdata/empty_overlay-base.dts
 create mode 100644 tests/testdata/empty_overlay-overlay.dts
 create mode 100644 tests/testdata/overlay_no_symbols-base.dts
 create mode 100644 tests/testdata/overlay_no_symbols-overlay.dts

(limited to 'tests')

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index eda6d5c..4513950 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -60,6 +60,15 @@ main() {
   run_test_case \
     "node_ordering" \
     "Run test about node ordering"
+  run_test_case \
+    "base_no_symbols" \
+    "Run test about base dtb without __symbols__"
+  run_test_case \
+    "overlay_no_symbols" \
+    "Run test about overlay dtb without __symbols__"
+  run_test_case \
+    "empty_overlay" \
+    "Run test about overlaying with empty base and overlay dt"
   )
 
   if [ $? -ne 0 ]; then
diff --git a/tests/testdata/base_no_symbols-base.dts b/tests/testdata/base_no_symbols-base.dts
new file mode 100644
index 0000000..b9d77f8
--- /dev/null
+++ b/tests/testdata/base_no_symbols-base.dts
@@ -0,0 +1,7 @@
+/dts-v1/;
+
+/ {
+  x {};
+};
+
+
diff --git a/tests/testdata/base_no_symbols-overlay.dts b/tests/testdata/base_no_symbols-overlay.dts
new file mode 100644
index 0000000..509dae7
--- /dev/null
+++ b/tests/testdata/base_no_symbols-overlay.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+/plugin/;
+
+/{
+  a: a {};
+};
+
+&a {
+  b {};
+};
diff --git a/tests/testdata/empty_overlay-base.dts b/tests/testdata/empty_overlay-base.dts
new file mode 100644
index 0000000..e160dad
--- /dev/null
+++ b/tests/testdata/empty_overlay-base.dts
@@ -0,0 +1,4 @@
+/dts-v1/;
+
+/ {
+};
diff --git a/tests/testdata/empty_overlay-overlay.dts b/tests/testdata/empty_overlay-overlay.dts
new file mode 100644
index 0000000..00c2422
--- /dev/null
+++ b/tests/testdata/empty_overlay-overlay.dts
@@ -0,0 +1,4 @@
+/dts-v1/;
+/plugin/;
+
+/{};
diff --git a/tests/testdata/overlay_no_symbols-base.dts b/tests/testdata/overlay_no_symbols-base.dts
new file mode 100644
index 0000000..025dae4
--- /dev/null
+++ b/tests/testdata/overlay_no_symbols-base.dts
@@ -0,0 +1,7 @@
+/dts-v1/;
+
+/ {
+  x: x {};
+};
+
+
diff --git a/tests/testdata/overlay_no_symbols-overlay.dts b/tests/testdata/overlay_no_symbols-overlay.dts
new file mode 100644
index 0000000..2030c45
--- /dev/null
+++ b/tests/testdata/overlay_no_symbols-overlay.dts
@@ -0,0 +1,4 @@
+/dts-v1/;
+/plugin/;
+
+/ {};
-- 
cgit v1.2.3