From: Cameron Nemo cnemo@tutanota.com

On the Pinebook Pro, and perhaps some other boards, the mmc indices are opposite from what is implied by the comment in include/configs/rockchip-common.h.

This commit fixes the boot ordering to prioritize the SD card over eMMC.

I am not sure if this appropriate for the Pinebook Pro alone (only board I can test with atm), or other boards as well (rk3399 or otherwise).

Most distributions of U-Boot that actually target rk3399 boards apply a similar patch, such as Manjaro (shipped by default on PBP) and armbian.

https://gitlab.manjaro.org/manjaro-arm/packages/core/uboot-pinebookpro/-/blo... https://github.com/armbian/build/blob/5a2b2c360b9c26ca4bd0d309af7cd3994fd08b...

Signed-off-by: Cameron Nemo cnemo@tutanota.com --- include/configs/pinebook-pro-rk3399.h | 8 ++++++++ 1 file changed, 8 insertions(+)

diff --git a/include/configs/pinebook-pro-rk3399.h b/include/configs/pinebook-pro-rk3399.h index d478b19917..59780bfb0b 100644 --- a/include/configs/pinebook-pro-rk3399.h +++ b/include/configs/pinebook-pro-rk3399.h @@ -14,6 +14,14 @@

#include <configs/rk3399_common.h>

+/* On Pinebook Pro, mmc1 is SD and mmc0 is eMMC */ +#if CONFIG_IS_ENABLED(CMD_MMC) + #undef BOOT_TARGET_MMC + #define BOOT_TARGET_MMC(func) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 0) +#endif + #define SDRAM_BANK_SIZE (2UL << 30)

#define CONFIG_USB_OHCI_NEW