rk35xx: drop vendor-boogie-panthor BRANCH; it has been integrated into vendor

- This reverts commit 5f59fe63f1
This commit is contained in:
Ricardo Pardini
2024-05-11 11:53:14 +02:00
committed by Igor
parent 33d2ee8fd6
commit 10f9e7c9dc
3 changed files with 2 additions and 2378 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -38,23 +38,6 @@ case $BRANCH in
LINUXFAMILY=rk35xx
;;
vendor-boogie-panthor)
BOOTSCRIPT='boot-rk3588-legacy.cmd:boot.cmd'
BOOTDIR='u-boot-rockchip64'
declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
declare -g -i KERNEL_GIT_CACHE_TTL=120 # 2 minutes; this is a high-traffic repo
KERNELSOURCE='https://github.com/rpardini/armbian-linux-rockchip-rk3588.git'
KERNELBRANCH='branch:armbian-rk-6.1-rkr1-plus-boogie-panthor-v6' # which is armbian/linux-rockchip#rk-6.1-rkr1 as-of 2024-04-01 plus boogie's panthor-v6 patches picked
KERNELPATCHDIR='rk35xx-vendor-boogie-panthor-6.1'
LINUXFAMILY=rk35xx
KERNELCONFIG='linux-rk35xx-vendor-boogie-panthor'
# Extra overrides, full firmware for blobs, and oibaf for mainline mesa; amazingfated multimedia-only (not panfork)
SERIALCON="ttyFIQ0" # so that rockchip64_common's SERIALCON hook won't default it to ttyS2
BOARD_FIRMWARE_INSTALL="-full" # Install full firmware, for blob required for panthor - huge @TODO add blob to armbian-firmware
enable_extension "mesa-oibaf" # Enable OIBAF repo for mainline mesa
enable_extension "rk-multimedia-amazingfate" # for chromium, widevine (glibc) & multimedia - NOT panfork
;;
edge)
LINUXFAMILY=rockchip-rk3588
LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH

View File

@@ -22,8 +22,8 @@ function extension_prepare_config__amazingfate_rk35xx_multimedia() {
exit_with_error "${EXTENSION} only works on LINUXFAMILY=rockchip-rk3588/rk35xx, currently on '${LINUXFAMILY}'"
fi
if [[ "${BRANCH}" != "legacy" && "${BRANCH}" != "vendor" && "${BRANCH}" != "vendor-boogie-panthor" ]]; then
exit_with_error "${EXTENSION} only works on BRANCH=legacy/vendor/vendor-boogie-panthor, currently on '${BRANCH}'"
if [[ "${BRANCH}" != "legacy" && "${BRANCH}" != "vendor" ]]; then
exit_with_error "${EXTENSION} only works on BRANCH=legacy/vendor, currently on '${BRANCH}'"
fi
}