arm: mach-k3: Move K3 common schema.yaml out of board directory

This file is common for all K3, move it out of board/ directory and
into mach-k3. As we need to change the path in k3-binman.dtsi let's
take this opportunity to switch to absolute paths which makes adding
non-TI boards (like Toradex Verdin) not need to override these paths.

Signed-off-by: Andrew Davis <afd@ti.com>

diff --git a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
index 78c371529a48663a7decc48b91c531f8d920f43c..4e3704809a6c53b3586580354bb8e864072df757 100644 (file)
--- a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
+++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
@@ -5,72 +5,6 @@
 
 #include "k3-binman.dtsi"
 
-#ifndef CONFIG_ARM64
-
-&bcfg_yaml {
-       schema = "../../ti/common/schema.yaml";
-};
-
-&pcfg_yaml {
-       schema = "../../ti/common/schema.yaml";
-};
-
-&rcfg_yaml {
-       schema = "../../ti/common/schema.yaml";
-};
-
-&scfg_yaml {
-       schema = "../../ti/common/schema.yaml";
-};
-
-/* combined-tifs-cfg */
-
-&bcfg_yaml_tifs {
-       schema = "../../ti/common/schema.yaml";
-};
-
-&pcfg_yaml_tifs {
-       schema = "../../ti/common/schema.yaml";
-};
-
-&rcfg_yaml_tifs {
-       schema = "../../ti/common/schema.yaml";
-};
-
-&scfg_yaml_tifs {
-       schema = "../../ti/common/schema.yaml";
-};
-
-/* combined-dm-cfg */
-
-&pcfg_yaml_dm {
-       schema = "../../ti/common/schema.yaml";
-};
-
-&rcfg_yaml_dm {
-       schema = "../../ti/common/schema.yaml";
-};
-
-/* combined-sysfw-cfg */
-
-&bcfg_yaml_sysfw {
-       schema = "../../ti/common/schema.yaml";
-};
-
-&pcfg_yaml_sysfw {
-       schema = "../../ti/common/schema.yaml";
-};
-
-&rcfg_yaml_sysfw {
-       schema = "../../ti/common/schema.yaml";
-};
-
-&scfg_yaml_sysfw {
-       schema = "../../ti/common/schema.yaml";
-};
-
-#endif /* CONFIG_ARM64 */
-
 #ifdef CONFIG_TARGET_VERDIN_AM62_R5
 
 &binman {

diff --git a/arch/arm/dts/k3-binman.dtsi b/arch/arm/dts/k3-binman.dtsi
index c7513e1a5dd7096618898ee39d9be7af32d3ee30..cd9926a0169666593fbb9811878a6d1d4f2f975d 100644 (file)
--- a/arch/arm/dts/k3-binman.dtsi
+++ b/arch/arm/dts/k3-binman.dtsi
@@ -32,28 +32,28 @@
                filename = "board-cfg.bin";
                bcfg_yaml: ti-board-config {
                        config = "board-cfg.yaml";
-                       schema = "board/ti/common/schema.yaml";
+                       schema = "arch/arm/mach-k3/schema.yaml";
                };
        };
        pm-cfg {
                filename = "pm-cfg.bin";
                pcfg_yaml: ti-board-config {
                        config = "pm-cfg.yaml";
-                       schema = "board/ti/common/schema.yaml";
+                       schema = "arch/arm/mach-k3/schema.yaml";
                };
        };
        rm-cfg {
                filename = "rm-cfg.bin";
                rcfg_yaml: ti-board-config {
                        config = "rm-cfg.yaml";
-                       schema = "board/ti/common/schema.yaml";
+                       schema = "arch/arm/mach-k3/schema.yaml";
                };
        };
        sec-cfg {
                filename = "sec-cfg.bin";
                scfg_yaml: ti-board-config {
                        config = "sec-cfg.yaml";
-                       schema = "board/ti/common/schema.yaml";
+                       schema = "arch/arm/mach-k3/schema.yaml";
                };
        };
        combined-tifs-cfg {
@@ -61,19 +61,19 @@
                ti-board-config {
                        bcfg_yaml_tifs: board-cfg {
                                config = "board-cfg.yaml";
-                               schema = "board/ti/common/schema.yaml";
+                               schema = "arch/arm/mach-k3/schema.yaml";
                        };
                        scfg_yaml_tifs: sec-cfg {
                                config = "sec-cfg.yaml";
-                               schema = "board/ti/common/schema.yaml";
+                               schema = "arch/arm/mach-k3/schema.yaml";
                        };
                        pcfg_yaml_tifs: pm-cfg {
                                config = "pm-cfg.yaml";
-                               schema = "board/ti/common/schema.yaml";
+                               schema = "arch/arm/mach-k3/schema.yaml";
                        };
                        rcfg_yaml_tifs: rm-cfg {
                                config = "rm-cfg.yaml";
-                               schema = "board/ti/common/schema.yaml";
+                               schema = "arch/arm/mach-k3/schema.yaml";
                        };
                };
        };
@@ -82,11 +82,11 @@
                ti-board-config {
                        pcfg_yaml_dm: pm-cfg {
                                config = "pm-cfg.yaml";
-                               schema = "board/ti/common/schema.yaml";
+                               schema = "arch/arm/mach-k3/schema.yaml";
                        };
                        rcfg_yaml_dm: rm-cfg {
                                config = "rm-cfg.yaml";
-                               schema = "board/ti/common/schema.yaml";
+                               schema = "arch/arm/mach-k3/schema.yaml";
                        };
                };
        };
@@ -95,19 +95,19 @@
                ti-board-config {
                        bcfg_yaml_sysfw: board-cfg {
                                config = "board-cfg.yaml";
-                               schema = "board/ti/common/schema.yaml";
+                               schema = "arch/arm/mach-k3/schema.yaml";
                        };
                        scfg_yaml_sysfw: sec-cfg {
                                config = "sec-cfg.yaml";
-                               schema = "board/ti/common/schema.yaml";
+                               schema = "arch/arm/mach-k3/schema.yaml";
                        };
                        pcfg_yaml_sysfw: pm-cfg {
                                config = "pm-cfg.yaml";
-                               schema = "board/ti/common/schema.yaml";
+                               schema = "arch/arm/mach-k3/schema.yaml";
                        };
                        rcfg_yaml_sysfw: rm-cfg {
                                config = "rm-cfg.yaml";
-                               schema = "board/ti/common/schema.yaml";
+                               schema = "arch/arm/mach-k3/schema.yaml";
                        };
                };
        };

diff --git a/board/ti/common/schema.yaml b/arch/arm/mach-k3/schema.yaml
similarity index 100%
rename from board/ti/common/schema.yaml
rename to arch/arm/mach-k3/schema.yaml