Otherwise boards cannot include board files from the kernel dts without getting the file ordering wrong. Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- arch/arm/dts/imx6dl-cm-fx6.dts | 1 + arch/arm/dts/imx6dl-dfi-fs700-m60-6s.dts | 1 + arch/arm/dts/imx6dl-eltec-hipercam.dts | 1 + arch/arm/dts/imx6dl-nitrogen6x.dts | 1 + arch/arm/dts/imx6dl-phytec-pfla02.dtsi | 1 + arch/arm/dts/imx6dl-sabrelite.dts | 1 + arch/arm/dts/imx6dl-tqma6s.dtsi | 1 + arch/arm/dts/imx6dl.dtsi | 1 - arch/arm/dts/imx6s-phytec-pfla02.dtsi | 1 + arch/arm/dts/imx6s-riotboard.dts | 1 + 10 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/dts/imx6dl-cm-fx6.dts b/arch/arm/dts/imx6dl-cm-fx6.dts index d33d14c..0d96b46 100644 --- a/arch/arm/dts/imx6dl-cm-fx6.dts +++ b/arch/arm/dts/imx6dl-cm-fx6.dts @@ -13,6 +13,7 @@ /dts-v1/; #include "imx6dl.dtsi" +#include <arm/imx6dl.dtsi> #include "imx6qdl-cm-fx6.dtsi" / { diff --git a/arch/arm/dts/imx6dl-dfi-fs700-m60-6s.dts b/arch/arm/dts/imx6dl-dfi-fs700-m60-6s.dts index 36ea00b..bee4c76 100644 --- a/arch/arm/dts/imx6dl-dfi-fs700-m60-6s.dts +++ b/arch/arm/dts/imx6dl-dfi-fs700-m60-6s.dts @@ -15,6 +15,7 @@ #endif #include "imx6dl.dtsi" +#include <arm/imx6dl.dtsi> #include "imx6qdl-dfi-fs700-m60.dtsi" / { diff --git a/arch/arm/dts/imx6dl-eltec-hipercam.dts b/arch/arm/dts/imx6dl-eltec-hipercam.dts index 166f8f1..592358f 100644 --- a/arch/arm/dts/imx6dl-eltec-hipercam.dts +++ b/arch/arm/dts/imx6dl-eltec-hipercam.dts @@ -1,6 +1,7 @@ /dts-v1/; #include "imx6dl.dtsi" +#include <arm/imx6dl.dtsi> / { model = "ELTEC HiPerCam"; diff --git a/arch/arm/dts/imx6dl-nitrogen6x.dts b/arch/arm/dts/imx6dl-nitrogen6x.dts index 5f4d33c..3ac9ff3 100644 --- a/arch/arm/dts/imx6dl-nitrogen6x.dts +++ b/arch/arm/dts/imx6dl-nitrogen6x.dts @@ -13,6 +13,7 @@ /dts-v1/; #include "imx6dl.dtsi" +#include <arm/imx6dl.dtsi> #include "imx6qdl-nitrogen6x.dtsi" / { diff --git a/arch/arm/dts/imx6dl-phytec-pfla02.dtsi b/arch/arm/dts/imx6dl-phytec-pfla02.dtsi index 47154d5..e0541e0 100644 --- a/arch/arm/dts/imx6dl-phytec-pfla02.dtsi +++ b/arch/arm/dts/imx6dl-phytec-pfla02.dtsi @@ -10,6 +10,7 @@ */ #include "imx6dl.dtsi" +#include <arm/imx6dl.dtsi> #include "imx6qdl-phytec-pfla02.dtsi" / { diff --git a/arch/arm/dts/imx6dl-sabrelite.dts b/arch/arm/dts/imx6dl-sabrelite.dts index 2de0447..907ed28 100644 --- a/arch/arm/dts/imx6dl-sabrelite.dts +++ b/arch/arm/dts/imx6dl-sabrelite.dts @@ -12,6 +12,7 @@ /dts-v1/; #include "imx6dl.dtsi" +#include <arm/imx6dl.dtsi> #include "imx6qdl-sabrelite.dtsi" / { diff --git a/arch/arm/dts/imx6dl-tqma6s.dtsi b/arch/arm/dts/imx6dl-tqma6s.dtsi index b2cbb29..23081ed 100644 --- a/arch/arm/dts/imx6dl-tqma6s.dtsi +++ b/arch/arm/dts/imx6dl-tqma6s.dtsi @@ -10,6 +10,7 @@ */ #include "imx6dl.dtsi" +#include <arm/imx6dl.dtsi> #include "imx6qdl-tqma6x.dtsi" &iomuxc { diff --git a/arch/arm/dts/imx6dl.dtsi b/arch/arm/dts/imx6dl.dtsi index 4daf040..5b257db 100644 --- a/arch/arm/dts/imx6dl.dtsi +++ b/arch/arm/dts/imx6dl.dtsi @@ -1,2 +1 @@ #include "imx6qdl.dtsi" -#include <arm/imx6dl.dtsi> diff --git a/arch/arm/dts/imx6s-phytec-pfla02.dtsi b/arch/arm/dts/imx6s-phytec-pfla02.dtsi index d84fa4f..25af12f 100644 --- a/arch/arm/dts/imx6s-phytec-pfla02.dtsi +++ b/arch/arm/dts/imx6s-phytec-pfla02.dtsi @@ -10,6 +10,7 @@ */ #include "imx6dl.dtsi" +#include <arm/imx6dl.dtsi> #include "imx6qdl-phytec-pfla02.dtsi" / { diff --git a/arch/arm/dts/imx6s-riotboard.dts b/arch/arm/dts/imx6s-riotboard.dts index a522dd9..e14363f 100644 --- a/arch/arm/dts/imx6s-riotboard.dts +++ b/arch/arm/dts/imx6s-riotboard.dts @@ -7,6 +7,7 @@ /dts-v1/; #include "imx6dl.dtsi" +#include <arm/imx6dl.dtsi> / { model = "RIoTboard Solo"; -- 2.6.1 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox