aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2012-09-13 14:10:33 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2012-09-13 14:10:40 -0300
commit6deabdc1bc9698ac40b8822a3f86a599f3fcae60 (patch)
tree383c423231a002f0178cb13aff18677b802e4267 /conf
parent2e51766a36752e2a89e5a96ea6b4db3dc4d34145 (diff)
parent749e8333698cae764ccc13a969f24c0942a868c9 (diff)
downloadmeta-fsl-arm-6deabdc1bc9698ac40b8822a3f86a599f3fcae60.tar.gz
meta-fsl-arm-6deabdc1bc9698ac40b8822a3f86a599f3fcae60.tar.bz2
meta-fsl-arm-6deabdc1bc9698ac40b8822a3f86a599f3fcae60.zip
Merge remote branch 'freescale/denzil' into master
* freescale/denzil: mxs-base.inc: Use xserver-xorg instead of xserver-xorg-lite imx-base.inc: Use xserver-xorg instead of xserver-xorg-lite fsl-default-providers.inc: Change virtual/xserver to xserver-xorg imx-base.inc: Remove useless SoC override for U-Boot settings u-boot: Fix mx28evk bootargs
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/fsl-default-providers.inc2
-rw-r--r--conf/machine/include/imx-base.inc8
-rw-r--r--conf/machine/include/mxs-base.inc2
3 files changed, 5 insertions, 7 deletions
diff --git a/conf/distro/include/fsl-default-providers.inc b/conf/distro/include/fsl-default-providers.inc
index 3a9427f..ef0805c 100644
--- a/conf/distro/include/fsl-default-providers.inc
+++ b/conf/distro/include/fsl-default-providers.inc
@@ -1,6 +1,6 @@
# Freescale BSP default providers
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg-lite"
+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/imx-base.inc b/conf/machine/include/imx-base.inc
index 528c11d..8de0aea 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -5,12 +5,10 @@ include conf/distro/include/fsl-default-versions.inc
include conf/distro/include/fsl-default-providers.inc
# Set specific make target and binary suffix
-UBOOT_MAKE_TARGET_mx5 = "u-boot.imx"
-UBOOT_SUFFIX_mx5 = "imx"
-UBOOT_MAKE_TARGET_mx6 = "u-boot.imx"
-UBOOT_SUFFIX_mx6 = "imx"
+UBOOT_MAKE_TARGET = "u-boot.imx"
+UBOOT_SUFFIX = "imx"
-XSERVER = "xserver-xorg-lite \
+XSERVER = "xserver-xorg \
xf86-input-evdev \
xf86-video-imxfb"
diff --git a/conf/machine/include/mxs-base.inc b/conf/machine/include/mxs-base.inc
index 1ca84d9..486e914 100644
--- a/conf/machine/include/mxs-base.inc
+++ b/conf/machine/include/mxs-base.inc
@@ -9,7 +9,7 @@ include conf/machine/include/tune-arm926ejs.inc
SOC_FAMILY = "mxs"
-XSERVER = "xserver-xorg-lite \
+XSERVER = "xserver-xorg \
xf86-input-evdev \
xf86-video-fbdev"