From 3c4e20303b272541c5529abb123a5017261bb067 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Sun, 16 Sep 2012 14:11:55 +0300 Subject: raspberrypi.conf: Remove PREFERRED_* and include rpi-default*.inc All PREFERRED_* variables were moved to an .inc file to have variables clearer. Inherit .inc files and remove PREFERRED_* variables. Signed-off-by: Andrei Gherzan --- conf/machine/raspberrypi.conf | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/conf/machine/raspberrypi.conf b/conf/machine/raspberrypi.conf index 4fd5c8c..6287c46 100755 --- a/conf/machine/raspberrypi.conf +++ b/conf/machine/raspberrypi.conf @@ -3,6 +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 require conf/machine/include/tune-arm1176jzf-s.inc INHERIT += "sdcard_image-rpi" @@ -10,15 +13,8 @@ IMAGE_FSTYPES ?= "tar.bz2 ext3 rpi-sdimg" SERIAL_CONSOLE = "115200 ttyAMA0" -PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}" MACHINE_KERNEL_PR = "r4" -PREFERRED_VERSION_udev = "164" - -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" XSERVER = " \ xserver-xorg \ xf86-input-evdev \ -- cgit v1.2.3-54-g00ecf