diff mbox series

[07/49] u-boot: upgrade 2022.01 -> 2022.04

Message ID 20220518105843.3299331-7-alex@linutronix.de
State Accepted, archived
Commit a9c5f9033343ad2e26539854ccde2f116528f235
Headers show
Series [01/49] sato: work around missing icons in adwaita 42.0 | expand

Commit Message

Alexander Kanavin May 18, 2022, 10:58 a.m. UTC 
Change to a tools-only defconfig.

Add gnutls/util-linux dependency for mkeficapsule.

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
---
 meta/recipes-bsp/u-boot/u-boot-common.inc                     | 2 +-
 meta/recipes-bsp/u-boot/u-boot-tools.inc                      | 4 ++--
 .../{u-boot-tools_2022.01.bb => u-boot-tools_2022.04.bb}      | 0
 .../u-boot/{u-boot_2022.01.bb => u-boot_2022.04.bb}           | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename meta/recipes-bsp/u-boot/{u-boot-tools_2022.01.bb => u-boot-tools_2022.04.bb} (100%)
 rename meta/recipes-bsp/u-boot/{u-boot_2022.01.bb => u-boot_2022.04.bb} (100%)
diff mbox series

Patch

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"
 
 # 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 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 @@ 
 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