diff --git a/config/sources/families/sun55iw3.conf b/config/sources/families/sun55iw3.conf index e0615fe2a2..61c071440d 100644 --- a/config/sources/families/sun55iw3.conf +++ b/config/sources/families/sun55iw3.conf @@ -6,8 +6,8 @@ # This file is a part of the Armbian Build Framework # https://github.com/armbian/build/ # -enable_extension "sunxi-tools" -declare -g ARCH=arm64 +source "${BASH_SOURCE%/*}/include/sunxi64_common.inc" + declare -g ATFSOURCE='https://github.com/jernejsk/arm-trusted-firmware' declare -g ATF_TARGET_MAP="PLAT=sun55i_a523 DEBUG=1 bl31;;build/sun55i_a523/debug/bl31.bin" declare -g ATFBRANCH="branch:a523" @@ -16,52 +16,11 @@ declare -g BOOTDELAY=1 declare -g BOOTSOURCE='https://github.com/u-boot/u-boot.git' declare -g BOOTPATCHDIR="sunxi-dev-${BOOTPATCHDIR:-"u-boot-a523"}" declare -g BOOTBRANCH="${BOOTBRANCH:-"branch:master"}" -declare -g BOOTENV_FILE='sunxi.txt' -declare -g UBOOT_TARGET_MAP="${UBOOT_TARGET_MAP:-BINMAN_ALLOW_MISSING=1;;u-boot-sunxi-with-spl.bin}" -declare -g OVERLAY_DIR="/boot/dtb/allwinner/overlay" + declare -g LINUXFAMILY="sun55iw3" declare -g LINUXCONFIG="linux-sunxi64-${BRANCH}" -case "${BRANCH}" in - - edge) - declare -g KERNEL_MAJOR_MINOR="6.18" # Major and minor versions of this kernel. - declare -g KERNELBRANCH="tag:v6.18.2" - ;; -esac - -declare -g KERNELPATCHDIR="archive/sunxi-${KERNEL_MAJOR_MINOR}" - -family_tweaks() { - # execute specific tweaks function if present - [[ $(type -t family_tweaks_s) == function ]] && family_tweaks_s - cp $SRC/packages/blobs/splash/armbian-u-boot-24.bmp $SDCARD/boot/boot.bmp -} - write_uboot_platform() { -# dd if=/dev/zero of=$2 bs=512 count=1023 seek=1 status=noxfer > /dev/null 2>&1 dd if=$1/u-boot-sunxi-with-spl.bin of=$2 bs=512 seek=256 status=noxfer > /dev/null 2>&1 -} - -setup_write_uboot_platform() { - local tmp part dev - if grep -q "ubootpart" /proc/cmdline; then - # mainline with new boot script - tmp=$(cat /proc/cmdline) - tmp="${tmp##*ubootpart=}" - tmp="${tmp%% *}" - [[ -n $tmp ]] && part=$(findfs PARTUUID=$tmp 2> /dev/null) - [[ -n $part ]] && dev=$(lsblk -n -o PKNAME $part 2> /dev/null) - [[ -n $dev ]] && DEVICE="/dev/$dev" - else - # legacy or old boot script - tmp=$(cat /proc/cmdline) - tmp="${tmp##*root=}" - tmp="${tmp%% *}" - [[ -n $tmp ]] && part=$(findfs $tmp 2> /dev/null) - [[ -n $part ]] && dev=$(lsblk -n -o PKNAME $part 2> /dev/null) - # do not try to write u-boot to USB devices - [[ -n $dev && $dev == mmcblk* ]] && DEVICE="/dev/$dev" - fi -} +} \ No newline at end of file