nanopi-r6s: u-boot: bump to 2025.01 final, with working UMS and SD -> NVMe -> eMMC boot order

- also LEDs, networking, more supported compression methods...
- copypasta reigns supreme. refactor is coming, just not today
- also hack the u-boot dtsi for consistent-with-Linux-mainline-DT mmc/sd numbering
  - this was previously a separate patch in 2024.10
This commit is contained in:
Ricardo Pardini
2025-01-08 13:09:47 +01:00
committed by Igor
parent b349229716
commit 919ccfc227
2 changed files with 70 additions and 35 deletions

View File

@@ -1,28 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Muhammed Efe Cetin <efectn@protonmail.com>
Date: Sat, 30 Nov 2024 02:09:36 +0300
Subject: adjust wrong mmc0/mmc1 ordering
---
arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi b/arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi
index 111111111111..222222222222 100644
--- a/arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi
+++ b/arch/arm/dts/rk3588s-nanopi-r6s-u-boot.dtsi
@@ -1,3 +1,10 @@
// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
#include "rk3588s-u-boot.dtsi"
+
+/ {
+ aliases {
+ mmc0 = &sdhci;
+ mmc1 = &sdmmc;
+ };
+};
\ No newline at end of file
--
Armbian