From 207ea522a15388a088aaea7440e29dbe15a1b5e3 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Tue, 18 Sep 2012 17:24:30 +0300 Subject: 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 --- conf/distro/include/fsl-default-providers.inc | 6 ------ conf/distro/include/fsl-default-settings.inc | 3 --- conf/distro/include/fsl-default-versions.inc | 3 --- conf/machine/include/fsl-default-providers.inc | 6 ++++++ conf/machine/include/fsl-default-settings.inc | 3 +++ conf/machine/include/fsl-default-versions.inc | 3 +++ conf/machine/include/imx-base.inc | 6 +++--- conf/machine/include/mxs-base.inc | 6 +++--- 8 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 conf/distro/include/fsl-default-providers.inc delete mode 100644 conf/distro/include/fsl-default-settings.inc delete mode 100644 conf/distro/include/fsl-default-versions.inc create mode 100644 conf/machine/include/fsl-default-providers.inc create mode 100644 conf/machine/include/fsl-default-settings.inc create mode 100644 conf/machine/include/fsl-default-versions.inc diff --git a/conf/distro/include/fsl-default-providers.inc b/conf/distro/include/fsl-default-providers.inc deleted file mode 100644 index ef0805c..0000000 --- a/conf/distro/include/fsl-default-providers.inc +++ /dev/null @@ -1,6 +0,0 @@ -# Freescale BSP default providers - -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -PREFERRED_PROVIDER_virtual/kernel ?= "linux-imx" -PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-imx" -PREFERRED_PROVIDER_u-boot ?= "u-boot" diff --git a/conf/distro/include/fsl-default-settings.inc b/conf/distro/include/fsl-default-settings.inc deleted file mode 100644 index b36e75a..0000000 --- a/conf/distro/include/fsl-default-settings.inc +++ /dev/null @@ -1,3 +0,0 @@ -# Freescale BSP default settings - -IMAGE_CLASSES += "image_types_fsl" diff --git a/conf/distro/include/fsl-default-versions.inc b/conf/distro/include/fsl-default-versions.inc deleted file mode 100644 index 5319f34..0000000 --- a/conf/distro/include/fsl-default-versions.inc +++ /dev/null @@ -1,3 +0,0 @@ -# Freescale BSP default versions - -PREFERRED_VERSION_udev = "173" diff --git a/conf/machine/include/fsl-default-providers.inc b/conf/machine/include/fsl-default-providers.inc new file mode 100644 index 0000000..ef0805c --- /dev/null +++ b/conf/machine/include/fsl-default-providers.inc @@ -0,0 +1,6 @@ +# Freescale BSP default providers + +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +PREFERRED_PROVIDER_virtual/kernel ?= "linux-imx" +PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-imx" +PREFERRED_PROVIDER_u-boot ?= "u-boot" diff --git a/conf/machine/include/fsl-default-settings.inc b/conf/machine/include/fsl-default-settings.inc new file mode 100644 index 0000000..b36e75a --- /dev/null +++ b/conf/machine/include/fsl-default-settings.inc @@ -0,0 +1,3 @@ +# Freescale BSP default settings + +IMAGE_CLASSES += "image_types_fsl" diff --git a/conf/machine/include/fsl-default-versions.inc b/conf/machine/include/fsl-default-versions.inc new file mode 100644 index 0000000..5319f34 --- /dev/null +++ b/conf/machine/include/fsl-default-versions.inc @@ -0,0 +1,3 @@ +# Freescale BSP default versions + +PREFERRED_VERSION_udev = "173" diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 20467c7..68a1911 100644 --- a/conf/machine/include/imx-base.inc +++ b/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/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc index 486e914..6409937 100644 --- a/conf/machine/include/mxs-base.inc +++ b/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 -- cgit v1.2.3-54-g00ecf