--- include/configs/rockchip-common.h.orig 2020-07-06 22:22:53.000000000 +0300 +++ include/configs/rockchip-common.h 2021-06-30 15:18:30.277779000 +0300 @@ -16,11 +16,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, 0) \ - func(MMC, mmc, 1) + #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_NVME) @@ -53,18 +52,19 @@ #define BOOT_TARGET_SF(func) #endif -#ifdef CONFIG_ROCKCHIP_RK3399 +#ifdef CONFIG_ROCKCHIP_RK3328 #define BOOT_TARGET_DEVICES(func) \ - BOOT_TARGET_MMC(func) \ - BOOT_TARGET_NVME(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_DHCP(func) \ - BOOT_TARGET_SF(func) + BOOT_TARGET_DHCP(func) #else #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) #endif