Patchwork [meta-xilinx] u-boot-xilinx_git: Update recipe to support fetching from separate git repositories for virtex5 and microblaze.

login
register
mail settings
Submitter Elvis Dowson
Date June 3, 2012, 9:30 a.m.
Message ID <4fcb2eb5.f34bb40a.3bbd.45cd@mx.google.com>
Download mbox | patch
Permalink /patch/29177/
State Accepted
Headers show

Comments

Elvis Dowson - June 3, 2012, 9:30 a.m.
From: Elvis Dowson <elvis.dowson@gmail.com>

* virtex5: Modify SRC_URI_virtex5 to fetch u-boot from
  git://git.denx.de/u-boot.git
* virtex5: Update to u-boot v2012.04.01
* microblaze: Retain SRC_URL_microblaze to fetch u-boot from
  git://git.xilinx.com/u-boot-xlnx.git
* microblaze: Retain u-boot v2009.11

Signed-off-by: Elvis Dowson <elvis.dowson@gmail.com>
---
 recipes-bsp/u-boot/u-boot-xilinx_git.bb |   27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

Patch

diff --git a/recipes-bsp/u-boot/u-boot-xilinx_git.bb b/recipes-bsp/u-boot/u-boot-xilinx_git.bb
index 759539f..af9ef45 100644
--- a/recipes-bsp/u-boot/u-boot-xilinx_git.bb
+++ b/recipes-bsp/u-boot/u-boot-xilinx_git.bb
@@ -1,22 +1,29 @@ 
 inherit xilinx-boot xilinx-utils
 require recipes-bsp/u-boot/u-boot.inc
 
-PR = "r15"
-PV = "v2009.11"
+PR = "r16"
+PV_virtex5    = "v2012.04.01"
+PV_microblaze = "v2009.11"
+
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b"
+LIC_FILES_CHKSUM_virtex5 = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
+LIC_FILES_CHKSUM_microblaze = "file://COPYING;md5=4c6cde5df68eff615d36789dc18edd3b"
+
+# Virtex-5 src location
+KBRANCH_virtex5 = "master"
+SRC_URI_virtex5 = "git://git.denx.de/u-boot.git;branch=${KBRANCH};protocol=git"
+SRCREV_${PN}_virtex5 = "415d386877df49eb051b85ef74fa59a16dc17c7d"
 
-KBRANCH = "master"
-KBRANCH_microblaze = "microblaze"
 # Microblaze src location
-SRC_URI = "git://git.xilinx.com/u-boot-xlnx.git;branch=${KBRANCH};protocol=git \
+KBRANCH_microblaze = "microblaze"
+SRC_URI_microblaze = "git://git.xilinx.com/u-boot-xlnx.git;branch=${KBRANCH};protocol=git \
            file://ml405-add-uartlite-config-options.patch \
            file://ml405-replace-hardcode-macros-for-uartns550.patch \
            file://ml507-add-uartlite-config-options.patch \
-           file://ml507-replace-hardcode-macros-for-uartns550.patch"
-SRU_URI_microblaze += " file://microblaze-genric-add-spi-flash-config.patch \
-                        file://board-microblaze-monitor-flash-len.patch \
-                        file://cfi_flash-define-monitor_flash_len.patch"
+           file://ml507-replace-hardcode-macros-for-uartns550.patch \
+           file://microblaze-genric-add-spi-flash-config.patch \
+           file://board-microblaze-monitor-flash-len.patch \
+           file://cfi_flash-define-monitor_flash_len.patch"
 
 XILINX_BOARD ?= "${@find_board(bb.data.getVar('XILINX_BSP_PATH', d, 1), d)}"