[meta-ti] Denys Dmytriyenko : beagleboard: switch default u-boot preference to machine-specific tree

[Arago Project git]

Module: meta-ti
Branch: danny
Commit: 6a02716519df5526f63b23b9a763bb14d33434cd
URL:    http://arago-project.org/git/meta-ti.git?a=commit;h=6a02716519df5526f63b23b9a763bb14d33434cd

Author: Denys Dmytriyenko <denys at ti.com>
Date:   Mon Mar 18 18:27:45 2013 -0400

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 at ti.com>

---

 conf/machine/beagleboard.conf  |    2 ++
 conf/machine/include/omap3.inc |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/conf/machine/beagleboard.conf b/conf/machine/beagleboard.conf
index a65e360..f923119 100644
--- 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 99f0c80..212ebe7 100644
--- 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"