From a95c0ee3df12d043633e17c6d0e2bfbd0b522c83 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Wed, 1 Jan 2020 19:29:04 +0000 Subject: [PATCH] rockchip-firmware: remove package --- .../rockchip-firmware/modprobe.d/bcmdhd.conf | 1 - .../rockchip-firmware/package.mk | 44 ------------------- .../scripts/hciattach-realtek-config | 17 ------- .../system.d/btattach@.service | 11 ----- .../system.d/hciattach-realtek.service | 12 ----- .../system.d/hciattach@.service | 11 ----- .../udev.d/80-rockchip-firmware.rules | 32 -------------- 7 files changed, 128 deletions(-) delete mode 100644 packages/linux-firmware/rockchip-firmware/modprobe.d/bcmdhd.conf delete mode 100644 packages/linux-firmware/rockchip-firmware/package.mk delete mode 100755 packages/linux-firmware/rockchip-firmware/scripts/hciattach-realtek-config delete mode 100644 packages/linux-firmware/rockchip-firmware/system.d/btattach@.service delete mode 100644 packages/linux-firmware/rockchip-firmware/system.d/hciattach-realtek.service delete mode 100644 packages/linux-firmware/rockchip-firmware/system.d/hciattach@.service delete mode 100644 packages/linux-firmware/rockchip-firmware/udev.d/80-rockchip-firmware.rules diff --git a/packages/linux-firmware/rockchip-firmware/modprobe.d/bcmdhd.conf b/packages/linux-firmware/rockchip-firmware/modprobe.d/bcmdhd.conf deleted file mode 100644 index 724420a894..0000000000 --- a/packages/linux-firmware/rockchip-firmware/modprobe.d/bcmdhd.conf +++ /dev/null @@ -1 +0,0 @@ -options bcmdhd firmware_path=/lib/firmware/brcm/ nvram_path=/lib/firmware/brcm/ diff --git a/packages/linux-firmware/rockchip-firmware/package.mk b/packages/linux-firmware/rockchip-firmware/package.mk deleted file mode 100644 index dc8416c506..0000000000 --- a/packages/linux-firmware/rockchip-firmware/package.mk +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="rockchip-firmware" -PKG_VERSION="firmware" -PKG_ARCH="arm aarch64" -PKG_LICENSE="nonfree" -PKG_SITE="https://github.com/rockchip-linux" -PKG_URL="" -PKG_DEPENDS_TARGET="rkbin rfkill" -PKG_LONGDESC="rockchip firmware" -PKG_TOOLCHAIN="manual" - -makeinstall_target() { - mkdir -p $INSTALL/usr/lib/libreelec - cp $PKG_DIR/scripts/* $INSTALL/usr/lib/libreelec - - mkdir -p $INSTALL/usr/bin - cp -v $(get_build_dir rkbin)/firmware/bin/rtk_hciattach $INSTALL/usr/bin - - mkdir -p $INSTALL/$(get_full_firmware_dir)/rtlbt - cp -v $(get_build_dir rkbin)/firmware/bluetooth/rtl8723b_* $INSTALL/$(get_full_firmware_dir)/rtlbt - - mkdir -p $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/bluetooth/BCM4345C0.hcd $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/bluetooth/BCM4345C5.hcd $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/bluetooth/bcm4354a1.hcd $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/bluetooth/BCM4354A2.hcd $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/bluetooth/BCM4356A2.hcd $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/bluetooth/BCM4359C0.hcd $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/wifi/fw_bcm43455c0_ag.bin $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/wifi/fw_bcm43456c5_ag.bin $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/wifi/fw_bcm4354a1_ag.bin $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/wifi/fw_bcm4356a2_ag.bin $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/wifi/fw_bcm4359c0_ag.bin $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/wifi/nvram_ap6255.txt $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/wifi/nvram_ap6256.txt $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/wifi/nvram_ap6354.txt $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/wifi/nvram_ap6356.txt $INSTALL/$(get_full_firmware_dir)/brcm - cp -v $(get_build_dir rkbin)/firmware/wifi/nvram_ap6398s.txt $INSTALL/$(get_full_firmware_dir)/brcm - - mkdir -p $INSTALL/$(get_full_firmware_dir)/rockchip - cp -v $(get_build_dir rkbin)/firmware/rockchip/dptx.bin $INSTALL/$(get_full_firmware_dir)/rockchip -} diff --git a/packages/linux-firmware/rockchip-firmware/scripts/hciattach-realtek-config b/packages/linux-firmware/rockchip-firmware/scripts/hciattach-realtek-config deleted file mode 100755 index dacafc928e..0000000000 --- a/packages/linux-firmware/rockchip-firmware/scripts/hciattach-realtek-config +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) - -if [ "$(cat /sys/firmware/devicetree/base/model)" = "Rockchip RK3328 TRN9" ]; then - cp -f /usr/lib/kernel-overlays/base/lib/firmware/rtlbt/rtl8723b_config_noflow /var/lib/firmware/rtlbt/rtl8723b_config - - # temporarily disable bluetooth unless bootargs contains bluetooth - BOOTARGS=$(cat /sys/firmware/devicetree/base/chosen/bootargs) && [ "$BOOTARGS" = "${BOOTARGS/bluetooth/}" ] && exit 1 -fi - -if [ -d /var/lib/firmware/updates/rtlbt ]; then - cp -f /var/lib/firmware/updates/rtlbt/* /var/lib/firmware/rtlbt -fi - -exit 0 diff --git a/packages/linux-firmware/rockchip-firmware/system.d/btattach@.service b/packages/linux-firmware/rockchip-firmware/system.d/btattach@.service deleted file mode 100644 index 7bb104e983..0000000000 --- a/packages/linux-firmware/rockchip-firmware/system.d/btattach@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Attach /dev/ttyS0 to BlueZ stack using %I protocol -Wants=bluetooth.service -Before=bluetooth.service -After=dev-ttyS0.device - -[Service] -Type=simple -ExecStartPre=/usr/sbin/rfkill unblock bluetooth -ExecStart=/usr/bin/btattach -B /dev/ttyS0 -P %I -ExecStopPost=/usr/sbin/rfkill block bluetooth diff --git a/packages/linux-firmware/rockchip-firmware/system.d/hciattach-realtek.service b/packages/linux-firmware/rockchip-firmware/system.d/hciattach-realtek.service deleted file mode 100644 index 733a4ab238..0000000000 --- a/packages/linux-firmware/rockchip-firmware/system.d/hciattach-realtek.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Attach /dev/ttyS0 to BlueZ stack -Wants=bluetooth.service -Before=bluetooth.service -After=dev-ttyS0.device - -[Service] -Type=simple -ExecStartPre=/usr/lib/libreelec/hciattach-realtek-config -ExecStartPre=/usr/sbin/rfkill unblock bluetooth -ExecStart=/usr/bin/rtk_hciattach -n -s 115200 ttyS0 rtk_h5 -ExecStopPost=/usr/sbin/rfkill block bluetooth diff --git a/packages/linux-firmware/rockchip-firmware/system.d/hciattach@.service b/packages/linux-firmware/rockchip-firmware/system.d/hciattach@.service deleted file mode 100644 index ee8db515a3..0000000000 --- a/packages/linux-firmware/rockchip-firmware/system.d/hciattach@.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Attach /dev/ttyS0 to BlueZ stack using %I type -Wants=bluetooth.service -Before=bluetooth.service -After=dev-ttyS0.device - -[Service] -Type=simple -ExecStartPre=/usr/sbin/rfkill unblock bluetooth -ExecStart=/usr/bin/hciattach -n -s 115200 ttyS0 %I -ExecStopPost=/usr/sbin/rfkill block bluetooth diff --git a/packages/linux-firmware/rockchip-firmware/udev.d/80-rockchip-firmware.rules b/packages/linux-firmware/rockchip-firmware/udev.d/80-rockchip-firmware.rules deleted file mode 100644 index 63b0b082f7..0000000000 --- a/packages/linux-firmware/rockchip-firmware/udev.d/80-rockchip-firmware.rules +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# udev rules file for loading rockchip-firmware -################################################################################ - -ACTION!="add", GOTO="end" -SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0xb723", \ - TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service" -SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x8753", \ - TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service" -SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x0626", \ - TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service" -SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x0624", \ - TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service" -SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x0623", \ - TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service" -SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x0524", \ - TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service" -SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x0523", \ - TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service" -SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x0241", \ - TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service" -SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x024c", ATTRS{device}=="0x0240", \ - TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach-realtek.service" -SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0xa9bf", \ - TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach@bcm43xx.service" -SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4354", \ - TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach@bcm43xx.service" -SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4356", \ - TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach@bcm43xx.service" -SUBSYSTEMS=="sdio", ATTRS{vendor}=="0x02d0", ATTRS{device}=="0x4359", \ - TAG+="systemd", ENV{SYSTEMD_WANTS}+="hciattach@bcm43xx.service" -LABEL="end"