package/wilc-firmware: rename from wilc1000-firmware

Separates out WILC1000 and WILC3000 in to individual config options
since in reality only one or the other set would be needed.

Signed-off-by: Kris Bahnsen <kris@embeddedTS.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
This commit is contained in:
Kris Bahnsen
2022-04-22 15:36:09 -07:00
committed by Arnout Vandecappelle (Essensium/Mind)
parent 7663482d22
commit 244f607f4c
5 changed files with 24 additions and 16 deletions

View File

@@ -1662,6 +1662,9 @@ F: board/octavo/osd32mp1-red/
F: configs/octavo_osd32mp1_brk_defconfig F: configs/octavo_osd32mp1_brk_defconfig
F: configs/octavo_osd32mp1_red_defconfig F: configs/octavo_osd32mp1_red_defconfig
N: Kris Bahnsen <kris@embeddedTS.com>
F: package/wilc-firmware/
N: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be> N: Kurt Van Dijck <dev.kurt@vandijck-laurijssen.be>
F: package/bcusdk/ F: package/bcusdk/
F: package/libpthsem/ F: package/libpthsem/
@@ -1759,7 +1762,7 @@ F: package/python-json-schema-validator/
F: package/python-keyring/ F: package/python-keyring/
F: package/python-simplejson/ F: package/python-simplejson/
F: package/python-versiontools/ F: package/python-versiontools/
F: package/wilc1000-firmware/ F: package/wilc-firmware/
N: Maeva Manuel <maeva.manuel@oss.nxp.com> N: Maeva Manuel <maeva.manuel@oss.nxp.com>
F: board/freescale/imx8qmmek/ F: board/freescale/imx8qmmek/

View File

@@ -432,7 +432,7 @@ menu "Firmware"
source "package/sunxi-boards/Config.in" source "package/sunxi-boards/Config.in"
source "package/ts4900-fpga/Config.in" source "package/ts4900-fpga/Config.in"
source "package/ux500-firmware/Config.in" source "package/ux500-firmware/Config.in"
source "package/wilc1000-firmware/Config.in" source "package/wilc-firmware/Config.in"
source "package/wilink-bt-firmware/Config.in" source "package/wilink-bt-firmware/Config.in"
source "package/zd1211-firmware/Config.in" source "package/zd1211-firmware/Config.in"
endmenu endmenu

View File

@@ -1,5 +1,11 @@
config BR2_PACKAGE_WILC_FIRMWARE
bool
help
Provider package for WILC1000_FIRMWARE & WILC3000_FIRMWARE
config BR2_PACKAGE_WILC1000_FIRMWARE config BR2_PACKAGE_WILC1000_FIRMWARE
bool "wilc1000-firmware" bool "wilc1000-firmware"
select BR2_PACKAGE_WILC_FIRMWARE
help help
Firmware for Microchip WILC1000 wireless device Firmware for Microchip WILC1000 wireless device
@@ -12,9 +18,9 @@ config BR2_PACKAGE_WILC1000_FIRMWARE
https://github.com/linux4wilc/firmware https://github.com/linux4wilc/firmware
if BR2_PACKAGE_WILC1000_FIRMWARE
config BR2_PACKAGE_WILC3000_FIRMWARE config BR2_PACKAGE_WILC3000_FIRMWARE
bool "wilc3000-firmware" bool "wilc3000-firmware"
select BR2_PACKAGE_WILC_FIRMWARE
help help
Firmware for Microchip WILC3000 wireless device Firmware for Microchip WILC3000 wireless device
@@ -26,4 +32,3 @@ config BR2_PACKAGE_WILC3000_FIRMWARE
These will be installed to /lib/firmware/mchp/ These will be installed to /lib/firmware/mchp/
https://github.com/linux4wilc/firmware https://github.com/linux4wilc/firmware
endif

View File

@@ -1,3 +1,3 @@
# Locally calculated # Locally calculated
sha256 29bb5739136cdb4088cb52af59badce05cc7e562bca40e9f29fef7f8f7c19cb8 wilc1000-firmware-wilc_linux_15_6.tar.gz sha256 29bb5739136cdb4088cb52af59badce05cc7e562bca40e9f29fef7f8f7c19cb8 wilc-firmware-wilc_linux_15_6.tar.gz
sha256 71355eee947a312594dbdaac039827544f93d23949b65c356b7b0ce09e2600fb LICENSE.wilc_fw sha256 71355eee947a312594dbdaac039827544f93d23949b65c356b7b0ce09e2600fb LICENSE.wilc_fw

View File

@@ -1,35 +1,35 @@
################################################################################ ################################################################################
# #
# wilc1000-firmware # wilc-firmware
# #
################################################################################ ################################################################################
WILC1000_FIRMWARE_VERSION = wilc_linux_15_6 WILC_FIRMWARE_VERSION = wilc_linux_15_6
WILC1000_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC1000_FIRMWARE_VERSION)) WILC_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION))
WILC1000_FIRMWARE_LICENSE = PROPRIETARY WILC_FIRMWARE_LICENSE = PROPRIETARY
WILC1000_FIRMWARE_LICENSE_FILES = LICENSE.wilc_fw WILC_FIRMWARE_LICENSE_FILES = LICENSE.wilc_fw
ifeq ($(BR2_PACKAGE_WILC1000_FIRMWARE),y) ifeq ($(BR2_PACKAGE_WILC1000_FIRMWARE),y)
WILC1000_FIRMWARE_FILES += \ WILC_FIRMWARE_FILES += \
wilc1000_wifi_firmware.bin wilc1000_wifi_firmware.bin
endif endif
ifeq ($(BR2_PACKAGE_WILC3000_FIRMWARE),y) ifeq ($(BR2_PACKAGE_WILC3000_FIRMWARE),y)
WILC1000_FIRMWARE_FILES += \ WILC_FIRMWARE_FILES += \
wilc3000_ble_firmware.bin \ wilc3000_ble_firmware.bin \
wilc3000_wifi_firmware.bin wilc3000_wifi_firmware.bin
endif endif
define WILC1000_FIRMWARE_INSTALL_FILES define WILC_FIRMWARE_INSTALL_FILES
cd $(@D) && \ cd $(@D) && \
$(TAR) cf install.tar $(sort $(WILC1000_FIRMWARE_FILES)) && \ $(TAR) cf install.tar $(sort $(WILC_FIRMWARE_FILES)) && \
$(TAR) xf install.tar -C $(TARGET_DIR)/lib/firmware/mchp $(TAR) xf install.tar -C $(TARGET_DIR)/lib/firmware/mchp
endef endef
define WILC1000_FIRMWARE_INSTALL_TARGET_CMDS define WILC_FIRMWARE_INSTALL_TARGET_CMDS
$(INSTALL) -d -m 0755 $(TARGET_DIR)/lib/firmware/mchp/ $(INSTALL) -d -m 0755 $(TARGET_DIR)/lib/firmware/mchp/
$(WILC1000_FIRMWARE_INSTALL_FILES) $(WILC_FIRMWARE_INSTALL_FILES)
endef endef
$(eval $(generic-package)) $(eval $(generic-package))