Skip to content

Commit 2871f29

Browse files
committed
add smart am60 board
1 parent 09c3368 commit 2871f29

File tree

6 files changed

+108
-7
lines changed

6 files changed

+108
-7
lines changed

.github/workflows/build-armbian.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ on:
158158
- s922x-ugoos-am6
159159
- seewo-sv21
160160
- smart-am40
161+
- smart-am60
161162
- station-m1
162163
- swan1-w28
163164
- sw799
@@ -203,6 +204,7 @@ on:
203204
type: choice
204205
options:
205206
- ophub/kernel
207+
- dy008/kernel
206208
kernel_usage:
207209
description: "Set the tags of the stable kernel."
208210
required: false
@@ -213,6 +215,7 @@ on:
213215
- flippy
214216
- dev
215217
- beta
218+
- rk3588
216219
armbian_fstype:
217220
description: "Select armbian rootfs type."
218221
required: false
@@ -237,7 +240,7 @@ on:
237240
options:
238241
- ophub
239242
- angel
240-
- yourname
243+
- dy008
241244

242245
env:
243246
TZ: America/New_York
@@ -300,7 +303,7 @@ jobs:
300303
df -hT ${PWD}
301304
git clone -q --single-branch --depth=1 --branch=main https://github.com/armbian/build.git build
302305
ln -sf /builder/build ${GITHUB_WORKSPACE}/build
303-
ln -sf /builder/build /home/runner/work/_actions/ophub/amlogic-s9xxx-armbian/main/build
306+
ln -sf /builder/build /home/runner/work/_actions/dy008/amlogic-s9xxx-armbian/main/build
304307
echo "status=success" >> ${GITHUB_OUTPUT}
305308
306309
- name: Compile Armbian [ ${{ inputs.set_release }} ]
@@ -338,7 +341,7 @@ jobs:
338341
token: ${{ secrets.GITHUB_TOKEN }}
339342

340343
- name: Rebuild Armbian
341-
uses: ophub/amlogic-s9xxx-armbian@main
344+
uses: dy008/amlogic-s9xxx-armbian@main
342345
if: ${{ steps.clean.outputs.status }} == 'success' && !cancelled()
343346
with:
344347
build_target: armbian

.github/workflows/use-releases-file-to-build.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ on:
158158
- s922x-ugoos-am6
159159
- seewo-sv21
160160
- smart-am40
161+
- smart-am60
161162
- station-m1
162163
- swan1-w28
163164
- sw799
@@ -203,6 +204,7 @@ on:
203204
type: choice
204205
options:
205206
- ophub/kernel
207+
- dy008/kernel
206208
kernel_usage:
207209
description: "Set the tags of the stable kernel."
208210
required: false
@@ -213,6 +215,7 @@ on:
213215
- flippy
214216
- dev
215217
- beta
218+
- rk3588
216219
armbian_fstype:
217220
description: "Select armbian rootfs type."
218221
required: false
@@ -237,7 +240,7 @@ on:
237240
options:
238241
- ophub
239242
- angel
240-
- yourname
243+
- dy008
241244

242245
env:
243246
TZ: America/New_York
@@ -299,7 +302,7 @@ jobs:
299302
armbian_buildpath="build/output/images"
300303
[[ -d "${armbian_buildpath}" ]] || mkdir -p "${armbian_buildpath}"
301304
ln -sf /builder/build ${GITHUB_WORKSPACE}/build
302-
ln -sf /builder/build /home/runner/work/_actions/ophub/amlogic-s9xxx-armbian/main/build
305+
ln -sf /builder/build /home/runner/work/_actions/dy008/amlogic-s9xxx-armbian/main/build
303306
304307
latest_version=$(curl -s \
305308
-H "Accept: application/vnd.github+json" \
@@ -327,7 +330,7 @@ jobs:
327330
echo "status=success" >> ${GITHUB_OUTPUT}
328331
329332
- name: Rebuild Armbian [ ${{ inputs.set_release }} ]
330-
uses: ophub/amlogic-s9xxx-armbian@main
333+
uses: dy008/amlogic-s9xxx-armbian@main
331334
if: ${{ steps.down.outputs.status }} == 'success' && !cancelled()
332335
with:
333336
build_target: armbian

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,8 @@ r105 :Rock5C :rk3588s :rk3588s-rock-5c.
205205
#-------+--------------------------------------------+---------+---------------------------------------+-----------------------------+------------------------------------+--------------------------------+-------------------------------------------+----------------+------------+-------------+----------------+-----------------------------------------------------+--------------------+----------
206206
r106 :Orange-Pi-5-Plus :rk3588 :rk3588-orangepi-5-plus.dtb :NA :u-boot.itb :idbloader.img :Oct-core,4/8/16GB-RAM,2.5Gb-Nic :rk3588/5.10.y :rockchip :rk3588 :armbianEnv.txt :yonggedebaqi :orangepi-5-plus :yes
207207
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
208-
208+
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
209+
:dy008 :smart-am60 :yes
209210

210211
# Rockchip RK3568 Family
211212
#-------+--------------------------------------------+---------+---------------------------------------+-----------------------------+------------------------------------+--------------------------------+-------------------------------------------+----------------+------------+-------------+----------------+-----------------------------------------------------+--------------------+----------
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
verbosity=9
2+
bootlogo=false
3+
fdtfile=rockchip/rk3588-smart-am60.dtb
4+
rootdev=/dev/mmcblk0p2
5+
rootfstype=ext4
6+
rootflags=rw,errors=remount-ro
7+
overlay_prefix=rk3588
8+
overlays=
9+
extraargs=
10+
extraboardargs=net.ifnames=0 max_loop=128
11+
docker_optimizations=on
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
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 docker_optimizations "on"
15+
setenv earlycon "off"
16+
17+
test -n "${distro_bootpart}" || distro_bootpart=1
18+
19+
echo "Boot script loaded from ${devtype} ${devnum}:${distro_bootpart}"
20+
21+
if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}armbianEnv.txt; then
22+
load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}armbianEnv.txt
23+
env import -t ${load_addr} ${filesize}
24+
fi
25+
26+
if test "${logo}" = "disabled"; then setenv logo "logo.nologo"; fi
27+
28+
if test "${console}" = "display" || test "${console}" = "both"; then setenv consoleargs "console=tty1"; fi
29+
if test "${console}" = "serial" || test "${console}" = "both"; then setenv consoleargs "console=ttyS2,1500000 ${consoleargs}"; fi
30+
if test "${earlycon}" = "on"; then setenv consoleargs "earlycon ${consoleargs}"; fi
31+
if test "${bootlogo}" = "true"; then
32+
setenv consoleargs "splash plymouth.ignore-serial-consoles ${consoleargs}"
33+
else
34+
setenv consoleargs "splash=verbose ${consoleargs}"
35+
fi
36+
37+
# get PARTUUID of first partition on SD/eMMC the boot script was loaded from
38+
if test "${devtype}" = "mmc"; then part uuid mmc ${devnum}:${distro_bootpart} partuuid; fi
39+
40+
setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} ${consoleargs} consoleblank=0 loglevel=${verbosity} ubootpart=${partuuid} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
41+
42+
if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory"; fi
43+
44+
load ${devtype} ${devnum}:${distro_bootpart} ${ramdisk_addr_r} ${prefix}uInitrd
45+
load ${devtype} ${devnum}:${distro_bootpart} ${kernel_addr_r} ${prefix}Image
46+
47+
load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
48+
fdt addr ${fdt_addr_r}
49+
fdt resize 65536
50+
for overlay_file in ${overlays}; do
51+
if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
52+
echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
53+
fdt apply ${load_addr} || setenv overlay_error "true"
54+
fi
55+
done
56+
for overlay_file in ${user_overlays}; do
57+
if load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
58+
echo "Applying user provided DT overlay ${overlay_file}.dtbo"
59+
fdt apply ${load_addr} || setenv overlay_error "true"
60+
fi
61+
done
62+
if test "${overlay_error}" = "true"; then
63+
echo "Error applying DT overlays, restoring original DT"
64+
load ${devtype} ${devnum}:${distro_bootpart} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
65+
else
66+
if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then
67+
load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr
68+
echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
69+
source ${load_addr}
70+
fi
71+
if test -e ${devtype} ${devnum}:${distro_bootpart} ${prefix}fixup.scr; then
72+
load ${devtype} ${devnum}:${distro_bootpart} ${load_addr} ${prefix}fixup.scr
73+
echo "Applying user provided fixup script (fixup.scr)"
74+
source ${load_addr}
75+
fi
76+
fi
77+
78+
echo "Trying 'kaslrseed' command... Info: 'Unknown command' can be safely ignored since 'kaslrseed' does not apply to all boards."
79+
kaslrseed # @TODO: This gives an error (Unknown command ' kaslrseed ' - try 'help') on many devices since CONFIG_CMD_KASLRSEED is not enabled
80+
booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
81+
82+
# Recompile with:
83+
# mkimage -C none -A arm -T script -d /boot/boot.cmd /boot/boot.scr
Binary file not shown.

0 commit comments

Comments
 (0)