diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-05-18 12:58:01 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-20 22:52:22 +0100 |
| commit | 243c7d8c468772df0173bb096dbc2c8f583d7ce1 (patch) | |
| tree | 0ad244bc5b88293342f06957a505224778b3e5ac | |
| parent | 58dfb1a1262027860907ff718095720fb1265f45 (diff) | |
| download | poky-243c7d8c468772df0173bb096dbc2c8f583d7ce1.tar.gz | |
u-boot: upgrade 2022.01 -> 2022.04
Change to a tools-only defconfig.
Add gnutls/util-linux dependency for mkeficapsule.
(From OE-Core rev: a9c5f9033343ad2e26539854ccde2f116528f235)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-common.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-tools.inc | 4 | ||||
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-tools_2022.04.bb (renamed from meta/recipes-bsp/u-boot/u-boot-tools_2022.01.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot_2022.04.bb (renamed from meta/recipes-bsp/u-boot/u-boot_2022.01.bb) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc index d366f10398..8fc33608d0 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common.inc | |||
| @@ -12,7 +12,7 @@ PE = "1" | |||
| 12 | 12 | ||
| 13 | # We use the revision in order to avoid having to fetch it from the | 13 | # We use the revision in order to avoid having to fetch it from the |
| 14 | # repo during parse | 14 | # repo during parse |
| 15 | SRCREV = "d637294e264adfeb29f390dfc393106fd4d41b17" | 15 | SRCREV = "e4b6ebd3de982ae7185dbf689a030e73fd06e0d2" |
| 16 | 16 | ||
| 17 | SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" | 17 | SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master" |
| 18 | 18 | ||
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools.inc b/meta/recipes-bsp/u-boot/u-boot-tools.inc index 7eda6a0897..a8d7fab46d 100644 --- a/meta/recipes-bsp/u-boot/u-boot-tools.inc +++ b/meta/recipes-bsp/u-boot/u-boot-tools.inc | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | SUMMARY = "U-Boot bootloader tools" | 1 | SUMMARY = "U-Boot bootloader tools" |
| 2 | DEPENDS += "openssl" | 2 | DEPENDS += "gnutls openssl util-linux" |
| 3 | 3 | ||
| 4 | PROVIDES = "${MLPREFIX}u-boot-mkimage ${MLPREFIX}u-boot-mkenvimage" | 4 | PROVIDES = "${MLPREFIX}u-boot-mkimage ${MLPREFIX}u-boot-mkenvimage" |
| 5 | PROVIDES:class-native = "u-boot-mkimage-native u-boot-mkenvimage-native" | 5 | PROVIDES:class-native = "u-boot-mkimage-native u-boot-mkenvimage-native" |
| @@ -38,7 +38,7 @@ do_compile () { | |||
| 38 | # (i.e. creating a hardlink dirties the index) | 38 | # (i.e. creating a hardlink dirties the index) |
| 39 | cd ${S}; git diff; cd ${B} | 39 | cd ${S}; git diff; cd ${B} |
| 40 | 40 | ||
| 41 | oe_runmake -C ${S} sandbox_defconfig O=${B} | 41 | oe_runmake -C ${S} tools-only_defconfig O=${B} |
| 42 | 42 | ||
| 43 | # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and | 43 | # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and |
| 44 | # generating it requires bin2header tool, which for target build | 44 | # generating it requires bin2header tool, which for target build |
diff --git a/meta/recipes-bsp/u-boot/u-boot-tools_2022.01.bb b/meta/recipes-bsp/u-boot/u-boot-tools_2022.04.bb index 7eaf721ca8..7eaf721ca8 100644 --- a/meta/recipes-bsp/u-boot/u-boot-tools_2022.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot-tools_2022.04.bb | |||
diff --git a/meta/recipes-bsp/u-boot/u-boot_2022.01.bb b/meta/recipes-bsp/u-boot/u-boot_2022.04.bb index 0d2464d74b..0d2464d74b 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2022.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2022.04.bb | |||