Browse Source

Optimize boot order

baiywt 1 month ago
parent
commit
f44a7623ab
2 changed files with 2 additions and 13 deletions
  1. 1 12
      include/config_distro_bootcmd.h
  2. 1 1
      include/configs/rockchip-common.h

+ 1 - 12
include/config_distro_bootcmd.h

@@ -76,18 +76,7 @@
 
 #ifdef CONFIG_CMD_MMC
 #define BOOTENV_SHARED_MMC	BOOTENV_SHARED_BLKDEV(mmc)
-#define BOOTENV_DEV_MMC(devtypeu, devtypel, instance) \
-	"bootcmd_mmc0=" \
-	"if mmc dev 0; then "	\
-		"mmc list;" \
-		"setenv devnum 0;" \
-		"run mmc_boot;" \
-	"fi;" \
-	"if mmc dev 1; then " \
-		"mmc list;" \
-		"setenv devnum 1;" \
-		"run mmc_boot;" \
-	"fi\0"
+#define BOOTENV_DEV_MMC		BOOTENV_DEV_BLKDEV
 #define BOOTENV_DEV_NAME_MMC	BOOTENV_DEV_NAME_BLKDEV
 #else
 #define BOOTENV_SHARED_MMC

+ 1 - 1
include/configs/rockchip-common.h

@@ -116,9 +116,9 @@
 	BOOT_TARGET_MMC(func) \
 	BOOT_TARGET_NVME(func) \
 	BOOT_TARGET_SCSI(func) \
+	BOOT_TARGET_USB(func) \
 	BOOT_TARGET_MTD(func) \
 	BOOT_TARGET_RKNAND(func) \
-	BOOT_TARGET_USB(func) \
 	BOOT_TARGET_PXE(func) \
 	BOOT_TARGET_DHCP(func)