[Buildroot] [PATCH v2 1/4] package/wilc1000-firmware: bump to 15.6

[Arnout Vandecappelle]

On 23/04/2022 00:36, Kris Bahnsen via buildroot wrote:
> Supports both WILC1000 (Wi-Fi only) and WILC3000 (Wi-Fi/BLE) hardware.
> 
> To support WILC3000 this commit adds a separate config option,
> the original config option from this package is still valid.
> 
> License information copied from Microchip's buildroot-external
> project.
> 
> Signed-off-by: Kris Bahnsen <kris at embeddedTS.com>

  Applied to master, thanks, but with a few changes, see below.

[snip]
> diff --git a/package/wilc1000-firmware/wilc1000-firmware.hash b/package/wilc1000-firmware/wilc1000-firmware.hash
> index 5344efe517..9d55be9edc 100644
> --- a/package/wilc1000-firmware/wilc1000-firmware.hash
> +++ b/package/wilc1000-firmware/wilc1000-firmware.hash
> @@ -1,2 +1,2 @@
>  # Locally calculated
> -sha256 a2e7a327dd545ba2051946f7613005cbde88fdd952afb8eecdd1dacda7e767d2  v14.1_Firmware.zip
> +sha256  29bb5739136cdb4088cb52af59badce05cc7e562bca40e9f29fef7f8f7c19cb8  wilc1000-firmware-wilc_linux_15_6.tar.gz

  Hash for the license file you added was missing.

> diff --git a/package/wilc1000-firmware/wilc1000-firmware.mk b/package/wilc1000-firmware/wilc1000-firmware.mk
> index 6f504d67a0..0af81c7110 100644
> --- a/package/wilc1000-firmware/wilc1000-firmware.mk
> +++ b/package/wilc1000-firmware/wilc1000-firmware.mk
> @@ -4,21 +4,32 @@
>  #
>  ################################################################################
>  
> -WILC1000_FIRMWARE_VERSION = 14.1
> -WILC1000_FIRMWARE_SITE = https://github.com/linux4sc/wireless-firmware/archive
> -WILC1000_FIRMWARE_SOURCE = v$(WILC1000_FIRMWARE_VERSION)_Firmware.zip
> +WILC1000_FIRMWARE_VERSION = wilc_linux_15_6
> +WILC1000_FIRMWARE_SITE = $(call github,linux4wilc,firmware,$(WILC1000_FIRMWARE_VERSION))
>  
> -WILC1000_FIRMWARE_LICENSE = PROPRIETARY
> +WILC1000_FIRMWARE_LICENSE = Microchip firmware

  We actually use proprietary to mark any non-open-source license. The idea is 
that SPDX is uses for the LICENSE variable (with an exception: adding + instead 
of -or-later, and no -only). This is not done consistently, but I don't want to 
go in the wrong direction :-). And maybe there's something to be said for using 
a more descriptive license name than proprietary, but this shouldn't be snuck in 
with a version bump.


  Regards,
  Arnout

> +WILC1000_FIRMWARE_LICENSE_FILES = LICENSE.wilc_fw
>   
> -define WILC1000_FIRMWARE_EXTRACT_CMDS
> -	$(UNZIP) -d $(BUILD_DIR) $(WILC1000_FIRMWARE_DL_DIR)/$(WILC1000_FIRMWARE_SOURCE)
> -	mv $(BUILD_DIR)/wireless-firmware-$(WILC1000_FIRMWARE_VERSION)_Firmware/* $(@D)
> -	rmdir $(BUILD_DIR)/wireless-firmware-$(WILC1000_FIRMWARE_VERSION)_Firmware
> +ifeq ($(BR2_PACKAGE_WILC1000_FIRMWARE),y)
> +WILC1000_FIRMWARE_FILES += \
> +	wilc1000_wifi_firmware.bin
> +endif
> +
> +ifeq ($(BR2_PACKAGE_WILC3000_FIRMWARE),y)
> +WILC1000_FIRMWARE_FILES += \
> +	wilc3000_ble_firmware.bin \
> +	wilc3000_wifi_firmware.bin
> +endif
> +
> +define WILC1000_FIRMWARE_INSTALL_FILES
> +	cd $(@D) && \
> +		$(TAR) cf install.tar $(sort $(WILC1000_FIRMWARE_FILES)) && \
> +		$(TAR) xf install.tar -C $(TARGET_DIR)/lib/firmware/mchp
>   endef
>   
>   define WILC1000_FIRMWARE_INSTALL_TARGET_CMDS
> -	$(INSTALL) -D -m 0644 $(@D)/wilc1003_firmware.bin \
> -		$(TARGET_DIR)/lib/firmware/atmel/wilc1003_firmware.bin
> +	$(INSTALL) -d -m 0755 $(TARGET_DIR)/lib/firmware/mchp/
> +	$(WILC1000_FIRMWARE_INSTALL_FILES)
>   endef
>   
>   $(eval $(generic-package))