u-boot: upgrade 2022.01 -> 2022.04

Change to a tools-only defconfig.

Add gnutls/util-linux dependency for mkeficapsule.

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>

diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc
index d366f1039820ae1a33dc982eddf8f0c67b1cf330..8fc33608d089e2e56b60f052d44350def94816cf 100644 (file)
--- 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"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "d637294e264adfeb29f390dfc393106fd4d41b17"
+SRCREV = "e4b6ebd3de982ae7185dbf689a030e73fd06e0d2"
 
 SRC_URI = "git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master"
 

diff --git a/meta/recipes-bsp/u-boot/u-boot-tools.inc b/meta/recipes-bsp/u-boot/u-boot-tools.inc
index 7eda6a0897abcb0d36bc7b5dda0291accab516f0..a8d7fab46d66e7a29fe64621869c4d76c6774f18 100644 (file)
--- a/meta/recipes-bsp/u-boot/u-boot-tools.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-tools.inc
@@ -1,5 +1,5 @@
 SUMMARY = "U-Boot bootloader tools"
-DEPENDS += "openssl"
+DEPENDS += "gnutls openssl util-linux"
 
 PROVIDES = "${MLPREFIX}u-boot-mkimage ${MLPREFIX}u-boot-mkenvimage"
 PROVIDES:class-native = "u-boot-mkimage-native u-boot-mkenvimage-native"
@@ -38,7 +38,7 @@ do_compile () {
        # (i.e. creating a hardlink dirties the index)
        cd ${S}; git diff; cd ${B}
 
-       oe_runmake -C ${S} sandbox_defconfig O=${B}
+       oe_runmake -C ${S} tools-only_defconfig O=${B}
 
        # Disable CONFIG_CMD_LICENSE, license.h is not used by tools and
        # 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
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-tools_2022.01.bb
rename to 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
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot_2022.01.bb
rename to meta/recipes-bsp/u-boot/u-boot_2022.04.bb