From bdc9f32af7392f251faae303a8d933160bc9f9b3 Mon Sep 17 00:00:00 2001 From: MichaIng Date: Mon, 22 Jul 2024 22:41:12 +0200 Subject: [PATCH] meson64: remove U-Boot boot order patch since it sometimes results in a boot loop, when aiming to boot from eMMC or SD card: https://github.com/MichaIng/DietPi/issues/7168, https://forum.armbian.com/topic/36141-usb-errors/ The attempt to boot from USB might be too fast, when trying it first, where some USB drives are not ready yet, resulting in an error. Signed-off-by: MichaIng --- .../meson64-boot-usb-nvme-scsi-first.patch | 33 ------------------- 1 file changed, 33 deletions(-) delete mode 100644 patch/u-boot/v2022.10/meson64-boot-usb-nvme-scsi-first.patch diff --git a/patch/u-boot/v2022.10/meson64-boot-usb-nvme-scsi-first.patch b/patch/u-boot/v2022.10/meson64-boot-usb-nvme-scsi-first.patch deleted file mode 100644 index d7f8141477ff..000000000000 --- a/patch/u-boot/v2022.10/meson64-boot-usb-nvme-scsi-first.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Ricardo Pardini -Date: Mon, 14 Nov 2022 14:59:45 +0100 -Subject: meson64 u-boot v2022.10: change `BOOT_TARGET_DEVICES to try to boot - USB, NVME and SCSI before SD, MMC, PXE, DHCP - ---- - include/configs/meson64.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/include/configs/meson64.h b/include/configs/meson64.h -index 40803ee9da1..af7b764da6a 100644 ---- a/include/configs/meson64.h -+++ b/include/configs/meson64.h -@@ -64,12 +64,12 @@ - #ifndef BOOT_TARGET_DEVICES - #define BOOT_TARGET_DEVICES(func) \ - func(ROMUSB, romusb, na) \ -- func(MMC, mmc, 0) \ -- func(MMC, mmc, 1) \ -- func(MMC, mmc, 2) \ - BOOT_TARGET_DEVICES_USB(func) \ - BOOT_TARGET_NVME(func) \ - BOOT_TARGET_SCSI(func) \ -+ func(MMC, mmc, 0) \ -+ func(MMC, mmc, 1) \ -+ func(MMC, mmc, 2) \ - func(PXE, pxe, na) \ - func(DHCP, dhcp, na) - #endif --- -Armbian -