From 266d6be5fac3ad02d8aeecb14be5fa421ca1cc7b Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Sun, 4 Mar 2018 14:52:29 +0000 Subject: [PATCH] Drop Amlogic config, don't install RPi sdio files --- packages/linux-firmware/kernel-firmware/package.mk | 4 ++++ .../kernel-firmware/firmwares/kernel-firmware.dat | 0 projects/RPi/packages/kernel-firmware/scripts/cleanup.sh | 9 --------- 3 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 projects/Amlogic/packages/kernel-firmware/firmwares/kernel-firmware.dat delete mode 100755 projects/RPi/packages/kernel-firmware/scripts/cleanup.sh diff --git a/packages/linux-firmware/kernel-firmware/package.mk b/packages/linux-firmware/kernel-firmware/package.mk index 22776849ef..c7b97d8085 100644 --- a/packages/linux-firmware/kernel-firmware/package.mk +++ b/packages/linux-firmware/kernel-firmware/package.mk @@ -62,6 +62,10 @@ makeinstall_target() { done < ${fwlist} done + # The following files are RPi specific and installed by brcmfmac_sdio-firmware-rpi instead + rm -fr $FW_TARGET_DIR/brcm/brcmfmac43430*-sdio.bin + rm -fr $FW_TARGET_DIR/brcm/brcmfmac43455*-sdio.bin + # Cleanup - which may be project or device specific find_file_path scripts/cleanup.sh && ${FOUND_PATH} ${FW_TARGET_DIR} || true } diff --git a/projects/Amlogic/packages/kernel-firmware/firmwares/kernel-firmware.dat b/projects/Amlogic/packages/kernel-firmware/firmwares/kernel-firmware.dat deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/projects/RPi/packages/kernel-firmware/scripts/cleanup.sh b/projects/RPi/packages/kernel-firmware/scripts/cleanup.sh deleted file mode 100755 index 8b0348706f..0000000000 --- a/projects/RPi/packages/kernel-firmware/scripts/cleanup.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -FW_TARGET_DIR=$1 - -# The following files will be installed by brcmfmac_sdio-firmware-rpi instead -rm -fr $FW_TARGET_DIR/brcm/brcmfmac43430*-sdio.bin -rm -fr $FW_TARGET_DIR/brcm/brcmfmac43455*-sdio.bin - -exit 0