Commit 3d589c61 authored by dhivael's avatar dhivael Committed by James T. Lee
Browse files

rockchip: move usb0 after mmc1 in default boot order

now that we support booting from USB we should prefer USB boot over eMMC
boot. we still try to boot from SD cards first.
parent 274d0994
...@@ -16,11 +16,10 @@ ...@@ -16,11 +16,10 @@
/* First try to boot from SD (index 1), then eMMC (index 0) */ /* First try to boot from SD (index 1), then eMMC (index 0) */
#if CONFIG_IS_ENABLED(CMD_MMC) #if CONFIG_IS_ENABLED(CMD_MMC)
#define BOOT_TARGET_MMC(func) \ #define BOOT_TARGET_MMC(func, idx) \
func(MMC, mmc, 1) \ func(MMC, mmc, idx)
func(MMC, mmc, 0)
#else #else
#define BOOT_TARGET_MMC(func) #define BOOT_TARGET_MMC(func, idx)
#endif #endif
#if CONFIG_IS_ENABLED(CMD_NVME) #if CONFIG_IS_ENABLED(CMD_NVME)
...@@ -55,9 +54,10 @@ ...@@ -55,9 +54,10 @@
#ifdef CONFIG_ROCKCHIP_RK3399 #ifdef CONFIG_ROCKCHIP_RK3399
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
BOOT_TARGET_MMC(func) \
BOOT_TARGET_NVME(func) \
BOOT_TARGET_USB(func) \ BOOT_TARGET_USB(func) \
BOOT_TARGET_MMC(func, 1) \
BOOT_TARGET_NVME(func) \
BOOT_TARGET_MMC(func, 0) \
BOOT_TARGET_PXE(func) \ BOOT_TARGET_PXE(func) \
BOOT_TARGET_DHCP(func) \ BOOT_TARGET_DHCP(func) \
BOOT_TARGET_SF(func) BOOT_TARGET_SF(func)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment