From a1da838d8188d3ed464377131d1e7ceadfa4e7f3 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Tue, 18 Sep 2012 18:57:10 +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. [GITHUB #73] Signed-off-by: Andrei Gherzan --- conf/distro/include/rpi-default-providers.inc | 7 ------- conf/distro/include/rpi-default-settings.inc | 3 --- conf/distro/include/rpi-default-versions.inc | 3 --- conf/machine/include/rpi-default-providers.inc | 7 +++++++ conf/machine/include/rpi-default-settings.inc | 3 +++ conf/machine/include/rpi-default-versions.inc | 3 +++ conf/machine/raspberrypi.conf | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 conf/distro/include/rpi-default-providers.inc delete mode 100644 conf/distro/include/rpi-default-settings.inc delete mode 100644 conf/distro/include/rpi-default-versions.inc create mode 100644 conf/machine/include/rpi-default-providers.inc create mode 100644 conf/machine/include/rpi-default-settings.inc create mode 100644 conf/machine/include/rpi-default-versions.inc diff --git a/conf/distro/include/rpi-default-providers.inc b/conf/distro/include/rpi-default-providers.inc deleted file mode 100644 index 00e378d..0000000 --- a/conf/distro/include/rpi-default-providers.inc +++ /dev/null @@ -1,7 +0,0 @@ -# RaspberryPi BSP default providers - -PREFERRED_PROVIDER_virtual/kernel = "linux-raspberrypi" -PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" -PREFERRED_PROVIDER_virtual/egl ?= "vc-graphics-hardfp" -PREFERRED_PROVIDER_virtual/libgles2 ?= "vc-graphics-hardfp" -PREFERRED_PROVIDER_virtual/libgl ?= "vc-graphics-hardfp" diff --git a/conf/distro/include/rpi-default-settings.inc b/conf/distro/include/rpi-default-settings.inc deleted file mode 100644 index 716a8bb..0000000 --- a/conf/distro/include/rpi-default-settings.inc +++ /dev/null @@ -1,3 +0,0 @@ -# RaspberryPi BSP default settings - -IMAGE_CLASSES += "sdcard_image-rpi" diff --git a/conf/distro/include/rpi-default-versions.inc b/conf/distro/include/rpi-default-versions.inc deleted file mode 100644 index 4787e42..0000000 --- a/conf/distro/include/rpi-default-versions.inc +++ /dev/null @@ -1,3 +0,0 @@ -# RaspberryPi BSP default versions - -PREFERRED_VERSION_udev = "164" diff --git a/conf/machine/include/rpi-default-providers.inc b/conf/machine/include/rpi-default-providers.inc new file mode 100644 index 0000000..00e378d --- /dev/null +++ b/conf/machine/include/rpi-default-providers.inc @@ -0,0 +1,7 @@ +# RaspberryPi BSP default providers + +PREFERRED_PROVIDER_virtual/kernel = "linux-raspberrypi" +PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" +PREFERRED_PROVIDER_virtual/egl ?= "vc-graphics-hardfp" +PREFERRED_PROVIDER_virtual/libgles2 ?= "vc-graphics-hardfp" +PREFERRED_PROVIDER_virtual/libgl ?= "vc-graphics-hardfp" diff --git a/conf/machine/include/rpi-default-settings.inc b/conf/machine/include/rpi-default-settings.inc new file mode 100644 index 0000000..716a8bb --- /dev/null +++ b/conf/machine/include/rpi-default-settings.inc @@ -0,0 +1,3 @@ +# RaspberryPi BSP default settings + +IMAGE_CLASSES += "sdcard_image-rpi" diff --git a/conf/machine/include/rpi-default-versions.inc b/conf/machine/include/rpi-default-versions.inc new file mode 100644 index 0000000..4787e42 --- /dev/null +++ b/conf/machine/include/rpi-default-versions.inc @@ -0,0 +1,3 @@ +# RaspberryPi BSP default versions + +PREFERRED_VERSION_udev = "164" diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf index cd2d3fd..775c8c1 100644 --- a/conf/machine/raspberrypi.conf +++ b/conf/machine/raspberrypi.conf @@ -3,9 +3,9 @@ #@DESCRIPTION: Machine configuration for the RaspberryPi http://www.raspberrypi.org/ Board #@MAINTAINER: John Willis -include conf/distro/include/rpi-default-settings.inc -include conf/distro/include/rpi-default-versions.inc -include conf/distro/include/rpi-default-providers.inc +include conf/machine/include/rpi-default-settings.inc +include conf/machine/include/rpi-default-versions.inc +include conf/machine/include/rpi-default-providers.inc require conf/machine/include/tune-arm1176jzf-s.inc IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg" -- cgit v1.2.3-54-g00ecf