mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-30 22:26:42 +00:00
Merge pull request #4089 from Kwiboo/rk-mainline-firmware
Rockchip: use brcmfmac_sdio-firmware package
This commit is contained in:
CvH
GitHub
commit
3ddd1d152a
@ -2,8 +2,8 @@
|
|||||||
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="brcmfmac_sdio-firmware"
|
PKG_NAME="brcmfmac_sdio-firmware"
|
||||||
PKG_VERSION="34aaf208f983cefc1d3188d43510c4dc4a35238b"
|
PKG_VERSION="428ee70f59671a5c620466e8be1d320a66c1bf8b"
|
||||||
PKG_SHA256="b2e096f4ef037236401ada0e0955c783b509c2186acfc0ed8c07a53aa7bcb138"
|
PKG_SHA256="6b61755d8735053d00c67c158af4d931d88fd7c4c18413830309e92c44f4b295"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="https://github.com/LibreELEC/brcmfmac_sdio-firmware"
|
PKG_SITE="https://github.com/LibreELEC/brcmfmac_sdio-firmware"
|
||||||
PKG_URL="https://github.com/LibreELEC/brcmfmac_sdio-firmware/archive/$PKG_VERSION.tar.gz"
|
PKG_URL="https://github.com/LibreELEC/brcmfmac_sdio-firmware/archive/$PKG_VERSION.tar.gz"
|
||||||
|
|||||||
@ -1 +0,0 @@
|
|||||||
options bcmdhd firmware_path=/lib/firmware/brcm/ nvram_path=/lib/firmware/brcm/
|
|
||||||
@ -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
|
|
||||||
}
|
|
||||||
@ -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
|
|
||||||
@ -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
|
|
||||||
@ -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
|
|
||||||
@ -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
|
|
||||||
@ -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"
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
# SPDX-License-Identifier: GPL-2.0
|
|
||||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
|
||||||
|
|
||||||
PKG_NAME="rfkill"
|
|
||||||
PKG_VERSION="0.5"
|
|
||||||
PKG_SHA256="e0ae3004215e39a6c5c36e0726558740728d16f67ebdb8bea621250f6091d86a"
|
|
||||||
PKG_LICENSE="GPL"
|
|
||||||
PKG_SITE="https://wireless.wiki.kernel.org/en/users/documentation/rfkill"
|
|
||||||
PKG_URL="https://www.kernel.org/pub/software/network/rfkill/$PKG_NAME-$PKG_VERSION.tar.xz"
|
|
||||||
PKG_DEPENDS_TARGET="toolchain"
|
|
||||||
PKG_LONGDESC="A small userspace tool to query the state of the rfkill switches, buttons and subsystem interfaces."
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
diff -Naur a/version.sh b/version.sh
|
|
||||||
--- a/version.sh
|
|
||||||
+++ b/version.sh
|
|
||||||
@@ -12,19 +12,6 @@
|
|
||||||
|
|
||||||
if test "x$SUFFIX" != 'x'; then
|
|
||||||
v="$VERSION$SUFFIX"
|
|
||||||
-elif head=`git rev-parse --verify HEAD 2>/dev/null`; then
|
|
||||||
- git update-index --refresh --unmerged > /dev/null
|
|
||||||
- descr=$(git describe 2>/dev/null || echo "v$VERSION")
|
|
||||||
-
|
|
||||||
- # on git builds check that the version number above
|
|
||||||
- # is correct...
|
|
||||||
- [ "${descr%%-*}" = "v$VERSION" ] || exit 2
|
|
||||||
-
|
|
||||||
- echo -n 'const char rfkill_version[] = "' > "$OUT"
|
|
||||||
- v="${descr#v}"
|
|
||||||
- if git diff-index --name-only HEAD | read dummy ; then
|
|
||||||
- v="$v"-dirty
|
|
||||||
- fi
|
|
||||||
else
|
|
||||||
v="$VERSION"
|
|
||||||
fi
|
|
||||||
1
projects/Rockchip/config/kernel-firmware-any.dat
Normal file
1
projects/Rockchip/config/kernel-firmware-any.dat
Normal file
@ -0,0 +1 @@
|
|||||||
|
rockchip/*
|
||||||
@ -61,7 +61,7 @@
|
|||||||
# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
|
# additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware)
|
||||||
# Space separated list is supported,
|
# Space separated list is supported,
|
||||||
# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
|
# e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware"
|
||||||
FIRMWARE="misc-firmware wlan-firmware dvb-firmware rockchip-firmware"
|
FIRMWARE="misc-firmware wlan-firmware dvb-firmware brcmfmac_sdio-firmware"
|
||||||
|
|
||||||
# additional packages to install
|
# additional packages to install
|
||||||
ADDITIONAL_PACKAGES="dtc"
|
ADDITIONAL_PACKAGES="dtc"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user