diff --git a/external/config/sources/families/include/sunxi64_common.inc b/external/config/sources/families/include/sunxi64_common.inc index db856b2..184eb67 100644 --- a/external/config/sources/families/include/sunxi64_common.inc +++ b/external/config/sources/families/include/sunxi64_common.inc @@ -9,11 +9,6 @@ LINUXFAMILY=sunxi64 PACKAGE_LIST_DESKTOP_FAMILY="fcitx fonts-wqy-zenhei" case $BRANCH in - legacy) - - KERNELBRANCH="branch:orange-pi-5.4" - KERNELPATCHDIR='sunxi-'$BRANCH - ;; current) @@ -22,13 +17,6 @@ case $BRANCH in ;; - dev) - - KERNELSOURCE="https://github.com/megous/linux" - KERNELBRANCH="branch:orange-pi-5.7" - KERNELPATCHDIR='sunxi-'$BRANCH - - ;; esac family_tweaks() @@ -40,9 +28,11 @@ family_tweaks() write_uboot_platform() { - if [[ -f $1/boot0_sdcard.fex ]]; then # legacy h616 loader + if [[ -f $1/boot0_sdcard.fex ]]; then # legacy h616/h6 loader dd if=$1/boot0_sdcard.fex of=$2 bs=8k seek=1 conv=fsync > /dev/null 2>&1 dd if=$1/boot_package.fex of=$2 bs=8k seek=2050 conv=fsync > /dev/null 2>&1 || true + elif [[ -f $1/u-boot-with-dtb.bin ]]; then # legacy a64 loader + dd if=$1/u-boot-with-dtb.bin of=$2 bs=1k seek=8 conv=fsync > /dev/null 2>&1 || true else [[ -f $1/sunxi-spl.bin ]] && dd if=$1/sunxi-spl.bin of=$2 bs=8k seek=1 conv=fsync > /dev/null 2>&1 [[ -f $1/u-boot.itb ]] && dd if=$1/u-boot.itb of=$2 bs=8k seek=5 conv=fsync > /dev/null 2>&1 || true