summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2010-08-27 16:25:47 -0700
committerKhem Raj <raj.khem@gmail.com>2010-08-28 11:31:06 -0700
commit32f795b407cc7ca3020df591f5c83e3626868d61 (patch)
tree5786566fbb926d38d49d6725e11506b1d6478c21
parente9d84bea6eaca05f649f3d8f9c3bf6adfdfd19ae (diff)
downloadopenembedded-32f795b407cc7ca3020df591f5c83e3626868d61.tar.gz
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@gmail.com>
-rw-r--r--conf/machine/omap3-pandora.conf3
-rw-r--r--recipes/u-boot/u-boot-omap3pandora_git.bb4
2 files changed, 2 insertions, 5 deletions
diff --git a/conf/machine/omap3-pandora.conf b/conf/machine/omap3-pandora.conf
index b504723afa..7c72ba972a 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 773eb18ea2..266bd71c68 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 \