boot order in new uBoot style

Author: iav

patch/u-boot/v2026.01/board_helios64/include_configs/helios64.h

@@ -6,43 +6,9 @@
 #ifndef __HELIOS64_H
 #define __HELIOS64_H
 
-#include <configs/rk3399_common.h>
-
-#define SDRAM_BANK_SIZE			(2UL << 30)
-
-#if defined(CONFIG_ENV_IS_IN_MMC)
-	#define CONFIG_SYS_MMC_ENV_DEV 0
-#elif defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-	#define CONFIG_ENV_SPI_BUS		CONFIG_SF_DEFAULT_BUS
-	#define CONFIG_ENV_SPI_CS		CONFIG_SF_DEFAULT_CS
-	#define CONFIG_ENV_SPI_MODE		CONFIG_SF_DEFAULT_MODE
-	#define CONFIG_ENV_SPI_MAX_HZ	CONFIG_SF_DEFAULT_SPEED
-#endif
-
-
-#ifndef CONFIG_SPL_BUILD
-#if CONFIG_IS_ENABLED(SCSI)
+/* Override default boot targets before including common config. */
+#define BOOT_TARGETS	"mmc1 mmc0 scsi0 usb0 pxe dhcp"
 
-	#define CONFIG_SYS_SCSI_MAX_SCSI_ID     5
-	#define CONFIG_SYS_SCSI_MAX_LUN         1
-
-	#define BOOT_TARGET_SCSI(func) \
-	    func(SCSI, scsi, 0)
-#else
-	#define BOOT_TARGET_SCSI(func)
-#endif
-
-/* Keep boot_targets short to fit early env_buf (32 bytes); bootstd still
- * scans SD (mmc0) and eMMC (mmc1) automatically.
- */
-#undef BOOT_TARGET_DEVICES
-#define BOOT_TARGET_DEVICES(func) \
-	func(MMC, mmc, 1) \
-	func(SCSI, scsi, 0) \
-	func(USB, usb, 0) \
-	func(PXE, pxe, na) \
-	func(DHCP, dhcp, na)
-
-#endif /* !CONFIG_SPL_BUILD */
+#include <configs/rk3399_common.h>
 
 #endif /* __HELIOS64_H */