rockchip: completely remove legacy branch; fixes #5118

- there's absolutely no point in trying to keep this alive, current/edge are good enough, legacy's abandoned for years and broken
This commit is contained in:
Ricardo Pardini 2023-04-30 15:09:10 +02:00 committed by igorpecovnik
parent a84d4f079e
commit 30737fa6f4
5 changed files with 3 additions and 5589 deletions

View File

@ -2,5 +2,5 @@
BOARD_NAME="MiQi"
BOARDFAMILY="rockchip"
BOOTCONFIG="miqi-rk3288_defconfig"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TARGET="current,edge"

View File

@ -4,5 +4,5 @@ BOARDFAMILY="rockchip"
BOOTCONFIG="tinker-rk3288_defconfig"
MODULES_LEGACY="hci_uart rfcomm hidp 8723bs"
DEFAULT_OVERLAYS="i2c1 i2c4 spi2 spidev2 uart1 uart2"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TARGET="current,edge"
FULL_DESKTOP="yes"

View File

@ -4,5 +4,5 @@ BOARDFAMILY="rockchip"
BOOTCONFIG="xt-q8l-v10-rk3288_defconfig"
BOOT_FDT_FILE="rk3288-xt-q8l-v10.dtb"
MODULES_LEGACY="hci_uart rfcomm hidp"
KERNEL_TARGET="legacy,current,edge"
KERNEL_TARGET="current,edge"
PACKAGE_LIST_BOARD="bluez"

File diff suppressed because it is too large Load Diff

View File

@ -25,15 +25,6 @@ SERIALCON=ttyS2
case $BRANCH in
legacy)
KERNELSOURCE='https://github.com/armbian/linux'
declare -g KERNEL_MAJOR_MINOR="4.4" # Major and minor versions of this kernel.
KERNELBRANCH='branch:stable-4.4-rk3288-linux'
KERNELDIR='linux-rockchip'
;;
current)
declare -g KERNEL_MAJOR_MINOR="6.1" # Major and minor versions of this kernel.
@ -80,7 +71,6 @@ uboot_custom_postprocess() {
family_tweaks() {
if [[ $BOARD == tinkerboard ]]; then
chroot_sdcard_apt_get_install rfkill bluetooth bluez bluez-tools
[[ $BRANCH == legacy ]] && chroot_sdcard systemctl --no-reload enable tinker-bluetooth.service
if [[ -f "$SDCARD/etc/pulse/default.pa" ]]; then
sed -i -e "/#load-module module-alsa-sink/r $SRC/packages/bsp/rockchip/pulseaudio.txt" "$SDCARD/etc/pulse/default.pa" 2>&1
else
@ -107,13 +97,6 @@ family_tweaks_bsp() {
cp $SRC/packages/bsp/rockchip/70-gpio.rules $destination/etc/udev/rules.d
cp $SRC/packages/bsp/rockchip/71-i2c.rules $destination/etc/udev/rules.d
# Tinkerboard Bluetooth (only legacy kernel, mainline uses serdev)
if [[ $BRANCH == legacy ]]; then
install -m 755 $SRC/packages/bsp/rockchip/rtk_hciattach $destination/usr/bin
install -m 755 $SRC/packages/bsp/rockchip/start_bt.sh $destination/usr/local/bin
cp $SRC/packages/bsp/rockchip/tinker-bluetooth.service $destination/lib/systemd/system/
fi
# Sound
cp $SRC/packages/bsp/rockchip/asound.conf $destination/etc/
cp $SRC/packages/bsp/rockchip/89-pulseaudio-usb.rules $destination/etc/udev/rules.d