Skip to content

Commit

Permalink
nanopi-r6*: mainline u-boot boot SD, then NVMe, then MMC
Browse files Browse the repository at this point in the history
  • Loading branch information
rpardini committed Nov 15, 2024
1 parent 4f4fcbd commit e07b5b6
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 0 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <[email protected]>
Date: Wed, 16 Aug 2023 13:54:31 +0200
Subject: rockchip-common: boot SD card first, then NVMe, then mmc

---
include/configs/rockchip-common.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index 111111111111..222222222222 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -13,7 +13,7 @@

#ifndef CONFIG_SPL_BUILD

-#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
+#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp spi"

#ifdef CONFIG_ARM64
#define ROOT_UUID "B921B045-1DF0-41C3-AF44-4C6F280D3FAE;\0"
--
Armbian

Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Ricardo Pardini <[email protected]>
Date: Wed, 16 Aug 2023 13:54:31 +0200
Subject: rockchip-common: boot SD card first, then NVMe, then mmc

---
include/configs/rockchip-common.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index 111111111111..222222222222 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -13,7 +13,7 @@

#ifndef CONFIG_SPL_BUILD

-#define BOOT_TARGETS "mmc1 mmc0 nvme scsi usb pxe dhcp spi"
+#define BOOT_TARGETS "mmc0 nvme mmc1 scsi usb pxe dhcp spi"

#ifdef CONFIG_ARM64
#define ROOT_UUID "B921B045-1DF0-41C3-AF44-4C6F280D3FAE;\0"
--
Armbian

0 comments on commit e07b5b6

Please sign in to comment.