test: overlay: rename overlay source files to .dtso

Distinguish more clearly between source files meant for producing .dtb
from those meant for producing .dtbo.

In this case, the files are really meant to be compiled to .dtbo ->
.dtbo.S -> .dtbo.o that get embedded in the image, which means that
the begin/end symbols generated by the makefile rule changes to
__dtbo_ rather than __dtb, so the consuming .c file needs updating,
but this should not result in any functional change.

Note that in the linux tree, all device tree overlay sources have been
renamed to .dtso, and the .dts->.dtbo rule is gone since v6.5 (commit
81d362732bac). So this is also a step towards staying closer to linux
with respect to both Kbuild and device tree sources.

Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Simon Glass <sjg@chromium.org>
Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>

diff --git a/test/overlay/Makefile b/test/overlay/Makefile
index 2deec929abf1205f0ae70ef9288d2cf8ffbe5e20..47937e3c1086693e2629b57d1da74d3c966cdb2d 100644 (file)
--- a/test/overlay/Makefile
+++ b/test/overlay/Makefile
@@ -10,5 +10,5 @@ DTC_FLAGS += -@
 
 # DT overlays
 obj-y += test-fdt-base.dtb.o
-obj-y += test-fdt-overlay.dtb.o
-obj-y += test-fdt-overlay-stacked.dtb.o
+obj-y += test-fdt-overlay.dtbo.o
+obj-y += test-fdt-overlay-stacked.dtbo.o

diff --git a/test/overlay/cmd_ut_overlay.c b/test/overlay/cmd_ut_overlay.c
index bcb29a26e216a55af8c28775355858ab845119ae..256afd115d2c5492a6088bd2734788c4bfb8ed50 100644 (file)
--- a/test/overlay/cmd_ut_overlay.c
+++ b/test/overlay/cmd_ut_overlay.c
@@ -21,8 +21,8 @@
 #define FDT_COPY_SIZE  (4 * SZ_1K)
 
 extern u32 __dtb_test_fdt_base_begin;
-extern u32 __dtb_test_fdt_overlay_begin;
-extern u32 __dtb_test_fdt_overlay_stacked_begin;
+extern u32 __dtbo_test_fdt_overlay_begin;
+extern u32 __dtbo_test_fdt_overlay_stacked_begin;
 
 static void *fdt;
 
@@ -216,8 +216,8 @@ int do_ut_overlay(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
        const int n_ents = UNIT_TEST_SUITE_COUNT(overlay_test);
        struct unit_test_state *uts;
        void *fdt_base = &__dtb_test_fdt_base_begin;
-       void *fdt_overlay = &__dtb_test_fdt_overlay_begin;
-       void *fdt_overlay_stacked = &__dtb_test_fdt_overlay_stacked_begin;
+       void *fdt_overlay = &__dtbo_test_fdt_overlay_begin;
+       void *fdt_overlay_stacked = &__dtbo_test_fdt_overlay_stacked_begin;
        void *fdt_overlay_copy, *fdt_overlay_stacked_copy;
        int ret = -ENOMEM;
 

diff --git a/test/overlay/test-fdt-overlay-stacked.dts b/test/overlay/test-fdt-overlay-stacked.dtso
similarity index 100%
rename from test/overlay/test-fdt-overlay-stacked.dts
rename to test/overlay/test-fdt-overlay-stacked.dtso

diff --git a/test/overlay/test-fdt-overlay.dts b/test/overlay/test-fdt-overlay.dtso
similarity index 100%
rename from test/overlay/test-fdt-overlay.dts
rename to test/overlay/test-fdt-overlay.dtso