Skip to content

Commit 1e7e911

Browse files
authored
Merge pull request #2736 from andyfanybo/main
Add wxy OEC-turbo
2 parents e763433 + a3d1752 commit 1e7e911

File tree

8 files changed

+95
-1
lines changed

8 files changed

+95
-1
lines changed

.github/workflows/build-armbian.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ on:
173173
- zcube1-max
174174
- zk-r39a
175175
- zysj
176+
- wxy-oec
176177
armbian_kernel:
177178
description: "Select kernel version."
178179
required: false

.github/workflows/build-homeassistant.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ on:
174174
- zcube1-max
175175
- zk-r39a
176176
- zysj
177+
- wxy-oec
177178
armbian_kernel:
178179
description: "Select kernel version."
179180
required: false

.github/workflows/rebuild-armbian.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ on:
167167
- zcube1-max
168168
- zk-r39a
169169
- zysj
170+
- wxy-oec
170171
armbian_kernel:
171172
description: "Select kernel version."
172173
required: false

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ r213 :DG-TN3568 :rk3568 :rk3568-dg-tn3568
237237
r301 :Panther-X2 :rk3566 :rk3566-panther-x2.dtb :NA :u-boot.itb :idbloader.img :4GB-LPDDR4,32G-eMMC,64G-TF,2x1Gb-Nic :stable/6.1.y :rockchip :rk3566 :armbianEnv.txt :tdleiyao :panther-x2 :yes
238238
r302 :JP-TvBox :rk3566 :rk3566-jp-tvbox.dtb :NA :u-boot.itb :idbloader.img :8GB-LPDDR4,32G-eMMC,SATA,1Gb-Nic :stable/6.1.y :rockchip :rk3566 :armbianEnv.txt :unifreq :jp-tvbox :yes
239239
r303 :LCKFB-Taishan-Pi :rk3566 :rk3566-taishanpi-v10.dtb :NA :u-boot.itb :idbloader.img :2GB-LPDDR4,16G-eMMC,SATA,1Gb-Nic :rk35xx/6.1.y :rockchip :rk3566 :armbianEnv.txt :ccu6 :lckfb-tspi :yes
240-
240+
r304 :wxy-oec :rk3566 :wxy-oec-RK3566-4G.dtb :NA :u-boot.itb :idbloader.img :4GB-LPDDR4,8G-eMMC,SATA,1Gb-Nic :rk35xx/6.1.y :rockchip :rk3566 :armbianEnv.txt :andy :wxy-oec :yes
241241

242242
# Rockchip RK3399 Family
243243
#-------+--------------------------------------------+---------+---------------------------------------+-----------------------------+------------------------------------+--------------------------------+-------------------------------------------+----------------+------------+-------------+----------------+-----------------------------------------------------+--------------------+----------
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
verbosity=7
2+
bootlogo=true
3+
fdtfile=rockchip/test.dtb
4+
rootdev=UUID=7d044e58-81e8-4f3b-8ffb-3540fd10730d
5+
rootfstype=ext4
6+
rootflags=rw,errors=remount-ro
7+
console=serial
8+
consoleargs=console=ttyS2,1500000
9+
docker_optimizations=on
10+
earlycon=on
11+
earlyconargs=earlycon=uart8250,mmio32,0xfe660000
12+
extraargs=
13+
extraboardargs=net.ifnames=0 max_loop=128
14+
overlay_prefix=rk3566
15+
overlays=
16+
user_overlays=
17+
usbstoragequirks=0x2537:0x1066:u,0x2537:0x1068:u
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# DO NOT EDIT THIS FILE
2+
#
3+
# Please edit /boot/armbianEnv.txt to set supported parameters
4+
#
5+
6+
setenv load_addr "0x39000000"
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 "${consoleargs} console=tty1"; fi
29+
if test "${earlycon}" = "on"; then setenv consoleargs "${earlyconargs} ${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+
35+
setenv bootargs "root=${rootdev} rootwait rootfstype=${rootfstype} rootflags=${rootflags} ${consoleargs} consoleblank=0 loglevel=${verbosity} usb-storage.quirks=${usbstoragequirks} ${extraargs} ${extraboardargs}"
36+
37+
if test "${docker_optimizations}" = "on"; then setenv bootargs "${bootargs} cgroup_enable=cpuset cgroup_memory=1 cgroup_enable=memory swapaccount=1"; fi
38+
39+
load ${devtype} ${devnum} ${ramdisk_addr_r} ${prefix}uInitrd
40+
load ${devtype} ${devnum} ${kernel_addr_r} ${prefix}Image
41+
42+
load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
43+
fdt addr ${fdt_addr_r}
44+
fdt resize 65536
45+
for overlay_file in ${overlays}; do
46+
if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-${overlay_file}.dtbo; then
47+
echo "Applying kernel provided DT overlay ${overlay_prefix}-${overlay_file}.dtbo"
48+
fdt apply ${load_addr} || setenv overlay_error "true"
49+
fi
50+
done
51+
for overlay_file in ${user_overlays}; do
52+
if load ${devtype} ${devnum} ${load_addr} ${prefix}overlay-user/${overlay_file}.dtbo; then
53+
echo "Applying user provided DT overlay ${overlay_file}.dtbo"
54+
fdt apply ${load_addr} || setenv overlay_error "true"
55+
fi
56+
done
57+
if test "${overlay_error}" = "true"; then
58+
echo "Error applying DT overlays, restoring original DT"
59+
load ${devtype} ${devnum} ${fdt_addr_r} ${prefix}dtb/${fdtfile}
60+
else
61+
if load ${devtype} ${devnum} ${load_addr} ${prefix}dtb/rockchip/overlay/${overlay_prefix}-fixup.scr; then
62+
echo "Applying kernel provided DT fixup script (${overlay_prefix}-fixup.scr)"
63+
source ${load_addr}
64+
fi
65+
if test -e ${devtype} ${devnum} ${prefix}fixup.scr; then
66+
load ${devtype} ${devnum} ${load_addr} ${prefix}fixup.scr
67+
echo "Applying user provided fixup script (fixup.scr)"
68+
source ${load_addr}
69+
fi
70+
fi
71+
booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
72+
73+
# Recompile with:
74+
# mkimage -C none -A arm -T script -n 'flatmax load script' -d /boot/boot.cmd /boot/boot.scr
Binary file not shown.

0 commit comments

Comments
 (0)