From: Khem Raj Date: Fri, 27 Aug 2010 23:25:47 +0000 (-0700) Subject: omap3-pandora.conf/u-boot-omap3pandora_git.bb: Use PREFERRED_PROVIDER_virtual/bootloa... X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32f795b407cc7ca3020df591f5c83e3626868d61;p=openembedded.git 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 --- 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 \