From 02d428382b8ca607f45921ac656e8b1fcd179f61 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <ricardo@pardini.net>
Date: Sun, 2 Jul 2023 22:10:47 +0200
Subject: [PATCH] u-boot-menu: allow avoid using uInitrd, for when the
 bootloader requires modern initrd.img

---
 extensions/u-boot-menu.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extensions/u-boot-menu.sh b/extensions/u-boot-menu.sh
index b945b296a..7c0a5dc11 100644
--- a/extensions/u-boot-menu.sh
+++ b/extensions/u-boot-menu.sh
@@ -32,7 +32,8 @@ function pre_umount_final_image__configure_uboot_menu() {
 		U_BOOT_PARAMETERS="${SRC_CMDLINE:-"loglevel=7 console=ttyS0"}"
 	UBOOT_MENU_CONFIGURATION_CMDLINE
 
-	if [[ "${NAME_INITRD}" == "uInitrd" ]]; then
+	# Set EXTLINUX_UINITRD=no force usage of normal initrd even when NAME_INITRD is uInitrd
+	if [[ "${NAME_INITRD}" == "uInitrd" && "${EXTLINUX_UINITRD:-"yes"}" == "yes" ]]; then
 		cat <<- UBOOT_MENU_CONFIGURATION_INITRD >> "${MOUNT}/etc/default/u-boot"
 			U_BOOT_INITRD="uInitrd" # Force usage of /boot/uInitrd-<version> as initrd
 		UBOOT_MENU_CONFIGURATION_INITRD