summaryrefslogtreecommitdiff
path: root/sys-boot/u-boot/files/0002-Correct-boot-order-to-be-USB-SD-eMMC.patch
diff options
context:
space:
mode:
Diffstat (limited to 'sys-boot/u-boot/files/0002-Correct-boot-order-to-be-USB-SD-eMMC.patch')
-rw-r--r--sys-boot/u-boot/files/0002-Correct-boot-order-to-be-USB-SD-eMMC.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/sys-boot/u-boot/files/0002-Correct-boot-order-to-be-USB-SD-eMMC.patch b/sys-boot/u-boot/files/0002-Correct-boot-order-to-be-USB-SD-eMMC.patch
new file mode 100644
index 0000000..b6e755a
--- /dev/null
+++ b/sys-boot/u-boot/files/0002-Correct-boot-order-to-be-USB-SD-eMMC.patch
@@ -0,0 +1,38 @@
+From e622965b31e1d08c2b7c6b3a8d683c59f37b2733 Mon Sep 17 00:00:00 2001
+From: Nadia Holmquist Pedersen <nadia@nhp.sh>
+Date: Sat, 20 Jun 2020 01:47:52 +0200
+Subject: [PATCH 2/3] Correct boot order to be USB -> SD -> eMMC
+
+---
+ include/configs/rockchip-common.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
+index 0b9e24d1db..9e217fad2a 100644
+--- a/include/configs/rockchip-common.h
++++ b/include/configs/rockchip-common.h
+@@ -17,8 +17,8 @@
+ /* 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)
++ func(MMC, mmc, 1) \
++ func(MMC, mmc, 0)
+ #else
+ #define BOOT_TARGET_MMC(func)
+ #endif
+@@ -55,9 +55,9 @@
+
+ #ifdef CONFIG_ROCKCHIP_RK3399
+ #define BOOT_TARGET_DEVICES(func) \
++ BOOT_TARGET_USB(func) \
+ BOOT_TARGET_MMC(func) \
+ BOOT_TARGET_NVME(func) \
+- BOOT_TARGET_USB(func) \
+ BOOT_TARGET_PXE(func) \
+ BOOT_TARGET_DHCP(func) \
+ BOOT_TARGET_SF(func)
+--
+2.27.0
+