Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Kris Bahnsen via buildroot <buildroot@buildroot.org>
To: buildroot@buildroot.org
Cc: Eugen Hristev <eugen.hristev@microchip.com>,
	Ludovic Desroches <ludovic.desroches@microchip.com>,
	Mark Featherston <mark@embeddedTS.com>,
	Thomas Petazzoni <thomas.petazzoni@bootlin.com>,
	Kris Bahnsen <kris@embeddedTS.com>
Subject: [Buildroot] [PATCH 2/4] package/wilc-firmware: rename from wilc1000-firmware
Date: Thu, 24 Mar 2022 13:20:24 -0700	[thread overview]
Message-ID: <20220324202026.5688-3-kris@embeddedTS.com> (raw)
In-Reply-To: <20220324202026.5688-1-kris@embeddedTS.com>

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>
---
 DEVELOPERS                                                 |  5 ++++-
 package/Config.in                                          |  2 +-
 package/{wilc1000-firmware => wilc-firmware}/Config.in     |  4 ++--
 .../wilc-firmware.hash}                                    |  2 +-
 .../wilc-firmware.mk}                                      | 14 +++++++-------
 5 files changed, 15 insertions(+), 12 deletions(-)
 rename package/{wilc1000-firmware => wilc-firmware}/Config.in (92%)
 rename package/{wilc1000-firmware/wilc1000-firmware.hash => wilc-firmware/wilc-firmware.hash} (62%)
 rename package/{wilc1000-firmware/wilc1000-firmware.mk => wilc-firmware/wilc-firmware.mk} (67%)

diff --git a/DEVELOPERS b/DEVELOPERS
index 942bb8fe9c..17becfa189 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1660,6 +1660,9 @@ F:	board/octavo/osd32mp1-red/
 F:	configs/octavo_osd32mp1_brk_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>
 F:	package/bcusdk/
 F:	package/libpthsem/
@@ -1757,7 +1760,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 <maeva.manuel@oss.nxp.com>
 F:	board/freescale/imx8qmmek/
diff --git a/package/Config.in b/package/Config.in
index 0d5d763180..a175f105f3 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 92%
rename from package/wilc1000-firmware/Config.in
rename to package/wilc-firmware/Config.in
index 0734c7ad99..23abc88712 100644
--- a/package/wilc1000-firmware/Config.in
+++ b/package/wilc-firmware/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_WILC1000_FIRMWARE
 	bool "wilc1000-firmware"
+	select BR2_PACKAGE_WILC_FIRMWARE
 	help
 	  Firmware for Microchip WILC1000 wireless device
 
@@ -12,9 +13,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 +27,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 62%
rename from package/wilc1000-firmware/wilc1000-firmware.hash
rename to package/wilc-firmware/wilc-firmware.hash
index 9d55be9edc..2f1fc9964d 100644
--- a/package/wilc1000-firmware/wilc1000-firmware.hash
+++ b/package/wilc-firmware/wilc-firmware.hash
@@ -1,2 +1,2 @@
 # Locally calculated
-sha256  29bb5739136cdb4088cb52af59badce05cc7e562bca40e9f29fef7f8f7c19cb8  wilc1000-firmware-wilc_linux_15_6.tar.gz
+sha256  29bb5739136cdb4088cb52af59badce05cc7e562bca40e9f29fef7f8f7c19cb8  wilc-firmware-wilc_linux_15_6.tar.gz
diff --git a/package/wilc1000-firmware/wilc1000-firmware.mk b/package/wilc-firmware/wilc-firmware.mk
similarity index 67%
rename from package/wilc1000-firmware/wilc1000-firmware.mk
rename to package/wilc-firmware/wilc-firmware.mk
index 2bea9febe2..63fd100421 100644
--- a/package/wilc1000-firmware/wilc1000-firmware.mk
+++ b/package/wilc-firmware/wilc-firmware.mk
@@ -1,13 +1,13 @@
 ################################################################################
 #
-# 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
+WILC_FIRMWARE_LICENSE = PROPRIETARY
 
 ifeq ($(BR2_PACKAGE_WILC1000_FIRMWARE),y)
 WILC1000_FIRMWARE_FILES += \
@@ -20,15 +20,15 @@ WILC1000_FIRMWARE_FILES += \
 	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) 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))
-- 
2.11.0

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

  parent reply	other threads:[~2022-03-24 20:21 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-24 20:20 [Buildroot] [PATCH 0/4] Pull in WILC Wi-Fi updates Kris Bahnsen via buildroot
2022-03-24 20:20 ` [Buildroot] [PATCH 1/4] package/wilc1000-firmware: bump to 15.6 Kris Bahnsen via buildroot
2022-03-24 20:20 ` Kris Bahnsen via buildroot [this message]
2022-03-24 20:20 ` [Buildroot] [PATCH 3/4] configs: add WILC3000_FIRMWARE to compatible devices Kris Bahnsen via buildroot
2022-03-24 20:20 ` [Buildroot] [PATCH 4/4] package/wilc-driver: new package Kris Bahnsen via buildroot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220324202026.5688-3-kris@embeddedTS.com \
    --to=buildroot@buildroot.org \
    --cc=eugen.hristev@microchip.com \
    --cc=kris@embeddedTS.com \
    --cc=ludovic.desroches@microchip.com \
    --cc=mark@embeddedTS.com \
    --cc=thomas.petazzoni@bootlin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox