[oe-commits] Khem Raj : omap3-pandora.conf/u-boot-omap3pandora_git.bb: Use PREFERRED_PROVIDER_virtual/bootloader to select u-boot recipe to use.

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 32f795b407cc7ca3020df591f5c83e3626868d61
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=32f795b407cc7ca3020df591f5c83e3626868d61

Author: Khem Raj <raj.khem at gmail.com>
Date:   Fri Aug 27 16:25:47 2010 -0700

omap3-pandora.conf/u-boot-omap3pandora_git.bb: Use PREFERRED_PROVIDER_virtual/bootloader to select u-boot recipe to use.

* Dont PROVIDES u-boot but let user decide it.

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 conf/machine/omap3-pandora.conf           |    3 +--
 recipes/u-boot/u-boot-omap3pandora_git.bb |    4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf
index b504723..7c72ba9 100644
--- a/conf/machine/omap3-pandora.conf
+++ b/conf/machine/omap3-pandora.conf
@@ -6,7 +6,7 @@
 TARGET_ARCH = "arm"
 
 
-PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora"
+PREFERRED_PROVIDER_virtual/bootloader = "u-boot-omap3pandora"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
@@ -63,7 +63,6 @@ UBOOT_LOADADDRESS = "0x80008000"
 UBOOT_ARCH = "arm"
 UBOOT_MACHINE = "omap3_pandora_config"
 
-PREFERRED_PROVIDER_u-boot = "u-boot-omap3pandora"
 PREFERRED_PROVIDER_x-load = "x-load-omap3pandora"
 PREFERRED_VERSION_u-boot-omap3pandora = "git"
 PREFERRED_VERSION_x-load-omap3pandora = "git"
diff --git a/recipes/u-boot/u-boot-omap3pandora_git.bb b/recipes/u-boot/u-boot-omap3pandora_git.bb
index 773eb18..266bd71 100644
--- a/recipes/u-boot/u-boot-omap3pandora_git.bb
+++ b/recipes/u-boot/u-boot-omap3pandora_git.bb
@@ -5,10 +5,8 @@ COMPATIBLE_MACHINE = "omap3-pandora"
 # Latest SRCREV for the final shipping boards.
 SRCREV = "c71d8dbe09d69feda7e57745bd3909727d3cc33f"
 
-PROVIDES = "u-boot"
-
 PV = "pandora+${PR}+gitr${SRCREV}"
-PR ="r4"
+PR ="r5"
 PE = "1"
 
 SRC_URI = "git://git.openpandora.org/pandora-u-boot.git;branch=master;protocol=git \