Skip to content

Commit

Permalink
fix(nanopi-r5s): avoid broken NVMe
Browse files Browse the repository at this point in the history
Signed-off-by: Nicklas Frahm <[email protected]>
  • Loading branch information
nicklasfrahm committed Aug 14, 2024
1 parent ec73b76 commit cceded0
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 0 deletions.
10 changes: 10 additions & 0 deletions artifacts/nanopi-r5s/u-boot/patches/uboot-defconfig.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
diff --git a/configs/nanopi-r5s-rk3568_defconfig b/configs/nanopi-r5s-rk3568_defconfig
index 7ab12e619a..399b73fa75 100644
--- a/configs/nanopi-r5s-rk3568_defconfig
+++ b/configs/nanopi-r5s-rk3568_defconfig
@@ -76,3 +76,5 @@ CONFIG_USB_OHCI_GENERIC=y
CONFIG_USB_DWC3=y
CONFIG_USB_DWC3_GENERIC=y
CONFIG_ERRNO_STR=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="led led-power on; led led-lan1 on; led led-lan2 on; led led-wan on; pci enum; nvme scan; led led-lan1 off; led led-lan2 off; led led-wan off"
20 changes: 20 additions & 0 deletions artifacts/nanopi-r5s/u-boot/patches/uboot-led-triggers.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi b/arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
index 64c43374c0..98fea57d8a 100644
--- a/arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
+++ b/arch/arm/dts/rk3568-nanopi-r5s-u-boot.dtsi
@@ -24,3 +24,15 @@
/delete-property/ regulator-always-on;
/delete-property/ regulator-boot-on;
};
+
+&{/gpio-leds/led-wan} {
+ linux,default-trigger = "stmmac-0:01:link";
+};
+
+&{/gpio-leds/led-lan1} {
+ linux,default-trigger = "r8169-0-100:00:link";
+};
+
+&{/gpio-leds/led-lan2} {
+ linux,default-trigger = "r8169-1-100:00:link";
+};
4 changes: 4 additions & 0 deletions artifacts/nanopi-r5s/u-boot/pkg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@ steps:
tar xf u-boot.tar.bz2 --strip-components=1
patch -p1 < /pkg/patches/uboot-byteorder.patch
patch -p1 < /pkg/patches/uboot-defconfig.patch
patch -p1 < /pkg/patches/uboot-led-triggers.patch
- |
make nanopi-r5s-rk3568_defconfig
build:
Expand Down

0 comments on commit cceded0

Please sign in to comment.