Move fsl-default*.inc from distro to machine

It makes no sense to have distro related configurations in a BSP
layer. So let's have these common parts (provides, version etc)
in machine directory instead.

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>

diff --git a/meta-fsl-arm/conf/distro/include/fsl-default-providers.inc b/meta-fsl-arm/conf/machine/include/fsl-default-providers.inc
similarity index 100%
rename from meta-fsl-arm/conf/distro/include/fsl-default-providers.inc
rename to meta-fsl-arm/conf/machine/include/fsl-default-providers.inc

diff --git a/meta-fsl-arm/conf/distro/include/fsl-default-settings.inc b/meta-fsl-arm/conf/machine/include/fsl-default-settings.inc
similarity index 100%
rename from meta-fsl-arm/conf/distro/include/fsl-default-settings.inc
rename to meta-fsl-arm/conf/machine/include/fsl-default-settings.inc

diff --git a/meta-fsl-arm/conf/distro/include/fsl-default-versions.inc b/meta-fsl-arm/conf/machine/include/fsl-default-versions.inc
similarity index 100%
rename from meta-fsl-arm/conf/distro/include/fsl-default-versions.inc
rename to meta-fsl-arm/conf/machine/include/fsl-default-versions.inc

diff --git a/meta-fsl-arm/conf/machine/include/imx-base.inc b/meta-fsl-arm/conf/machine/include/imx-base.inc
index 20467c766901e93e9a6d2298ff197ea735dfb5c9..68a191127a1f2229633a175cb410c01401fb29b5 100644 (file)
--- a/meta-fsl-arm/conf/machine/include/imx-base.inc
+++ b/meta-fsl-arm/conf/machine/include/imx-base.inc
@@ -1,8 +1,8 @@
 # Provides the i.MX common settings
 
-include conf/distro/include/fsl-default-settings.inc
-include conf/distro/include/fsl-default-versions.inc
-include conf/distro/include/fsl-default-providers.inc
+include conf/machine/include/fsl-default-settings.inc
+include conf/machine/include/fsl-default-versions.inc
+include conf/machine/include/fsl-default-providers.inc
 
 # Set specific make target and binary suffix
 UBOOT_MAKE_TARGET = "u-boot.imx"

diff --git a/meta-fsl-arm/conf/machine/include/mxs-base.inc b/meta-fsl-arm/conf/machine/include/mxs-base.inc
index 486e914d781db95eb893e8b49068070fd03bd242..6409937761b6d453353981228fce9279a9f1fd67 100644 (file)
--- a/meta-fsl-arm/conf/machine/include/mxs-base.inc
+++ b/meta-fsl-arm/conf/machine/include/mxs-base.inc
@@ -1,8 +1,8 @@
 # Provides the i.MXS common settings
 
-include conf/distro/include/fsl-default-settings.inc
-include conf/distro/include/fsl-default-versions.inc
-include conf/distro/include/fsl-default-providers.inc
+include conf/machine/include/fsl-default-settings.inc
+include conf/machine/include/fsl-default-versions.inc
+include conf/machine/include/fsl-default-providers.inc
 
 include conf/machine/include/soc-family.inc
 include conf/machine/include/tune-arm926ejs.inc