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

[Arago Project git]

Module: meta-ti
Branch: master
Commit: 10c6e2943068003a5425763c4ad98d5c6b383dcb
URL:    http://arago-project.org/git/meta-ti.git?a=commit;h=10c6e2943068003a5425763c4ad98d5c6b383dcb

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

keystone: 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/include/keystone.inc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf/machine/include/keystone.inc b/conf/machine/include/keystone.inc
index 047cc18..72e71bf 100644
--- a/conf/machine/include/keystone.inc
+++ b/conf/machine/include/keystone.inc
@@ -4,10 +4,11 @@ require conf/machine/include/soc-family.inc
 require conf/machine/include/tune-cortexa15.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-keystone"
-PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-keystone"
+PREFERRED_PROVIDER_u-boot = "u-boot-keystone"
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r5"
+MACHINE_KERNEL_PR = "r6"
 
 KERNEL_IMAGETYPE = "uImage"