From 9307071acd06a5745fc6c88596649d0a1af282f9 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Tue, 18 Sep 2012 17:24:30 +0300 Subject: [PATCH] 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 --- .../{distro => machine}/include/fsl-default-providers.inc | 0 .../{distro => machine}/include/fsl-default-settings.inc | 0 .../{distro => machine}/include/fsl-default-versions.inc | 0 meta-fsl-arm/conf/machine/include/imx-base.inc | 6 +++--- meta-fsl-arm/conf/machine/include/mxs-base.inc | 6 +++--- 5 files changed, 6 insertions(+), 6 deletions(-) rename meta-fsl-arm/conf/{distro => machine}/include/fsl-default-providers.inc (100%) rename meta-fsl-arm/conf/{distro => machine}/include/fsl-default-settings.inc (100%) rename meta-fsl-arm/conf/{distro => machine}/include/fsl-default-versions.inc (100%) 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 20467c76..68a19112 100644 --- 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 486e914d..64099377 100644 --- 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 -- 2.40.1