From 0a4fe5db90c3c0e040f8f3b6a68793f972bfe5b6 Mon Sep 17 00:00:00 2001
From: ColorfulRhino <131405023+ColorfulRhino@users.noreply.github.com>
Date: Wed, 6 Mar 2024 01:45:58 +0100
Subject: [PATCH] NanoPi R5C/R5S: Beautify board config

---
 config/boards/nanopi-r5c.csc | 11 +++++------
 config/boards/nanopi-r5s.csc | 15 +++++++--------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/config/boards/nanopi-r5c.csc b/config/boards/nanopi-r5c.csc
index d1d387d50c..e0767b615e 100644
--- a/config/boards/nanopi-r5c.csc
+++ b/config/boards/nanopi-r5c.csc
@@ -1,4 +1,4 @@
-# Rockchip RK3568 quad core 4GB eMMC USB3 2x 2.5GbE
+# Rockchip RK3568 quad core 4GB RAM eMMC USB3 2x 2.5GbE
 BOARD_NAME="NanoPi R5C"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER=""
@@ -38,9 +38,8 @@ function post_family_tweaks__nanopir5c_udev_network_interfaces() {
 	display_alert "$BOARD" "Renaming interfaces WAN LAN" "info"
 
 	mkdir -p $SDCARD/etc/udev/rules.d/
-	cat << EOF > "${SDCARD}/etc/udev/rules.d/70-persistent-net.rules"
-SUBSYSTEM=="net", ACTION=="add", KERNELS=="0001:01:00.0", NAME:="lan"
-SUBSYSTEM=="net", ACTION=="add", KERNELS=="0002:01:00.0", NAME:="wan"
-EOF
-
+	cat <<- EOF > "${SDCARD}/etc/udev/rules.d/70-persistent-net.rules"
+		SUBSYSTEM=="net", ACTION=="add", KERNELS=="0001:01:00.0", NAME:="lan"
+		SUBSYSTEM=="net", ACTION=="add", KERNELS=="0002:01:00.0", NAME:="wan"
+	EOF
 }
diff --git a/config/boards/nanopi-r5s.csc b/config/boards/nanopi-r5s.csc
index d8a53e9fb1..cd882de073 100644
--- a/config/boards/nanopi-r5s.csc
+++ b/config/boards/nanopi-r5s.csc
@@ -1,4 +1,4 @@
-# Rockchip RK3568 quad core 4GB eMMC USB3 USB2 1x GbE 2x 2.5GbE NVME
+# Rockchip RK3568 quad core 4GB RAM eMMC NVMe 2x USB3 1x GbE 2x 2.5GbE
 BOARD_NAME="NanoPi R5S"
 BOARDFAMILY="rockchip64"
 BOARD_MAINTAINER="utlark"
@@ -12,7 +12,7 @@ FULL_DESKTOP="yes"
 INSTALL_HEADERS="yes"
 BOOT_LOGO="desktop"
 
-BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git" # also following kwiboo's uboot due to his rk3568 work
+BOOTSOURCE="https://github.com/Kwiboo/u-boot-rockchip.git" # also following kwiboo's u-boot due to his rk3568 work
 BOOTBRANCH_BOARD="commit:a6e84f9f5b90ff0fa3ac4e6b7e0d6e2c3ac9bb1b" # specific commit, from "branch:rk3568-2023.10" which is v2023.10-rc2 + kwiboo's patches (including GMAC)
 BOOTPATCHDIR="v2023.10"
 BOOTCONFIG="nanopi-r5s-rk3568_defconfig"
@@ -38,10 +38,9 @@ function post_family_tweaks__nanopir5s_udev_network_interfaces() {
 	display_alert "$BOARD" "Renaming interfaces WAN LAN1 LAN2" "info"
 
 	mkdir -p $SDCARD/etc/udev/rules.d/
-	cat << EOF > "${SDCARD}/etc/udev/rules.d/70-persistent-net.rules"
-SUBSYSTEM=="net", ACTION=="add", KERNELS=="fe2a0000.ethernet", NAME:="wan"
-SUBSYSTEM=="net", ACTION=="add", KERNELS=="0000:01:00.0", NAME:="lan1"
-SUBSYSTEM=="net", ACTION=="add", KERNELS=="0001:01:00.0", NAME:="lan2"
-EOF
-
+	cat <<- EOF > "${SDCARD}/etc/udev/rules.d/70-persistent-net.rules"
+		SUBSYSTEM=="net", ACTION=="add", KERNELS=="fe2a0000.ethernet", NAME:="wan"
+		SUBSYSTEM=="net", ACTION=="add", KERNELS=="0000:01:00.0", NAME:="lan1"
+		SUBSYSTEM=="net", ACTION=="add", KERNELS=="0001:01:00.0", NAME:="lan2"
+	EOF
 }