diff options
| author | Nathan Rossi <nathan.rossi@xilinx.com> | 2014-08-25 16:58:05 -0700 |
|---|---|---|
| committer | Nathan Rossi <nathan.rossi@xilinx.com> | 2014-08-25 16:58:05 -0700 |
| commit | 350e7c311c8d661be3d62860088de2845fb4e307 (patch) | |
| tree | 977ad5928e5b362d25bbc736c7bb6f5d592cf384 /recipes-bsp | |
| parent | 83bf54daeaca21879290bf444876f9949b117454 (diff) | |
| download | meta-xilinx-350e7c311c8d661be3d62860088de2845fb4e307.tar.gz | |
u-boot-xlnx: Rename "_git" to "-dev" for master-next tracking recipe
* Change to match how the kernel recipes handle master-next tracking
* Update the SRCREV to match a newer git commit
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Diffstat (limited to 'recipes-bsp')
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-xlnx-dev.bb (renamed from recipes-bsp/u-boot/u-boot-xlnx_git.bb) | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/recipes-bsp/u-boot/u-boot-xlnx_git.bb b/recipes-bsp/u-boot/u-boot-xlnx-dev.bb index 1ba3e694..274c621c 100644 --- a/recipes-bsp/u-boot/u-boot-xlnx_git.bb +++ b/recipes-bsp/u-boot/u-boot-xlnx-dev.bb | |||
| @@ -1,11 +1,9 @@ | |||
| 1 | # This recipe allows for a 'bleeding edge' u-boot-xlnx build. | 1 | # This recipe allows for a 'bleeding edge' u-boot-xlnx build. |
| 2 | # Since this tree is frequently updated, AUTOREV is used to track its contents. | 2 | # Since this tree is frequently updated, AUTOREV is used to track its contents. |
| 3 | # | 3 | # |
| 4 | # To enable this recipe, set | 4 | # To enable this recipe, set the following in your machine or local.conf |
| 5 | # PREFERRED_VERSION_u-boot-xlnx ?= "${UBOOT_XLNX_DEV_BRANCH}" | 5 | # PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx-dev" |
| 6 | # Alternatively to track and build master branch instead, set | 6 | # PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx-dev" |
| 7 | # UBOOT_XLNX_DEV_BRANCH ?= "master" | ||
| 8 | # PREFERRED_VERSION_u-boot-xlnx ?= "${UBOOT_XLNX_DEV_BRANCH}" | ||
| 9 | 7 | ||
| 10 | UBOOT_XLNX_DEV_BRANCH ?= "master-next" | 8 | UBOOT_XLNX_DEV_BRANCH ?= "master-next" |
| 11 | 9 | ||
| @@ -14,12 +12,7 @@ include u-boot-xlnx.inc | |||
| 14 | LIC_FILES_CHKSUM = "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce1dc69f702a6c" | 12 | LIC_FILES_CHKSUM = "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce1dc69f702a6c" |
| 15 | 13 | ||
| 16 | SRC_URI = "git://github.com/Xilinx/u-boot-xlnx.git;protocol=https;branch=${UBOOT_XLNX_DEV_BRANCH}" | 14 | SRC_URI = "git://github.com/Xilinx/u-boot-xlnx.git;protocol=https;branch=${UBOOT_XLNX_DEV_BRANCH}" |
| 17 | 15 | SRCREV="67f6167a0f808ca7051a337858e0db237ce2b972" | |
| 18 | # Set default SRCREVs. SRCREVs statically set to prevent network access during | ||
| 19 | # parsing. | ||
| 20 | # AUTOREV is set in the anonymous python routine and resolved when the variables | ||
| 21 | # are finalized. | ||
| 22 | SRCREV="f40924452f947fbd6886eaa677c1b0bd47edfcf5" | ||
| 23 | 16 | ||
| 24 | python () { | 17 | python () { |
| 25 | d.setVar("SRCREV", "${AUTOREV}") | 18 | d.setVar("SRCREV", "${AUTOREV}") |
