Skip to content

Commit 30fd136

Browse files
authored
Merge pull request #3052 from lighthx/main
Support Orangepi 5B
2 parents 7a3b641 + 6723a10 commit 30fd136

File tree

8 files changed

+108
-1
lines changed

8 files changed

+108
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ on:
6868
- nanopi-r5c
6969
- nanopi-r5s
7070
- orangepi-5-plus
71+
- orangepi-5b
7172
- panther-x2
7273
- r66s
7374
- r68s

build-armbian/armbian-files/common-files/etc/custom_service/start_service.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,18 @@ if [[ "${FDT_FILE}" == "rk3588-smart-am60.dtb" ]]; then
6767
log_message "Bluetooth firmware download process started for Smart-am60."
6868
fi
6969

70+
# For orangepi-5b(rk3588s) board: Bluetooth control
71+
if [[ "${FDT_FILE}" == "rk3588s-orangepi-5b.dtb" ]]; then
72+
# This is a sequence of commands, with the last one running in the background.
73+
# The background command (&) won't affect the script's exit code.
74+
rfkill block all
75+
chmod a+x /lib/firmware/ap6276p/brcm_patchram_plus1 2>/dev/null || true
76+
sleep .5
77+
rfkill unblock all
78+
/lib/firmware/ap6276p/brcm_patchram_plus1 --enable_hci --no2bytes --use_baudrate_for_download --tosleep 200000 --baudrate 1500000 --patchram /lib/firmware/ap6275p/BCM4362A2.hcd /dev/ttyS9 &
79+
log_message "Bluetooth firmware download process started for Orangepi-5b."
80+
fi
81+
7082
# General System Services
7183

7284
# Restart ssh service

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ r106 :Orange-Pi-5-Plus :rk3588 :rk3588-orangepi-
214214
r107 :NanoPC-T6 :rk3588 :rk3588-nanopc-t6.dtb :NA :u-boot.itb :idbloader.img :4/8/16GB-RAM,32/64/256Gb-ROM,2x2.5Gb-Nic :stable/6.1.y :rockchip :rk3588 :armbianEnv.txt :hunter24099 :nanopc-t6 :yes
215215
r108 :Smart-Am60 :rk3588 :rk3588-smart-am60.dtb :NA :u-boot.itb :idbloader.img :8/16GB-RAM,64/256Gb-ROM,1Gb-Nic :rk3588/6.1.y :rockchip :rk3588 :armbianEnv.txt :dy008 :smart-am60 :yes
216216
r109 :DC-A588 :rk3588 :rk3588-dc-a588.dtb :NA :u-boot.itb :idbloader.img :4/8/16GB-RAM,16~128Gb-eMMC,TF,2x1Gb-Nic :rk3588/6.1.y :rockchip :rk3588 :armbianEnv.txt :AndroidOL,Lemon1151 :dc-a588 :yes
217-
217+
r110 :Orange-Pi-5B :rk3588S :rk3588s-orangepi-5b.dtb :NA :u-boot.itb :idbloader.img :4/8/16GB-RAM,16~256Gb-eMMC,TF,1Gb-Nic :rk3588/6.1.y :rockchip :rk3588s :armbianEnv.txt :lighthx :orangepi-5b :yes
218218

219219
# Rockchip RK3568 Family
220220
#-------+--------------------------------------------+---------+---------------------------------------+-----------------------------+------------------------------------+--------------------------------+-------------------------------------------+----------------+------------+-------------+----------------+-----------------------------------------------------+--------------------+----------
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
verbosity=7
2+
bootlogo=true
3+
fdtfile=rockchip/rk3588s-orangepi-5b.dtb
4+
rootdev=/dev/mmcblk0p2
5+
rootfstype=btrfs
6+
rootflags=compress=zstd:6
7+
earlycon=on
8+
console=serial
9+
consoleargs=console=ttyFIQ0 console=tty1
10+
usbstoragequirks=0x2537:0x1066:u,0x2537:0x1068:u
11+
docker_optimizations=on
12+
extraargs=rw rootwait
13+
extraboardargs=net.ifnames=0 max_loop=128
14+
overlay_prefix=rk3588
15+
overlays=uart7-m2
16+
user_overlays=
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# DO NOT EDIT THIS FILE
2+
#
3+
# Please edit /boot/armbianEnv.txt to set supported parameters
4+
#
5+
6+
setenv load_addr "0x9000000"
7+
setenv overlay_error "false"
8+
# default values
9+
setenv rootdev "/dev/mmcblk0p1"
10+
setenv verbosity "1"
11+
setenv console "both"
12+
setenv bootlogo "false"
13+
setenv rootfstype "ext4"
14+
setenv rootflags "rw,errors=remount-ro"
15+
setenv docker_optimizations "on"
16+
setenv earlycon "off"
17+
18+
echo "Boot script loaded from ${devtype} ${devnum}"
19+
20+
if test -e ${devtype} ${devnum} ${prefix}armbianEnv.txt; then
21+
load ${devtype} ${devnum} ${load_addr} ${prefix}armbianEnv.txt
22+
env import -t ${load_addr} ${filesize}
23+
fi
24+
25+
if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
26+
27+
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
28+
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS2,1500000 ${consoleargs}"; fi
29+
if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
30+
if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${consoleargs}"; fi
31+
32+
# get PARTUUID of first partition on SD/eMMC the boot script was loaded from
33+
# if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:1 partuuid; fi
34+
# get PARTUUID of first partition on current boot device the boot script was loaded from
35+
part uuid ${devtype} ${devnum}:1 partuuid
36+
37+
setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} rootflags=${rootflags} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
38+
39+
if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory swapaccount=1"; fi
40+
41+
load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
42+
load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image
43+
44+
load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
45+
fdt addr ${fdt_addr_r}
46+
fdt resize 65536
47+
for overlay_file in ${overlays}; do
48+
if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
49+
echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
50+
fdt apply ${load_addr} || setenv overlay_error "true"
51+
fi
52+
done
53+
for overlay_file in ${user_overlays}; do
54+
if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
55+
echo "Applying user provided DT overlay ${overlay_file}.dtbo"
56+
fdt apply ${load_addr} || setenv overlay_error "true"
57+
fi
58+
done
59+
if test "${overlay_error}" = "true"; then
60+
echo "Error applying DT overlays, restoring original DT"
61+
load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
62+
else
63+
if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then
64+
echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
65+
source ${load_addr}
66+
fi
67+
if test -e ${devtype} ${devnum} ${prefix}fixup.scr; then
68+
load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr
69+
echo "Applying user provided fixup script (fixup.scr)"
70+
source ${load_addr}
71+
fi
72+
fi
73+
booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
74+
75+
# Recompile with:
76+
# mkimage -C none -A arm -T script -n 'flatmax load script' -d /boot/boot.cmd /boot/boot.scr
Binary file not shown.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
xhci-hcd:usb2 2
2+
xhci-hcd:usb7 3
Binary file not shown.

0 commit comments

Comments
 (0)