[PATCH 1/3] fdt: strerr: Remove spurious BADOVERLAY

[PATCH 1/3] fdt: strerr: Remove spurious BADOVERLAY

[Maxime Ripard]

There's one FDT_ERR_BADOVERLAY too many in the fdt error table.

Signed-off-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
---
 libfdt/fdt_strerror.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libfdt/fdt_strerror.c b/libfdt/fdt_strerror.c
index e00fcb19df60..4ab3eb70b2bd 100644
--- a/libfdt/fdt_strerror.c
+++ b/libfdt/fdt_strerror.c
@@ -78,7 +78,6 @@ static struct fdt_errtabent fdt_errtable[] = {
 	FDT_ERRTABENT(FDT_ERR_BADSTRUCTURE),
 	FDT_ERRTABENT(FDT_ERR_BADLAYOUT),
 	FDT_ERRTABENT(FDT_ERR_BADOVERLAY),
-	FDT_ERRTABENT(FDT_ERR_BADOVERLAY),
 	FDT_ERRTABENT(FDT_ERR_NOPHANDLES),
 };
 #define FDT_ERRTABSIZE	(sizeof(fdt_errtable) / sizeof(fdt_errtable[0]))
-- 
2.9.3

[PATCH 2/3] libfdt: Add fdt_overlay_apply to the exported symbols

[Maxime Ripard]

fdt_overlay_apply was not usable in the shared library. Export it to allow
its use.

Signed-off-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
---
 libfdt/version.lds | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libfdt/version.lds b/libfdt/version.lds
index 1f4e1eab2557..cff0358f2314 100644
--- a/libfdt/version.lds
+++ b/libfdt/version.lds
@@ -61,6 +61,7 @@ LIBFDT_1.2 {
 		fdt_size_cells;
 		fdt_stringlist_contains;
 		fdt_resize;
+		fdt_overlay_apply;
 
 	local:
 		*;
-- 
2.9.3

[PATCH 3/3] tests: overlay: Add test suffix to the compiled blobs

[Maxime Ripard]

The compiled blobs in the overlay tests do not have the test suffix which
is usually used to clean up and ignore the test artifacts.

Let's add that suffix.

Signed-off-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
---
 tests/run_tests.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index dc19f80b2fb6..b49fa62a74e1 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -171,23 +171,23 @@ BAD_FIXUP_TREES="bad_index \
 
 overlay_tests () {
     # Overlay tests that don't require overlay support in dtc
-    run_dtc_test -I dts -O dtb -o overlay_base.dtb overlay_base.dts
-    run_dtc_test -I dts -O dtb -o overlay_overlay.dtb overlay_overlay_nodtc.dts
-    run_test overlay overlay_base.dtb overlay_overlay.dtb
+    run_dtc_test -I dts -O dtb -o overlay_base.test.dtb overlay_base.dts
+    run_dtc_test -I dts -O dtb -o overlay_overlay.test.dtb overlay_overlay_nodtc.dts
+    run_test overlay overlay_base.test.dtb overlay_overlay.test.dtb
 
     # Overlay tests that requires overlay support in dtc
     echo "/dts-v1/; / {};" | $DTC -@ > /dev/null 2>&1
     if [ $? -eq 0 ]; then
-        run_dtc_test -@ -I dts -O dtb -o overlay_base.dtb overlay_base.dts
-        run_dtc_test -@ -I dts -O dtb -o overlay_overlay.dtb overlay_overlay_dtc.dts
-        run_test overlay overlay_base.dtb overlay_overlay.dtb
+        run_dtc_test -@ -I dts -O dtb -o overlay_base.test.dtb overlay_base.dts
+        run_dtc_test -@ -I dts -O dtb -o overlay_overlay.test.dtb overlay_overlay_dtc.dts
+        run_test overlay overlay_base.test.dtb overlay_overlay.test.dtb
     fi
 
     # Bad fixup tests
     for test in $BAD_FIXUP_TREES; do
 	tree="overlay_bad_fixup_$test"
-	run_dtc_test -I dts -O dtb -o $tree.dtb $tree.dts
-	run_test overlay_bad_fixup overlay_base.dtb $tree.dtb
+	run_dtc_test -I dts -O dtb -o $tree.test.dtb $tree.dts
+	run_test overlay_bad_fixup overlay_base.test.dtb $tree.test.dtb
     done
 }
 
-- 
2.9.3

Re: [PATCH 1/3] fdt: strerr: Remove spurious BADOVERLAY

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1053 bytes --]

On Tue, Oct 11, 2016 at 10:10:31AM +0200, Maxime Ripard wrote:
> There's one FDT_ERR_BADOVERLAY too many in the fdt error table.
> 
> Signed-off-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>

All applied to master.

> ---
>  libfdt/fdt_strerror.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/libfdt/fdt_strerror.c b/libfdt/fdt_strerror.c
> index e00fcb19df60..4ab3eb70b2bd 100644
> --- a/libfdt/fdt_strerror.c
> +++ b/libfdt/fdt_strerror.c
> @@ -78,7 +78,6 @@ static struct fdt_errtabent fdt_errtable[] = {
>  	FDT_ERRTABENT(FDT_ERR_BADSTRUCTURE),
>  	FDT_ERRTABENT(FDT_ERR_BADLAYOUT),
>  	FDT_ERRTABENT(FDT_ERR_BADOVERLAY),
> -	FDT_ERRTABENT(FDT_ERR_BADOVERLAY),
>  	FDT_ERRTABENT(FDT_ERR_NOPHANDLES),
>  };
>  #define FDT_ERRTABSIZE	(sizeof(fdt_errtable) / sizeof(fdt_errtable[0]))

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]