beagleboard: switch default u-boot preference to machine-specific tree

SDKs or other users of meta-ti can still use one of the other recipes for
stability or featureset, by setting PREFERRED_PROVIDER in their config.

Signed-off-by: Denys Dmytriyenko <denys@ti.com>

diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index a65e36031c10546d4711876f3ca1a41f55f9703e..f92311993a51e7c4c1ba833f105128460321275a 100644 (file)
--- a/conf/machine/beagleboard.conf
+++ b/conf/machine/beagleboard.conf
@@ -8,6 +8,8 @@ require conf/machine/include/omap3.inc
 GUI_MACHINE_CLASS = "bigscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-mainline"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-beagleboard"
+PREFERRED_PROVIDER_u-boot = "u-boot-beagleboard"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 EXTRA_IMAGECMD_jffs2 = "-lnp"

diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 99f0c80cd9c28ac88770ab92a064f19a182a5f09..212ebe7520a3d01ac0993ec845c9381065e90444 100644 (file)
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -16,7 +16,7 @@ XSERVER = "xserver-xorg \
 GUI_MACHINE_CLASS = "bigscreen"
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r123"
+MACHINE_KERNEL_PR = "r124"
 
 KERNEL_IMAGETYPE = "uImage"