diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
index 84fef336a..51c3062d7 100644
--- a/.github/workflows/build-images.yml
+++ b/.github/workflows/build-images.yml
@@ -85,7 +85,7 @@ jobs:
runs-on: [ubuntu-latest]
steps:
- name: Purge
- uses: dev-drprasad/delete-older-releases@v0.2.0
+ uses: dev-drprasad/delete-older-releases@v0.3.4
with:
keep_latest: 7
delete_tag_pattern: trunk
diff --git a/CREDITS.md b/CREDITS.md
index c1fec70bc..2aa330bc9 100644
--- a/CREDITS.md
+++ b/CREDITS.md
@@ -1,2 +1,8 @@
[https://github.com/orgs/armbian/people](https://github.com/orgs/armbian/people)
[https://www.armbian.com/authors](https://www.armbian.com/authors)
+
+ThirdReality HubV3 support started from JetHome's JetHub D1 (j100) work by
+Vyacheslav Bocharov ([JetHome](https://jethome.ru)): the trhub board/DTS code
+and the USB burn image converter, now in
+[amlogic-boot-tools](https://github.com/thirdreality/amlogic-boot-tools) `burn/`,
+which derives from [jethome-tools](https://github.com/jethome-iot/jethome-tools).
diff --git a/amlogic-tools.repo/.gitignore b/amlogic-tools.repo/.gitignore
deleted file mode 100644
index 15b44c816..000000000
--- a/amlogic-tools.repo/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-build**
-output**
diff --git a/amlogic-tools.repo/README.md b/amlogic-tools.repo/README.md
deleted file mode 100644
index d694223f9..000000000
--- a/amlogic-tools.repo/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# jethome-tools
-
-Разработка преобразования образов SD -> USB Burning Tool
-
-**Внимание** Репозиторий может быть перезаписан с force push.
diff --git a/amlogic-tools.repo/bins/hubv3/DDR.USB b/amlogic-tools.repo/bins/hubv3/DDR.USB
deleted file mode 100644
index de5f9fc7d..000000000
Binary files a/amlogic-tools.repo/bins/hubv3/DDR.USB and /dev/null differ
diff --git a/amlogic-tools.repo/bins/hubv3/DDR.USB.default b/amlogic-tools.repo/bins/hubv3/DDR.USB.default
deleted file mode 100644
index 0103faaed..000000000
Binary files a/amlogic-tools.repo/bins/hubv3/DDR.USB.default and /dev/null differ
diff --git a/amlogic-tools.repo/bins/hubv3/UBOOT.USB b/amlogic-tools.repo/bins/hubv3/UBOOT.USB
deleted file mode 100644
index 93009b846..000000000
Binary files a/amlogic-tools.repo/bins/hubv3/UBOOT.USB and /dev/null differ
diff --git a/amlogic-tools.repo/bins/hubv3/UBOOT.USB.default b/amlogic-tools.repo/bins/hubv3/UBOOT.USB.default
deleted file mode 100644
index dd8945774..000000000
Binary files a/amlogic-tools.repo/bins/hubv3/UBOOT.USB.default and /dev/null differ
diff --git a/amlogic-tools.repo/bins/hubv3/image.armbian.cfg b/amlogic-tools.repo/bins/hubv3/image.armbian.cfg
deleted file mode 100644
index 6f4962e85..000000000
--- a/amlogic-tools.repo/bins/hubv3/image.armbian.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-[LIST_NORMAL]
-file="DDR.USB" main_type="USB" sub_type="DDR"
-file="UBOOT.USB" main_type="USB" sub_type="UBOOT"
-file="_aml_dtb.PARTITION" main_type="dtb" sub_type="meson1"
-file="platform.conf" main_type="conf" sub_type="platform"
-
-[LIST_VERIFY]
-file="_aml_dtb.PARTITION" main_type="PARTITION" sub_type="_aml_dtb"
-file="u-boot.bin" main_type="PARTITION" sub_type="bootloader"
-file="part-1.img" main_type="PARTITION" sub_type="rootfs"
diff --git a/amlogic-tools.repo/bins/hubv3/image.haos.cfg b/amlogic-tools.repo/bins/hubv3/image.haos.cfg
deleted file mode 100644
index 8e6669cbe..000000000
--- a/amlogic-tools.repo/bins/hubv3/image.haos.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-[LIST_NORMAL]
-file="DDR.USB" main_type="USB" sub_type="DDR"
-file="UBOOT.USB" main_type="USB" sub_type="UBOOT"
-file="_aml_dtb.PARTITION" main_type="dtb" sub_type="meson1"
-file="platform.conf" main_type="conf" sub_type="platform"
-
-[LIST_VERIFY]
-file="_aml_dtb.PARTITION" main_type="PARTITION" sub_type="_aml_dtb"
-file="u-boot.bin" main_type="PARTITION" sub_type="bootloader"
-file="part-1.img" main_type="PARTITION" sub_type="boothaos"
-file="part-2.img" main_type="PARTITION" sub_type="overlay"
-file="part-3.img" main_type="PARTITION" sub_type="data"
-file="part-4.img" main_type="PARTITION" sub_type="kernela"
-file="part-5.img" main_type="PARTITION" sub_type="systema"
-file="part-6.img" main_type="PARTITION" sub_type="kernelb"
-file="part-7.img" main_type="PARTITION" sub_type="systemb"
-file="part-8.img" main_type="PARTITION" sub_type="bootinfo"
diff --git a/amlogic-tools.repo/bins/hubv3/platform.conf b/amlogic-tools.repo/bins/hubv3/platform.conf
deleted file mode 100644
index 66289ab9f..000000000
--- a/amlogic-tools.repo/bins/hubv3/platform.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Platform:0x0811
-DDRLoad:0xfffc0000
-DDRRun:0xfffc0000
-UbootLoad:0x200c000
-UbootRun:0xfffc0000
-Control0=0xfffc0000:0x000000b1
-Control1=0xfffc0000:0x00005183
-Encrypt_reg:0xff800228
-bl2ParaAddr=0xfffcc000
diff --git a/amlogic-tools.repo/bins/image.armbian.cfg b/amlogic-tools.repo/bins/image.armbian.cfg
deleted file mode 100644
index fe934c977..000000000
--- a/amlogic-tools.repo/bins/image.armbian.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-[LIST_NORMAL]
-file="DDR.USB" main_type="USB" sub_type="DDR"
-file="UBOOT.USB" main_type="USB" sub_type="UBOOT"
-file="_aml_dtb.PARTITION" main_type="dtb" sub_type="meson1"
-file="platform.conf" main_type="conf" sub_type="platform"
-
-[LIST_VERIFY]
-file="_aml_dtb.PARTITION" main_type="PARTITION" sub_type="_aml_dtb"
-file="u-boot.bin" main_type="PARTITION" sub_type="bootloader"
-file="part-1.img" main_type="PARTITION" sub_type="boot"
-file="part-2.img" main_type="PARTITION" sub_type="rootfs"
diff --git a/amlogic-tools.repo/bins/image.cfg b/amlogic-tools.repo/bins/image.cfg
deleted file mode 100644
index 8e6669cbe..000000000
--- a/amlogic-tools.repo/bins/image.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-[LIST_NORMAL]
-file="DDR.USB" main_type="USB" sub_type="DDR"
-file="UBOOT.USB" main_type="USB" sub_type="UBOOT"
-file="_aml_dtb.PARTITION" main_type="dtb" sub_type="meson1"
-file="platform.conf" main_type="conf" sub_type="platform"
-
-[LIST_VERIFY]
-file="_aml_dtb.PARTITION" main_type="PARTITION" sub_type="_aml_dtb"
-file="u-boot.bin" main_type="PARTITION" sub_type="bootloader"
-file="part-1.img" main_type="PARTITION" sub_type="boothaos"
-file="part-2.img" main_type="PARTITION" sub_type="overlay"
-file="part-3.img" main_type="PARTITION" sub_type="data"
-file="part-4.img" main_type="PARTITION" sub_type="kernela"
-file="part-5.img" main_type="PARTITION" sub_type="systema"
-file="part-6.img" main_type="PARTITION" sub_type="kernelb"
-file="part-7.img" main_type="PARTITION" sub_type="systemb"
-file="part-8.img" main_type="PARTITION" sub_type="bootinfo"
diff --git a/amlogic-tools.repo/bins/image.haos.cfg b/amlogic-tools.repo/bins/image.haos.cfg
deleted file mode 100644
index 8e6669cbe..000000000
--- a/amlogic-tools.repo/bins/image.haos.cfg
+++ /dev/null
@@ -1,17 +0,0 @@
-[LIST_NORMAL]
-file="DDR.USB" main_type="USB" sub_type="DDR"
-file="UBOOT.USB" main_type="USB" sub_type="UBOOT"
-file="_aml_dtb.PARTITION" main_type="dtb" sub_type="meson1"
-file="platform.conf" main_type="conf" sub_type="platform"
-
-[LIST_VERIFY]
-file="_aml_dtb.PARTITION" main_type="PARTITION" sub_type="_aml_dtb"
-file="u-boot.bin" main_type="PARTITION" sub_type="bootloader"
-file="part-1.img" main_type="PARTITION" sub_type="boothaos"
-file="part-2.img" main_type="PARTITION" sub_type="overlay"
-file="part-3.img" main_type="PARTITION" sub_type="data"
-file="part-4.img" main_type="PARTITION" sub_type="kernela"
-file="part-5.img" main_type="PARTITION" sub_type="systema"
-file="part-6.img" main_type="PARTITION" sub_type="kernelb"
-file="part-7.img" main_type="PARTITION" sub_type="systemb"
-file="part-8.img" main_type="PARTITION" sub_type="bootinfo"
diff --git a/amlogic-tools.repo/bins/j100/DDR.USB b/amlogic-tools.repo/bins/j100/DDR.USB
deleted file mode 100644
index 78239a127..000000000
Binary files a/amlogic-tools.repo/bins/j100/DDR.USB and /dev/null differ
diff --git a/amlogic-tools.repo/bins/j100/DDR_ENC.USB b/amlogic-tools.repo/bins/j100/DDR_ENC.USB
deleted file mode 100644
index 3c47896de..000000000
Binary files a/amlogic-tools.repo/bins/j100/DDR_ENC.USB and /dev/null differ
diff --git a/amlogic-tools.repo/bins/j100/UBOOT.USB b/amlogic-tools.repo/bins/j100/UBOOT.USB
deleted file mode 100644
index 55cd19041..000000000
Binary files a/amlogic-tools.repo/bins/j100/UBOOT.USB and /dev/null differ
diff --git a/amlogic-tools.repo/bins/j100/UBOOT_ENC.USB b/amlogic-tools.repo/bins/j100/UBOOT_ENC.USB
deleted file mode 100644
index 908094c59..000000000
Binary files a/amlogic-tools.repo/bins/j100/UBOOT_ENC.USB and /dev/null differ
diff --git a/amlogic-tools.repo/bins/j100/platform.conf b/amlogic-tools.repo/bins/j100/platform.conf
deleted file mode 100644
index 66289ab9f..000000000
--- a/amlogic-tools.repo/bins/j100/platform.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Platform:0x0811
-DDRLoad:0xfffc0000
-DDRRun:0xfffc0000
-UbootLoad:0x200c000
-UbootRun:0xfffc0000
-Control0=0xfffc0000:0x000000b1
-Control1=0xfffc0000:0x00005183
-Encrypt_reg:0xff800228
-bl2ParaAddr=0xfffcc000
diff --git a/amlogic-tools.repo/bins/j200/DDR.USB b/amlogic-tools.repo/bins/j200/DDR.USB
deleted file mode 100644
index 52a5f58a8..000000000
Binary files a/amlogic-tools.repo/bins/j200/DDR.USB and /dev/null differ
diff --git a/amlogic-tools.repo/bins/j200/UBOOT.USB b/amlogic-tools.repo/bins/j200/UBOOT.USB
deleted file mode 100644
index 52a5f58a8..000000000
Binary files a/amlogic-tools.repo/bins/j200/UBOOT.USB and /dev/null differ
diff --git a/amlogic-tools.repo/bins/j200/platform.conf b/amlogic-tools.repo/bins/j200/platform.conf
deleted file mode 100644
index d238f9b71..000000000
--- a/amlogic-tools.repo/bins/j200/platform.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-Platform:0x0811
-DDRLoad:0xfffa0000
-DDRRun:0xfffa0000
-DDRSize:0x10000
-Control0=0xfffa0000:0x000000b1
-Control1=0xfffa0000:0x00005183
-Encrypt_reg:0xff800228
-
diff --git a/amlogic-tools.repo/bins/j80/DDR.USB b/amlogic-tools.repo/bins/j80/DDR.USB
deleted file mode 100644
index 4bfe9454d..000000000
Binary files a/amlogic-tools.repo/bins/j80/DDR.USB and /dev/null differ
diff --git a/amlogic-tools.repo/bins/j80/UBOOT.USB b/amlogic-tools.repo/bins/j80/UBOOT.USB
deleted file mode 100644
index d7ebac281..000000000
Binary files a/amlogic-tools.repo/bins/j80/UBOOT.USB and /dev/null differ
diff --git a/amlogic-tools.repo/bins/j80/platform.conf b/amlogic-tools.repo/bins/j80/platform.conf
deleted file mode 100644
index b43ad6e55..000000000
--- a/amlogic-tools.repo/bins/j80/platform.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Platform:0x0811
-DDRLoad:0xd9000000
-DDRRun:0xd9000000
-UbootLoad:0x200c000
-UbootRun:0xd9000000
-Control0=0xd9000000:0x000000b1
-Control1=0xd9000000:0x00005183
-Encrypt_reg:0xc8100228
-bl2ParaAddr=0xd900c000
diff --git a/amlogic-tools.repo/bins/magicbox/DDR.USB b/amlogic-tools.repo/bins/magicbox/DDR.USB
deleted file mode 100644
index 78239a127..000000000
Binary files a/amlogic-tools.repo/bins/magicbox/DDR.USB and /dev/null differ
diff --git a/amlogic-tools.repo/bins/magicbox/DDR_ENC.USB b/amlogic-tools.repo/bins/magicbox/DDR_ENC.USB
deleted file mode 100644
index 3c47896de..000000000
Binary files a/amlogic-tools.repo/bins/magicbox/DDR_ENC.USB and /dev/null differ
diff --git a/amlogic-tools.repo/bins/magicbox/UBOOT.USB b/amlogic-tools.repo/bins/magicbox/UBOOT.USB
deleted file mode 100644
index 55cd19041..000000000
Binary files a/amlogic-tools.repo/bins/magicbox/UBOOT.USB and /dev/null differ
diff --git a/amlogic-tools.repo/bins/magicbox/UBOOT_ENC.USB b/amlogic-tools.repo/bins/magicbox/UBOOT_ENC.USB
deleted file mode 100644
index 908094c59..000000000
Binary files a/amlogic-tools.repo/bins/magicbox/UBOOT_ENC.USB and /dev/null differ
diff --git a/amlogic-tools.repo/bins/magicbox/platform.conf b/amlogic-tools.repo/bins/magicbox/platform.conf
deleted file mode 100644
index 66289ab9f..000000000
--- a/amlogic-tools.repo/bins/magicbox/platform.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Platform:0x0811
-DDRLoad:0xfffc0000
-DDRRun:0xfffc0000
-UbootLoad:0x200c000
-UbootRun:0xfffc0000
-Control0=0xfffc0000:0x000000b1
-Control1=0xfffc0000:0x00005183
-Encrypt_reg:0xff800228
-bl2ParaAddr=0xfffcc000
diff --git a/amlogic-tools.repo/bins/magicbox/u-boot.bin b/amlogic-tools.repo/bins/magicbox/u-boot.bin
deleted file mode 100644
index 90cba0502..000000000
Binary files a/amlogic-tools.repo/bins/magicbox/u-boot.bin and /dev/null differ
diff --git a/amlogic-tools.repo/bins/magicbox/u-boot.bin.encrypt b/amlogic-tools.repo/bins/magicbox/u-boot.bin.encrypt
deleted file mode 100644
index 85f2bf7d8..000000000
Binary files a/amlogic-tools.repo/bins/magicbox/u-boot.bin.encrypt and /dev/null differ
diff --git a/amlogic-tools.repo/bins/magicbox/u-boot.bin.encrypt.sd.bin b/amlogic-tools.repo/bins/magicbox/u-boot.bin.encrypt.sd.bin
deleted file mode 100644
index 245f42509..000000000
Binary files a/amlogic-tools.repo/bins/magicbox/u-boot.bin.encrypt.sd.bin and /dev/null differ
diff --git a/amlogic-tools.repo/bins/magicbox/u-boot.bin.sd.bin b/amlogic-tools.repo/bins/magicbox/u-boot.bin.sd.bin
deleted file mode 100644
index cd619d6db..000000000
Binary files a/amlogic-tools.repo/bins/magicbox/u-boot.bin.sd.bin and /dev/null differ
diff --git a/amlogic-tools.repo/convert.sh b/amlogic-tools.repo/convert.sh
deleted file mode 100755
index e7fe961cf..000000000
--- a/amlogic-tools.repo/convert.sh
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/bin/bash
-
-source lib.sh
-
-if [ $# -lt 3 ]; then
- echo Usage:
- echo " $0
[compress uboot]"
- echo
- echo " input - input image"
- echo " h1|d1|d2|j80|j100|j200|cma - select controller D1 or H1"
- echo " type - partition type. supported: haos, armbian"
- echo " compress - 'compress' or 'no' output to zip"
- echo " uboot - path to u-boot binary"
- exit
-fi
-
-if [[ "$2" == "v3" || "$2" == "trhubv3" ]]; then
- DTS="meson-axg-thirdreality-trhub-v3.dts"
- CNAME="j100"
-elif [[ "$2" == "v3b" || "$2" == "trhubv3b" ]]; then
- DTS="meson-axg-thirdreality-trhub-v3b.dts"
- CNAME="j100"
-elif [[ "$2" == "v3a" || "$2" == "trhubv3a" ]]; then
- DTS="meson-axg-thirdreality-trhub-v3a.dts"
- CNAME="j100"
-elif [[ "$2" == "h1" || "$2" == "j80" ]]; then
- DTS="meson-gxl-s905w-jethome-jethub-j80.dts"
- CNAME="j80"
-elif [[ "$2" == "d1" || "$2" == "j100" ]]; then
- DTS="meson-axg-jethome-jethub-j100.dts"
- CNAME="j100"
-elif [[ "$2" == "d2" || "$2" == "j200" ]]; then
- DTS="meson-sm1-jethome-jethub-j200.dts"
- CNAME="j200"
-elif [[ "$2" == "cma" ]]; then
- DTS="meson-axg-jethome-jethub-j100.dts"
- CNAME="magicbox"
-else
- echo "ERROR: unknown controller"
- exit
-fi
-
-if [[ "$3" == "haos" ]]; then
- DTI="partition_haos.dtsi"
- CPART="haos"
-elif [[ "$3" == "armbian" ]]; then
- DTI="partition_arm.dtsi"
- CPART="armbian"
-else
- echo "ERROR: unknown partition table"
- exit
-fi
-
-if [[ "$4" == "compress" ]]; then
- COMPRESS=yes
-fi
-
-if [[ -e "$5" ]]; then
- UBOOT="$5"
-else
- echo "Error: u-boot binary did not found"
- exit 1
-fi
-
-echo "UBOOT set to ${UBOOT}"
-
-[[ ! -e $1 ]] && echo No file found && exit
-echo "Selected $CNAME controller with $CPART partition table"
-
-
-INPUT=$(readlink -f $1)
-TMP=$(mktemp -d)
-DTB="$TMP/${DTS::-4}.dtb"
-EXT="${INPUT:${#INPUT}-3:3}"
-if [[ ".xz" == "${EXT}" ]]; then
- INPUTE="${INPUT::-3}"
- echo "Found compressed image. Decompress $INPUTE$EXT"
- INPUT="$TMP/$(basename $INPUTE)"
- xzcat "${INPUTE}${EXT}" >"$INPUT"
-fi
-
-mkdir -p output
-OUTIMG=$(basename $INPUT)
-OUEXT="${OUTIMG:${#OUTIMG}-4:4}"
-if [[ ".img" == "${OUEXT}" ]]; then
- OUTIMGE="${OUTIMG::-4}"
- OUTIMG="${OUTIMGE}.burn${OUEXT}"
-else
- OUTIMG="${OUTIMG}.burn"
-fi
-
-cp "dts/$DTS" "$TMP/$DTS"
-cp "dts/$DTI" "$TMP/$DTI"
-sed -i "s/partition.dtsi/$DTI/g" "$TMP/$DTS"
-
-cpp -nostdinc -I dts -I dts/include -undef -x assembler-with-cpp "$TMP/$DTS" "$TMP/$DTS.preprocess"
-dtc -I dts -O dtb -p 0x1000 -qqq "$TMP/$DTS.preprocess" -o "$DTB"
-FDISK=$(/usr/sbin/fdisk -l "$INPUT" | grep -P -A 100 "Device.+Boot.+Start.+End.+Sectors.+Size.+Id.+Type" | sed -- "s/\*//g" | grep "$INPUT"| grep -v Extended)
-
-echo +! Device ! Start ! End ! Sectors ! Size ! Id ! Type !-
-i=1
-while read -r line; do
- read -r Device Start End Sectors Size Id Type <<<$line
- Device=$(echo $(basename $Device) | sed -- "s/$(basename $INPUT)//g")
- echo +! $Device ! $Start ! $End ! $Sectors ! $Size ! $Id ! $Type !-
- extract_partition "$INPUT" $Start $Sectors "$TMP/part-$i.img"
- i=$((i + 1))
-done <<< "$FDISK"
-
-cp "bins/$CNAME/platform.conf" "$TMP"
-
-cc -o $TMP/dtbTool dtbtools/dtbTool.c
-$TMP/dtbTool -o "$TMP/_aml_dtb.PARTITION" "$TMP"
-
-cp "bins/image.$CPART.cfg" "$TMP/image.cfg"
-echo cp "$UBOOT" "$TMP/u-boot.bin"
-cp "$UBOOT" "$TMP/u-boot.bin"
-cp "bins/$CNAME/DDR.USB" "$TMP"
-cp "bins/$CNAME/UBOOT.USB" "$TMP"
-
-./tools/aml_image_v2_packer_new -r "$TMP/image.cfg" "$TMP" output/$OUTIMG
-
-if [[ "$COMPRESS" == "yes" ]]; then
- cd output
- zip "$OUTIMG.zip" "$OUTIMG"
- cd ..
- rm "output/$OUTIMG"
- #xz --threads=0 "output/$OUTIMG"
-fi
-
-rm -rf $TMP
diff --git a/amlogic-tools.repo/convert/__init__.py b/amlogic-tools.repo/convert/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/amlogic-tools.repo/convert/convert.py b/amlogic-tools.repo/convert/convert.py
deleted file mode 100644
index 6141d173d..000000000
--- a/amlogic-tools.repo/convert/convert.py
+++ /dev/null
@@ -1,20 +0,0 @@
-import sys
-import time
-import os
-import lzma
-
-DEBUG = False
-
-if __name__ == '__main__':
- if len(sys.argv) > 1:
- IMAGE = sys.argv[1]
- else:
- print(f'''Usage:
- python3 {sys.argv[0]} [