diff --git a/packages/linux-firmware/meson-firmware/firmwares/any.dat b/packages/linux-firmware/meson-firmware/firmwares/any.dat deleted file mode 100644 index 1eacf246f2..0000000000 --- a/packages/linux-firmware/meson-firmware/firmwares/any.dat +++ /dev/null @@ -1 +0,0 @@ -meson/* diff --git a/packages/linux-firmware/meson-firmware/package.mk b/packages/linux-firmware/meson-firmware/package.mk deleted file mode 100644 index 3df2c4acb1..0000000000 --- a/packages/linux-firmware/meson-firmware/package.mk +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) - -PKG_NAME="meson-firmware" -PKG_VERSION="edd24b481293b93814494508cd4952b67f15acb3" -PKG_SHA256="2092c71a5eb106725784dadcc2cfea7be60254539a41fafebf311235283259e4" -PKG_LICENSE="GPLv2" -PKG_SITE="https://github.com/LibreELEC/meson-firmware" -PKG_URL="https://github.com/LibreELEC/meson-firmware/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain" -PKG_LONGDESC="meson-firmware: Amlogic microcode firmware for the V4L2 mem2mem vdec driver" -PKG_TOOLCHAIN="manual" - -makeinstall_target() { - FW_TARGET_DIR=$INSTALL/$(get_full_firmware_dir) - - if find_file_path config/$PKG_NAME.dat; then - FW_LISTS="${FOUND_PATH}" - else - FW_LISTS="${PKG_DIR}/firmwares/any.dat ${PKG_DIR}/firmwares/${TARGET_ARCH}.dat" - fi - - for fwlist in ${FW_LISTS}; do - [ -f ${fwlist} ] || continue - while read -r fwline; do - [ -z "${fwline}" ] && continue - [[ ${fwline} =~ ^#.* ]] && continue - [[ ${fwline} =~ ^[[:space:]] ]] && continue - - for fwfile in $(cd ${PKG_BUILD} && eval "find ${fwline}"); do - [ -d ${PKG_BUILD}/${fwfile} ] && continue - - if [ -f ${PKG_BUILD}/${fwfile} ]; then - mkdir -p $(dirname ${FW_TARGET_DIR}/${fwfile}) - cp -Lv ${PKG_BUILD}/${fwfile} ${FW_TARGET_DIR}/${fwfile} - else - echo "ERROR: Firmware file ${fwfile} does not exist - aborting" - exit 1 - fi - done - done < ${fwlist} - done -} diff --git a/projects/Amlogic/config/kernel-firmware.dat b/projects/Amlogic/config/kernel-firmware.dat index d0ea1c7678..c291f3b716 100644 --- a/projects/Amlogic/config/kernel-firmware.dat +++ b/projects/Amlogic/config/kernel-firmware.dat @@ -2,3 +2,4 @@ ath9k_htc mediatek/mt7668pr2h.bin rtlwifi/rtl8192cufw_TMSC.bin rtlwifi/rtl8192cufw.bin +meson diff --git a/projects/Amlogic/options b/projects/Amlogic/options index c922f04039..8d301b7def 100644 --- a/projects/Amlogic/options +++ b/projects/Amlogic/options @@ -40,7 +40,7 @@ # additional Firmware to use (dvb-firmware, misc-firmware, wlan-firmware) # Space separated list is supported, # e.g. FIRMWARE="dvb-firmware misc-firmware wlan-firmware" - FIRMWARE="dvb-firmware brcmfmac_sdio-firmware meson-firmware kernel-firmware" + FIRMWARE="dvb-firmware brcmfmac_sdio-firmware kernel-firmware" # build with installer (yes / no) INSTALLER_SUPPORT="no"