[RFC PATCH v2 65/74] tests: Add a first basic test for fdtaddon

@@ -0,0 +1,24 @@
+/dts-v1/;
+
+/ {
+    base-node {
+        sub-node {
+            prop = <0x00000000>;
+            phandle = <0x00000002>;
+        };
+    };
+    somewhere {
+        node-a1 {
+            // [FDT_EXPORT_SYM] 'node_a' -> phandle 0x00000001
+            // [FDT_EXPORT_SYM] 'other' -> phandle 0x00000002
+            compatible = "abc,aaa";
+            phandle = <0x00000001>;
+        };
+        node-a2 {
+            // [FDT_EXPORT_SYM] 'node_a' -> phandle 0x00000003
+            // [FDT_EXPORT_SYM] 'other' -> phandle 0x00000002
+            compatible = "abc,aaa";
+            phandle = <0x00000003>;
+        };
+    };
+};

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
+/*
+ * Copyright (C) 2026 Bootlin
+ */
+
+/dts-v1/;
+
+/ {
+	base-node {
+		other_a: sub-node {
+			prop = <0>;
+		};
+	};
+
+	somewhere {
+		node_a1: node-a1 {
+			compatible = "abc,aaa";
+			/export/ node_a: &node_a1;
+			/export/ other: &other_a;
+		};
+		node_a2: node-a2 {
+			compatible = "abc,aaa";
+			/export/ node_a: &node_a2;
+			/export/ other: &other_a;
+		};
+	};
+};

@@ -0,0 +1,35 @@
+/dts-v1/;
+
+/ {
+
+	base-node {
+
+		sub-node {
+			prop = <0x00>;
+			phandle = <0x02>;
+		};
+	};
+
+	somewhere {
+
+		node-a1 {
+			compatible = "abc,aaa";
+			phandle = <0x01>;
+
+			/export/ node_a: &{/somewhere/node-a1};
+			/export/ other: &{/base-node/sub-node};
+
+			addon-node {
+				prop = <0x00>;
+			};
+		};
+
+		node-a2 {
+			compatible = "abc,aaa";
+			phandle = <0x03>;
+
+			/export/ node_a: &{/somewhere/node-a2};
+			/export/ other: &{/base-node/sub-node};
+		};
+	};
+};

@@ -0,0 +1,27 @@
+/dts-v1/;
+
+/ {
+    base-node {
+        sub-node {
+            prop = <0x00000000>;
+            phandle = <0x00000002>;
+        };
+    };
+    somewhere {
+        node-a1 {
+            // [FDT_EXPORT_SYM] 'node_a' -> phandle 0x00000001
+            // [FDT_EXPORT_SYM] 'other' -> phandle 0x00000002
+            compatible = "abc,aaa";
+            phandle = <0x00000001>;
+            addon-node {
+                prop = <0x00000000>;
+            };
+        };
+        node-a2 {
+            // [FDT_EXPORT_SYM] 'node_a' -> phandle 0x00000003
+            // [FDT_EXPORT_SYM] 'other' -> phandle 0x00000002
+            compatible = "abc,aaa";
+            phandle = <0x00000003>;
+        };
+    };
+};

@@ -0,0 +1,35 @@
+/dts-v1/;
+
+/ {
+
+	base-node {
+
+		sub-node {
+			prop = <0x00>;
+			phandle = <0x02>;
+		};
+	};
+
+	somewhere {
+
+		node-a1 {
+			compatible = "abc,aaa";
+			phandle = <0x01>;
+
+			/export/ node_a: &{/somewhere/node-a1};
+			/export/ other: &{/base-node/sub-node};
+		};
+
+		node-a2 {
+			compatible = "abc,aaa";
+			phandle = <0x03>;
+
+			/export/ node_a: &{/somewhere/node-a2};
+			/export/ other: &{/base-node/sub-node};
+
+			addon-node {
+				prop = <0x00>;
+			};
+		};
+	};
+};

@@ -0,0 +1,27 @@
+/dts-v1/;
+
+/ {
+    base-node {
+        sub-node {
+            prop = <0x00000000>;
+            phandle = <0x00000002>;
+        };
+    };
+    somewhere {
+        node-a1 {
+            // [FDT_EXPORT_SYM] 'node_a' -> phandle 0x00000001
+            // [FDT_EXPORT_SYM] 'other' -> phandle 0x00000002
+            compatible = "abc,aaa";
+            phandle = <0x00000001>;
+        };
+        node-a2 {
+            // [FDT_EXPORT_SYM] 'node_a' -> phandle 0x00000003
+            // [FDT_EXPORT_SYM] 'other' -> phandle 0x00000002
+            compatible = "abc,aaa";
+            phandle = <0x00000003>;
+            addon-node {
+                prop = <0x00000000>;
+            };
+        };
+    };
+};

@@ -0,0 +1,8 @@
+/dts-v1/;
+/addon/;
+
+/ {
+    addon-node {
+        prop = <0x00000000>;
+    };
+};

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
+/*
+ * Copyright (C) 2026 Bootlin
+ */
+
+/dts-v1/;
+/addon/;
+
+/ {
+	addon-node {
+		prop = <0>;
+	};
+};

@@ -144,6 +144,7 @@ run_test_types = [
   'fdtdump',
   'fdtoverlay',
   'metadata',
+  'fdtaddon',
 ]
 run_test_deps = [
   dtc_tools, treegen_dtb, tests_exe,

@@ -1281,6 +1281,48 @@ metadata_tests() {
 	run_test check_full metadata_sort.dtb
 }
 
+run_fdtaddon_test () {
+	printf "fdtaddon $*:	"
+	base_run_test wrap_test $VALGRIND $FDTADDON "$@"
+}
+
+check_dtb () {
+	local dtb="$1"
+	base_run_test wrap_fdtdump "$dtb" "$dtb.out"
+	sed -i '/^\/\/ [^\[]/d' "$dtb.out"
+	base_run_test check_diff "$dtb.out" "$SRCDIR/$dtb.expect"
+	run_test check_full "$dtb"
+}
+
+check_dts () {
+	local dts="$1"
+	base_run_test check_diff "$dts" "$SRCDIR/$dts.expect"
+}
+
+fdtaddon_tests() {
+	run_dtc_test -I dts -O dtb -o fdtaddon_base.dtb "$SRCDIR/fdtaddon_base.dts"
+	check_dtb fdtaddon_base.dtb
+
+	for dt in fdtaddon_basics1; do
+		run_dtc_test -I dts -O dtb -o $dt.dtba "$SRCDIR/$dt.dtsa"
+		check_dtb $dt.dtba
+
+		run_fdtaddon_test -i fdtaddon_base.dtb -o $dt-merged1.dtb \
+				  -t "/somewhere/node-a1" $dt.dtba
+		check_dtb $dt-merged1.dtb
+
+		run_dtc_test -I dtb -O dts -o $dt-merged1.dtb.dts $dt-merged1.dtb
+		check_dts $dt-merged1.dtb.dts
+
+		run_fdtaddon_test -i fdtaddon_base.dtb -o $dt-merged2.dtb \
+				  -t "/somewhere/node-a2" $dt.dtba
+		check_dtb $dt-merged2.dtb
+
+		run_dtc_test -I dtb -O dts -o $dt-merged2.dtb.dts $dt-merged2.dtb
+		check_dts $dt-merged2.dtb.dts
+	done
+}
+
 pylibfdt_tests () {
     run_dtc_test -I dts -O dtb -o test_props.dtb "$SRCDIR/test_props.dts"
     TMP=/tmp/tests.stderr.$$

@@ -1320,7 +1362,7 @@ while getopts "vt:me" ARG ; do
 done
 
 if [ -z "$TESTSETS" ]; then
-    TESTSETS="libfdt utilfdt dtc dtbs_equal fdtget fdtput fdtdump fdtoverlay metadata"
+    TESTSETS="libfdt utilfdt dtc dtbs_equal fdtget fdtput fdtdump fdtoverlay metadata fdtaddon"
 
     # Test pylibfdt if the libfdt Python module is available.
     if ! $no_python; then

@@ -1363,6 +1405,9 @@ for set in $TESTSETS; do
 	"metadata")
 	    metadata_tests
 	    ;;
+	"fdtaddon")
+	    fdtaddon_tests
+	    ;;
     esac
 done
 

@@ -27,6 +27,7 @@ DTGET=${TEST_BINDIR}/fdtget
 DTPUT=${TEST_BINDIR}/fdtput
 FDTDUMP=${TEST_BINDIR}/fdtdump
 FDTOVERLAY=${TEST_BINDIR}/fdtoverlay
+FDTADDON=${TEST_BINDIR}/fdtaddon
 
 verbose_run () {
     if [ -z "$QUIET_TEST" ]; then