diff --git a/.github/workflows/build-armbian.yml b/.github/workflows/build-armbian.yml index 62a4f5f531..2d2af307b2 100644 --- a/.github/workflows/build-armbian.yml +++ b/.github/workflows/build-armbian.yml @@ -173,6 +173,7 @@ on: - zcube1-max - zk-r39a - zysj + - wxy-oec armbian_kernel: description: "Select kernel version." required: false diff --git a/.github/workflows/build-homeassistant.yml b/.github/workflows/build-homeassistant.yml index 6c6d76ca6f..e7545f1463 100644 --- a/.github/workflows/build-homeassistant.yml +++ b/.github/workflows/build-homeassistant.yml @@ -174,6 +174,7 @@ on: - zcube1-max - zk-r39a - zysj + - wxy-oec armbian_kernel: description: "Select kernel version." required: false diff --git a/.github/workflows/rebuild-armbian.yml b/.github/workflows/rebuild-armbian.yml index 0db27fd84f..15b89e1a3e 100644 --- a/.github/workflows/rebuild-armbian.yml +++ b/.github/workflows/rebuild-armbian.yml @@ -167,6 +167,7 @@ on: - zcube1-max - zk-r39a - zysj + - wxy-oec armbian_kernel: description: "Select kernel version." required: false diff --git a/build-armbian/armbian-files/common-files/etc/model_database.conf b/build-armbian/armbian-files/common-files/etc/model_database.conf index 446cd1ffaa..4476ef999f 100644 --- a/build-armbian/armbian-files/common-files/etc/model_database.conf +++ b/build-armbian/armbian-files/common-files/etc/model_database.conf @@ -237,7 +237,7 @@ r213 :DG-TN3568 :rk3568 :rk3568-dg-tn3568 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 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 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 - +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 # Rockchip RK3399 Family #-------+--------------------------------------------+---------+---------------------------------------+-----------------------------+------------------------------------+--------------------------------+-------------------------------------------+----------------+------------+-------------+----------------+-----------------------------------------------------+--------------------+---------- diff --git a/build-armbian/armbian-files/different-files/wxy-oec/bootfs/armbianEnv.txt b/build-armbian/armbian-files/different-files/wxy-oec/bootfs/armbianEnv.txt new file mode 100644 index 0000000000..7cd481e655 --- /dev/null +++ b/build-armbian/armbian-files/different-files/wxy-oec/bootfs/armbianEnv.txt @@ -0,0 +1,17 @@ +verbosity=7 +bootlogo=true +fdtfile=rockchip/test.dtb +rootdev=UUID=7d044e58-81e8-4f3b-8ffb-3540fd10730d +rootfstype=ext4 +rootflags=rw,errors=remount-ro +console=serial +consoleargs=console=ttyS2,1500000 +docker_optimizations=on +earlycon=on +earlyconargs=earlycon=uart8250,mmio32,0xfe660000 +extraargs= +extraboardargs=net.ifnames=0 max_loop=128 +overlay_prefix=rk3566 +overlays= +user_overlays= +usbstoragequirks=0x2537:0x1066:u,0x2537:0x1068:u diff --git a/build-armbian/armbian-files/different-files/wxy-oec/bootfs/boot.cmd b/build-armbian/armbian-files/different-files/wxy-oec/bootfs/boot.cmd new file mode 100644 index 0000000000..7cad05ea0a --- /dev/null +++ b/build-armbian/armbian-files/different-files/wxy-oec/bootfs/boot.cmd @@ -0,0 +1,74 @@ +# DO NOT EDIT THIS FILE +# +# Please edit /boot/armbianEnv.txt to set supported parameters +# + +setenv load_addr "0x39000000" +setenv overlay_error "false" +# default values +setenv rootdev "/dev/mmcblk0p1" +setenv verbosity "1" +setenv console "both" +setenv bootlogo "false" +setenv rootfstype "ext4" +setenv rootflags "rw,errors=remount-ro" +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 "${consoleargs} console=tty1"; fi +if test "${earlycon}" = "on"; then setenv consoleargs "${earlyconargs} ${consoleargs}"; fi +if test "${bootlogo}" = "true"; then setenv consoleargs "bootsplash.bootfile=bootsplash.armbian ${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} rootflags=${rootflags} ${consoleargs} consoleblank=0 loglevel=${verbosity} 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 +booti ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r} + +# Recompile with: +# mkimage -C none -A arm -T script -n 'flatmax load script' -d /boot/boot.cmd /boot/boot.scr diff --git a/build-armbian/armbian-files/different-files/wxy-oec/bootfs/boot.scr b/build-armbian/armbian-files/different-files/wxy-oec/bootfs/boot.scr new file mode 100644 index 0000000000..69da6effad Binary files /dev/null and b/build-armbian/armbian-files/different-files/wxy-oec/bootfs/boot.scr differ diff --git a/build-armbian/armbian-files/platform-files/rockchip/bootfs/dtb/rockchip/wxy-oec-RK3566-4G.dtb b/build-armbian/armbian-files/platform-files/rockchip/bootfs/dtb/rockchip/wxy-oec-RK3566-4G.dtb new file mode 100644 index 0000000000..96cd24bb21 Binary files /dev/null and b/build-armbian/armbian-files/platform-files/rockchip/bootfs/dtb/rockchip/wxy-oec-RK3566-4G.dtb differ