From c44ed98005055250718f2253eab67e4b50cb9048 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Tue, 8 Aug 2023 11:21:22 +0200 Subject: [PATCH] u-boot-menu: allow skipping `U_BOOT_FDT` even with `BOOT_FDT_FILE` set, by specifying `EXTLINUX_SPECIFIC_FDT=no` --- extensions/u-boot-menu.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/u-boot-menu.sh b/extensions/u-boot-menu.sh index 7c0a5dc11..eea5308b1 100644 --- a/extensions/u-boot-menu.sh +++ b/extensions/u-boot-menu.sh @@ -22,7 +22,7 @@ function pre_umount_final_image__configure_uboot_menu() { U_BOOT_FDT_DIR="/usr/lib/linux-image-" UBOOT_MENU_CONFIGURATION_COMMON - if [[ "${BOOT_FDT_FILE}" != "" ]]; then + if [[ "${BOOT_FDT_FILE}" != "" && "${EXTLINUX_SPECIFIC_FDT:-"yes"}" != "no" ]]; then cat <<- UBOOT_MENU_CONFIGURATION_DTB >> "${MOUNT}/etc/default/u-boot" U_BOOT_FDT="${BOOT_FDT_FILE}" UBOOT_MENU_CONFIGURATION_DTB