diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-01-27 22:27:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-01-27 22:27:17 +0300 |
commit | 98cc5cd6483975b64d80e8323f7f659dd1337d75 (patch) | |
tree | 5fa64e93d57396bc4c76aa3537156205b4b424ac /poky/meta/recipes-bsp/u-boot | |
parent | 82dbc15a05125a812c140a3c8cff81c366482229 (diff) | |
parent | 8fc454f9beebdd347403145c991697019a593cff (diff) | |
download | openbmc-98cc5cd6483975b64d80e8323f7f659dd1337d75.tar.xz |
Merge tag '0.29' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'poky/meta/recipes-bsp/u-boot')
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot-common.inc | 4 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.10.bb (renamed from poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.07.bb) | 1 | ||||
-rw-r--r-- | poky/meta/recipes-bsp/u-boot/u-boot_2020.10.bb (renamed from poky/meta/recipes-bsp/u-boot/u-boot_2020.07.bb) | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc index 9199bbfe0..cbce408a2 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/poky/meta/recipes-bsp/u-boot/u-boot-common.inc @@ -7,12 +7,12 @@ SECTION = "bootloaders" DEPENDS += "flex-native bison-native" LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e" +LIC_FILES_CHKSUM = "file://Licenses/README;md5=5a7450c57ffe5ae63fd732446b988025" PE = "1" # We use the revision in order to avoid having to fetch it from the # repo during parse -SRCREV = "2f5fbb5b39f7b67044dda5c35e4a4b31685a3109" +SRCREV = "050acee119b3757fee3bd128f55d720fdd9bb890" SRC_URI = "git://git.denx.de/u-boot.git \ " diff --git a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.07.bb b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.10.bb index 7eaf721ca..ef386f76e 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.07.bb +++ b/poky/meta/recipes-bsp/u-boot/u-boot-tools_2020.10.bb @@ -1,2 +1,3 @@ require u-boot-common.inc require u-boot-tools.inc + diff --git a/poky/meta/recipes-bsp/u-boot/u-boot_2020.07.bb b/poky/meta/recipes-bsp/u-boot/u-boot_2020.10.bb index 02d67c0db..4f5b3e5df 100644 --- a/poky/meta/recipes-bsp/u-boot/u-boot_2020.07.bb +++ b/poky/meta/recipes-bsp/u-boot/u-boot_2020.10.bb @@ -2,3 +2,4 @@ require u-boot-common.inc require u-boot.inc DEPENDS += "bc-native dtc-native" + |