Add support for rock-3b and orangepi-5-pro

.github/workflows/build-armbian-arm64-server-image.yml

@@ -110,6 +110,7 @@ on:
           - nsy-g68-plus
           - orangepi-3b
           - orangepi-5-plus
+          - orangepi-5-pro
           - orangepi-5b
           - orangepi-zero3
           - painet-p3
@@ -120,6 +121,7 @@ on:
           - renegade-rk3328
           - rk3318-box
           - rock-5-itx
+          - rock-3b
           - rock5b
           - rock5c
           - ruisen-box

.github/workflows/build-armbian-using-official-image.yml

@@ -103,6 +103,7 @@ on:
           - nsy-g68-plus
           - orangepi-3b
           - orangepi-5-plus
+          - orangepi-5-pro
           - orangepi-5b
           - orangepi-zero3
           - painet-p3
@@ -113,6 +114,7 @@ on:
           - renegade-rk3328
           - rk3318-box
           - rock-5-itx
+          - rock-3b
           - rock5b
           - rock5c
           - ruisen-box

.github/workflows/build-armbian-using-releases-files.yml

@@ -110,6 +110,7 @@ on:
           - nsy-g68-plus
           - orangepi-3b
           - orangepi-5-plus
+          - orangepi-5-pro
           - orangepi-5b
           - orangepi-zero3
           - painet-p3
@@ -120,6 +121,7 @@ on:
           - renegade-rk3328
           - rk3318-box
           - rock-5-itx
+          - rock-3b
           - rock5b
           - rock5c
           - ruisen-box

build-armbian/armbian-files/common-files/etc/model_database.conf

@@ -237,6 +237,7 @@ r115    :Boca-tcn200                                   :rk3588s  :rk3588s-boca-t
 r116    :Firefly-ITX-3588J                             :rk3588   :rk3588-firefly-itx-3588j.dtb             :NA                           :u-boot.itb                          :idbloader.img                   :4/8/32GB-RAM,32Gb-eMMC,SATA,1Gb-Nic        :stable/6.12.y         :rockchip    :rk3588       :armbianEnv.txt  :seasonyuu                                            :firefly-itx-3588j   :yes
 r117    :Indiedroid-Nova                               :rk3588s  :rk3588s-indiedroid-nova.dtb              :NA                           :u-boot.itb                          :idbloader.img                   :1~32GB-RAM,4~128Gb-eMMC,SATA,1Gb-Nic       :stable/6.18.y         :rockchip    :rk3588s      :armbianEnv.txt  :shabby2333                                           :indiedroid-nova     :yes
 r118    :LubanCat-4                                    :rk3588s  :rk3588s-lubancat-4.dtb                   :NA                           :NA                                  :u-boot-rockchip.bin             :4/8GB-LPDDR4X,32/64/128Gb-eMMC,TF,1Gb-Nic  :stable/6.18.y         :rockchip    :rk3588s      :armbianEnv.txt  :luohuayouyiliushuiwuqing                             :lubancat-4          :yes
+r119    :Orange-Pi-5-Pro                               :rk3588s  :rk3588s-orangepi-5-pro.dtb               :NA                           :u-boot.itb                          :idbloader.img                   :Oct-core,4/8/16GB-RAM,TF,1Gb-Nic           :rk3588/6.1.y          :rockchip    :rk3588s      :armbianEnv.txt  :zihelyu                                              :orangepi-5-pro      :yes
 
 
 # Rockchip RK3568 Family
@@ -279,7 +280,7 @@ r225    :LZ-D3568                                      :rk3568   :rk3568-lz-d356
 #-------+----------------------------------------------+---------+-----------------------------------------+-----------------------------+------------------------------------+--------------------------------+-------------------------------------------+----------------------+------------+-------------+----------------+-----------------------------------------------------+--------------------+----------
 r226    :Lyt-t68m                                      :rk3568   :rk3568-lyt-t68m.dtb                      :NA                           :u-boot.itb                          :idbloader.img                   :2GB-RAM,32G-eMMC,TF,2x1Gb-Nic,2x2.5Gb-Nic  :stable/6.12.y         :rockchip    :rk3568       :armbianEnv.txt  :OlivInk                                              :lyt-t68m            :yes
 r227    :LubanCat-2                                    :rk3568   :rk3568-lubancat-2.dtb                    :NA                           :u-boot.itb                          :idbloader.img                   :2/4/8GB-LPDDR4,8/32/64/128G-eMMC,2x1Gb-Nic :stable/6.18.y         :rockchip    :rk3568       :armbianEnv.txt  :hejiawencc                                           :lubancat-2          :yes
-
+r228    :Rock-3B                                       :rk3568   :rk3568-rock-3b.dtb                       :NA                           :u-boot.itb                          :idbloader.img                   :2/4/8GB-LPDDR4,eMMC,TF,2x1Gb-Nic           :stable/6.1.y          :rockchip    :rk3568       :armbianEnv.txt  :zihelyu                                              :rock-3b             :yes
 
 # Rockchip RK3566 Family
 #-------+----------------------------------------------+---------+-----------------------------------------+-----------------------------+------------------------------------+--------------------------------+-------------------------------------------+----------------------+------------+-------------+----------------+-----------------------------------------------------+--------------------+----------

build-armbian/armbian-files/different-files/orangepi-5-pro/bootfs/armbianEnv.txt

@@ -0,0 +1,8 @@
+verbosity=1
+bootlogo=false
+console=both
+extraargs=cma=256M
+overlay_prefix=rk3588
+fdtfile=rockchip/rk3588s-orangepi-5-pro.dtb
+rootdev=/dev/mmcblk0p2
+rootfstype=ext4

build-armbian/armbian-files/different-files/orangepi-5-pro/bootfs/boot.cmd

@@ -0,0 +1,85 @@
+# DO NOT EDIT THIS FILE
+#
+# Please edit /boot/armbianEnv.txt to set supported parameters
+#
+
+setenv load_addr "0x9000000"
+setenv overlay_error "false"
+# default values
+setenv rootdev "/dev/mmcblk0p1"
+setenv verbosity "1"
+setenv console "both"
+setenv bootlogo "false"
+setenv rootfstype "ext4"
+setenv docker_optimizations "on"
+setenv earlycon "off"
+
+echo "Boot script loaded from ${devtype} ${devnum}"
+
+if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
+	load ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt
+	env import -t ${load_addr} ${filesize}
+fi
+
+if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
+
+if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
+if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS2,1500000 ${consoleargs}"; fi
+if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
+if test "${bootlogo}" = "true"; then
+        setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
+else
+        setenv consoleargs "splash=verbose ${consoleargs}"
+fi
+
+# get PARTUUID of first partition on SD/eMMC the boot script was loaded from
+if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:1 partuuid; fi
+
+setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
+
+if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory swapaccount=1"; fi
+
+load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
+load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image
+
+load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+fdt addr ${fdt_addr_r}
+fdt resize 65536
+
+for overlay_file in ${overlays}; do
+	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+		echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
+		fdt apply ${load_addr} || setenv overlay_error "true"
+	fi
+done
+
+for overlay_file in ${user_overlays}; do
+	if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
+		echo "Applying user provided DT overlay ${overlay_file}.dtbo"
+		fdt apply ${load_addr} || setenv overlay_error "true"
+	fi
+done
+if test "${overlay_error}" = "true"; then
+	echo "Error applying DT overlays, restoring original DT"
+	load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+else
+	if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then
+		echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
+		source ${load_addr}
+	fi
+	if test -e ${devtype} ${devnum} ${prefix}fixup.scr; then
+		load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr
+		echo "Applying user provided fixup script (fixup.scr)"
+		source ${load_addr}
+	fi
+fi
+
+if test "${ethernet_phy}" = "rtl8211f"; then
+        fdt set /ethernet@ff540000 tx_delay <0x24>
+        fdt set /ethernet@ff540000 rx_delay <0x18>
+fi
+
+booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
+
+# Recompile with:
+# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr

build-armbian/armbian-files/different-files/rock-3b/bootfs/armbianEnv.txt

@@ -0,0 +1,9 @@
+verbosity=1
+bootlogo=false
+console=both
+extraargs=cma=256M
+overlay_prefix=rk3568
+fdtfile=rockchip/rk3568-rock-3b.dtb
+rootdev=/dev/mmcblk0p2
+rootfstype=ext4
+extraboardargs=net.ifnames=0

build-armbian/armbian-files/different-files/rock-3b/bootfs/boot.cmd

@@ -0,0 +1,86 @@
+# DO NOT EDIT THIS FILE
+#
+# Please edit /boot/armbianEnv.txt to set supported parameters
+#
+
+setenv load_addr "0x9000000"
+setenv overlay_error "false"
+# default values
+setenv rootdev "/dev/mmcblk0p1"
+setenv verbosity "1"
+setenv console "both"
+setenv bootlogo "false"
+setenv rootfstype "ext4"
+setenv docker_optimizations "on"
+setenv earlycon "off"
+
+test -n "${distro_bootpart}" || distro_bootpart=1
+
+echo "Boot script loaded from ${devtype} ${devnum}:${distro_bootpart}"
+
+if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}armbianEnv.txt; then
+	load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}armbianEnv.txt
+	env import -t ${load_addr} ${filesize}
+fi
+
+if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
+
+if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
+if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS2,1500000 ${consoleargs}"; fi
+if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
+if test "${bootlogo}" = "true"; then
+	setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
+else
+	setenv consoleargs "splash=verbose ${consoleargs}"
+fi
+
+# get PARTUUID of first partition on SD/eMMC the boot script was loaded from
+if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:${distro_bootpart} partuuid; fi
+
+setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
+
+if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory"; fi
+
+load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} ${prefix}uInitrd
+load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}Image
+
+load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+fdt addr ${fdt_addr_r}
+fdt resize 65536
+for overlay_file in ${overlays}; do
+	if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
+		echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
+		fdt apply ${load_addr} || setenv overlay_error "true"
+	elif load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_file}.dtbo; then
+		echo "Applying kernel provided DT overlay ${overlay_file}.dtbo"
+		fdt apply ${load_addr} || setenv overlay_error "true"
+	fi
+done
+for overlay_file in ${user_overlays}; do
+	if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
+		echo "Applying user provided DT overlay ${overlay_file}.dtbo"
+		fdt apply ${load_addr} || setenv overlay_error "true"
+	fi
+done
+if test "${overlay_error}" = "true"; then
+	echo "Error applying DT overlays, restoring original DT"
+	load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
+else
+	if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then
+		load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr
+		echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
+		source ${load_addr}
+	fi
+	if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}fixup.scr; then
+		load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}fixup.scr
+		echo "Applying user provided fixup script (fixup.scr)"
+		source ${load_addr}
+	fi
+fi
+
+echo "Trying 'kaslrseed' command... Info: 'Unknown command' can be safely ignored since 'kaslrseed' does not apply to all boards."
+kaslrseed # @TODO: This gives an error (Unknown command ' kaslrseed ' - try 'help') on many devices since CONFIG_CMD_KASLRSEED is not enabled
+booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
+
+# Recompile with:
+# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr

build-armbian/armbian-files/different-files/rock-3b/rootfs/etc/balance_irq

@@ -0,0 +1,20 @@
+# /etc/balance_irq
+# 用于中断设备的负载均衡
+# 用法：
+# 首先， 用 cat /proc/interrupts 进行观察
+#        如果某个cpu负载过重，可以把对应的中断设备迁移到其它cpu
+#  /proc/interrupt格式：
+#        最左列：中断号
+#        第 2 至第 2+cpus 列：cpu单核上产生的中断数量
+#        最右列：对应的设备名
+#
+# 本配置文件格式：
+#        第1列： 设备名
+#        第2列： 期望绑定在第几个cpu (从1开始)
+#
+#  配置文件改好，运行 balethirq.pl 即时生效
+
+eth0            3
+eth1            4
+xhci-hcd:usb3   2
+xhci-hcd:usb5   3