From 908d441fefc2203affe1bb0d79f75f611888fc1f Mon Sep 17 00:00:00 2001 From: dhivael Date: Sat, 11 Jan 2020 15:04:04 +0100 Subject: [PATCH 6/6] 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. --- include/configs/rockchip-common.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 906c22ed0fb..90e06e120f8 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -13,11 +13,10 @@ /* First try to boot from SD (index 0), then eMMC (index 1) */ #if CONFIG_IS_ENABLED(CMD_MMC) - #define BOOT_TARGET_MMC(func) \ - func(MMC, mmc, 1) \ - func(MMC, mmc, 0) + #define BOOT_TARGET_MMC(func, idx) \ + func(MMC, mmc, idx) #else - #define BOOT_TARGET_MMC(func) + #define BOOT_TARGET_MMC(func, idx) #endif #if CONFIG_IS_ENABLED(CMD_USB) @@ -39,8 +38,9 @@ #endif #define BOOT_TARGET_DEVICES(func) \ - BOOT_TARGET_MMC(func) \ + BOOT_TARGET_MMC(func, 1) \ BOOT_TARGET_USB(func) \ + BOOT_TARGET_MMC(func, 0) \ BOOT_TARGET_PXE(func) \ BOOT_TARGET_DHCP(func) -- 2.23.1