diff options
| author | Tom Rini <[email protected]> | 2021-08-12 09:33:39 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-08-12 09:33:39 -0400 |
| commit | 07043055280a91d769ffe5e30d214241bd2e9e78 (patch) | |
| tree | 2f0c0204ad381de5cb8a2e4a58c08402ee4dc164 /include/configs | |
| parent | a25277122dad99837b78cd3b3ae6b8214df88c26 (diff) | |
| parent | 60df49d22d2586f50bba11eaa59a55f2baa4671f (diff) | |
Merge tag 'u-boot-rockchip-20210812' of https://source.denx.de/u-boot/custodians/u-boot-rockchip
- Add Rockchip SFC driver support;
- DTS sync from kernel;
- emmc hs400 support for rk3399;
- Fix for spinore bootdevice and MMC boot order;
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/rockchip-common.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 0b9e24d1db4..ba7061a287c 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -14,11 +14,11 @@ #ifndef CONFIG_SPL_BUILD -/* First try to boot from SD (index 0), then eMMC (index 1) */ +/* First try to boot from SD (index 1), then eMMC (index 0) */ #if CONFIG_IS_ENABLED(CMD_MMC) #define BOOT_TARGET_MMC(func) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) + func(MMC, mmc, 1) \ + func(MMC, mmc, 0) #else #define BOOT_TARGET_MMC(func) #endif |