diff -Naur u-boot-2021.01_rc5/include/config_distro_bootcmd.h u-boot-2021.01_rc5-mod/include/config_distro_bootcmd.h
--- u-boot-2021.01_rc5/include/config_distro_bootcmd.h	2021-07-04 11:32:47.978321442 +0200
+++ u-boot-2021.01_rc5-mod/include/config_distro_bootcmd.h	2021-07-04 11:34:05.930534226 +0200
@@ -462,11 +462,11 @@
 	"scan_dev_for_boot="                                              \
 		"echo Scanning ${devtype} "                               \
 				"${devnum}:${distro_bootpart}...; "       \
+		SCAN_DEV_FOR_EFI                                          \
 		"for prefix in ${boot_prefixes}; do "                     \
 			"run scan_dev_for_extlinux; "                     \
 			"run scan_dev_for_scripts; "                      \
 		"done;"                                                   \
-		SCAN_DEV_FOR_EFI                                          \
 		"\0"                                                      \
 	\
 	"scan_dev_for_boot_part="                                         \