From 244f607f4c4a2e0609d1fb8e8b62c4ae751b8136 Mon Sep 17 00:00:00 2001 From: Kris Bahnsen Date: Fri, 22 Apr 2022 15:36:09 -0700 Subject: [PATCH] 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 Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- DEVELOPERS | 5 ++++- package/Config.in | 2 +- .../Config.in | 9 ++++++-- .../wilc-firmware.hash} | 2 +- .../wilc-firmware.mk} | 22 +++++++++---------- 5 files changed, 24 insertions(+), 16 deletions(-) rename package/{wilc1000-firmware => wilc-firmware}/Config.in (82%) rename package/{wilc1000-firmware/wilc1000-firmware.hash => wilc-firmware/wilc-firmware.hash} (77%) rename package/{wilc1000-firmware/wilc1000-firmware.mk => wilc-firmware/wilc-firmware.mk} (51%) diff --git a/DEVELOPERS b/DEVELOPERS index 1bb90f8f33..ff9f787e9c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1662,6 +1662,9 @@ F: board/octavo/osd32mp1-red/ F: configs/octavo_osd32mp1_brk_defconfig F: configs/octavo_osd32mp1_red_defconfig +N: Kris Bahnsen +F: package/wilc-firmware/ + N: Kurt Van Dijck F: package/bcusdk/ F: package/libpthsem/ @@ -1759,7 +1762,7 @@ F: package/python-json-schema-validator/ F: package/python-keyring/ F: package/python-simplejson/ F: package/python-versiontools/ -F: package/wilc1000-firmware/ +F: package/wilc-firmware/ N: Maeva Manuel F: board/freescale/imx8qmmek/ diff --git a/package/Config.in b/package/Config.in index bee1590e85..7d03bc51d7 100644 --- a/package/Config.in +++ b/package/Config.in @@ -432,7 +432,7 @@ menu "Firmware" source "package/sunxi-boards/Config.in" source "package/ts4900-fpga/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/zd1211-firmware/Config.in" endmenu diff --git a/package/wilc1000-firmware/Config.in b/package/wilc-firmware/Config.in similarity index 82% rename from package/wilc1000-firmware/Config.in rename to package/wilc-firmware/Config.in index 0734c7ad99..72a9c73206 100644 --- a/package/wilc1000-firmware/Config.in +++ b/package/wilc-firmware/Config.in @@ -1,5 +1,11 @@ +config BR2_PACKAGE_WILC_FIRMWARE + bool + help + Provider package for WILC1000_FIRMWARE & WILC3000_FIRMWARE + config BR2_PACKAGE_WILC1000_FIRMWARE bool "wilc1000-firmware" + select BR2_PACKAGE_WILC_FIRMWARE help Firmware for Microchip WILC1000 wireless device @@ -12,9 +18,9 @@ config BR2_PACKAGE_WILC1000_FIRMWARE https://github.com/linux4wilc/firmware -if BR2_PACKAGE_WILC1000_FIRMWARE config BR2_PACKAGE_WILC3000_FIRMWARE bool "wilc3000-firmware" + select BR2_PACKAGE_WILC_FIRMWARE help Firmware for Microchip WILC3000 wireless device @@ -26,4 +32,3 @@ config BR2_PACKAGE_WILC3000_FIRMWARE These will be installed to /lib/firmware/mchp/ https://github.com/linux4wilc/firmware -endif diff --git a/package/wilc1000-firmware/wilc1000-firmware.hash b/package/wilc-firmware/wilc-firmware.hash similarity index 77% rename from package/wilc1000-firmware/wilc1000-firmware.hash rename to package/wilc-firmware/wilc-firmware.hash index ef82dcdc45..874766aec0 100644 --- a/package/wilc1000-firmware/wilc1000-firmware.hash +++ b/package/wilc-firmware/wilc-firmware.hash @@ -1,3 +1,3 @@ # 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 diff --git a/package/wilc1000-firmware/wilc1000-firmware.mk b/package/wilc-firmware/wilc-firmware.mk similarity index 51% rename from package/wilc1000-firmware/wilc1000-firmware.mk rename to package/wilc-firmware/wilc-firmware.mk index a071272129..1a7ceca18e 100644 --- a/package/wilc1000-firmware/wilc1000-firmware.mk +++ b/package/wilc-firmware/wilc-firmware.mk @@ -1,35 +1,35 @@ ################################################################################ # -# wilc1000-firmware +# wilc-firmware # ################################################################################ -WILC1000_FIRMWARE_VERSION = wilc_linux_15_6 -WILC1000_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC1000_FIRMWARE_VERSION)) +WILC_FIRMWARE_VERSION = wilc_linux_15_6 +WILC_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC_FIRMWARE_VERSION)) -WILC1000_FIRMWARE_LICENSE = PROPRIETARY -WILC1000_FIRMWARE_LICENSE_FILES = LICENSE.wilc_fw +WILC_FIRMWARE_LICENSE = PROPRIETARY +WILC_FIRMWARE_LICENSE_FILES = LICENSE.wilc_fw ifeq ($(BR2_PACKAGE_WILC1000_FIRMWARE),y) -WILC1000_FIRMWARE_FILES += \ +WILC_FIRMWARE_FILES += \ wilc1000_wifi_firmware.bin endif ifeq ($(BR2_PACKAGE_WILC3000_FIRMWARE),y) -WILC1000_FIRMWARE_FILES += \ +WILC_FIRMWARE_FILES += \ wilc3000_ble_firmware.bin \ wilc3000_wifi_firmware.bin endif -define WILC1000_FIRMWARE_INSTALL_FILES +define WILC_FIRMWARE_INSTALL_FILES 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 endef -define WILC1000_FIRMWARE_INSTALL_TARGET_CMDS +define WILC_FIRMWARE_INSTALL_TARGET_CMDS $(INSTALL) -d -m 0755 $(TARGET_DIR)/lib/firmware/mchp/ - $(WILC1000_FIRMWARE_INSTALL_FILES) + $(WILC_FIRMWARE_INSTALL_FILES) endef $(eval $(generic-package))