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

4 files changed, 7 insertions, 9 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"
 
diff --git a/recipes-bsp/u-boot/u-boot_2012.04.01.bb b/recipes-bsp/u-boot/u-boot_2012.04.01.bb
index 82c79bb..b18920b 100644
--- a/recipes-bsp/u-boot/u-boot_2012.04.01.bb
+++ b/recipes-bsp/u-boot/u-boot_2012.04.01.bb
@@ -6,10 +6,10 @@ COMPATIBLE_MACHINE = "(imx28evk|mx5|mx6)"
 
 DEPENDS_mxs += "elftosb-native"
 
-SRCREV = "4e6e82429c127d6084b3a3cde5f2f2c4ea63440b"
+SRCREV = "560b63a4fc0f293ab2bfde015781a8f48f2c24c4"
 
 PV = "v2012.04.01"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "git://github.com/Freescale/u-boot-imx.git"