[Buildroot] [PATCH v3 0/2] package/murata-cyw-fw: new package

Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [Buildroot] [PATCH v3 0/2] package/murata-cyw-fw: new package
@ 2019-05-10  8:35 Marcin Niestroj
  2019-05-10  8:35 ` [Buildroot] [PATCH v3 1/2] " Marcin Niestroj
  2019-05-10  8:35 ` [Buildroot] [PATCH v3 2/2] package/murata-cyw-fw: download NVRAM and BT_PATCH only when needed Marcin Niestroj
  0 siblings, 2 replies; 6+ messages in thread
From: Marcin Niestroj @ 2019-05-10  8:35 UTC (permalink / raw)
  To: buildroot

Hi,

This is a next version of package with firmware for murata wireless modules
(WiFi + BLE). This version is based on feedback from v2 [1].

I have splitted it into two patches, because I am not sure that second patch
(reducing required files to download) is worth worse (in my opinion) user
experience when rebuilding with new options selected.

[1] http://lists.busybox.net/pipermail/buildroot/2019-May/249595.html

Marcin Niestroj (2):
  package/murata-cyw-fw: new package
  package/murata-cyw-fw: download NVRAM and BT_PATCH only when needed

 DEVELOPERS                               |   1 +
 package/Config.in                        |   1 +
 package/murata-cyw-fw/Config.in          |  97 ++++++++++++++++++++
 package/murata-cyw-fw/murata-cyw-fw.hash |   5 ++
 package/murata-cyw-fw/murata-cyw-fw.mk   | 107 +++++++++++++++++++++++
 5 files changed, 211 insertions(+)
 create mode 100644 package/murata-cyw-fw/Config.in
 create mode 100644 package/murata-cyw-fw/murata-cyw-fw.hash
 create mode 100644 package/murata-cyw-fw/murata-cyw-fw.mk

-- 
2.21.0

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v3 1/2] package/murata-cyw-fw: new package
  2019-05-10  8:35 [Buildroot] [PATCH v3 0/2] package/murata-cyw-fw: new package Marcin Niestroj
@ 2019-05-10  8:35 ` Marcin Niestroj
  2019-05-20 20:20   ` Thomas Petazzoni
  2019-05-10  8:35 ` [Buildroot] [PATCH v3 2/2] package/murata-cyw-fw: download NVRAM and BT_PATCH only when needed Marcin Niestroj
  1 sibling, 1 reply; 6+ messages in thread
From: Marcin Niestroj @ 2019-05-10  8:35 UTC (permalink / raw)
  To: buildroot

Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
---
Changes v2 -> v3:
 * merge 3 packages into single murata-cyw-fw (suggested by Yann)
 * use MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4354) trick to collect
   files to install (suggested by Arnout)

 DEVELOPERS                               |   1 +
 package/Config.in                        |   1 +
 package/murata-cyw-fw/Config.in          |  97 ++++++++++++++++++++++
 package/murata-cyw-fw/murata-cyw-fw.hash |   5 ++
 package/murata-cyw-fw/murata-cyw-fw.mk   | 100 +++++++++++++++++++++++
 5 files changed, 204 insertions(+)
 create mode 100644 package/murata-cyw-fw/Config.in
 create mode 100644 package/murata-cyw-fw/murata-cyw-fw.hash
 create mode 100644 package/murata-cyw-fw/murata-cyw-fw.mk

diff --git a/DEVELOPERS b/DEVELOPERS
index 5bfc4561c0..849bf9c308 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1386,6 +1386,7 @@ F:	package/easydbus/
 F:	package/lua-flu/
 F:	package/lua-stdlib/
 F:	package/luaossl/
+F:	package/murata-cyw-fw/
 F:	package/rs485conf/
 F:	package/turbolua/
 
diff --git a/package/Config.in b/package/Config.in
index f592e74a99..d9ebfc677e 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -382,6 +382,7 @@ menu "Firmware"
 	source "package/armbian-firmware/Config.in"
 	source "package/b43-firmware/Config.in"
 	source "package/linux-firmware/Config.in"
+	source "package/murata-cyw-fw/Config.in"
 	source "package/rpi-bt-firmware/Config.in"
 	source "package/rpi-firmware/Config.in"
 	source "package/rpi-wifi-firmware/Config.in"
diff --git a/package/murata-cyw-fw/Config.in b/package/murata-cyw-fw/Config.in
new file mode 100644
index 0000000000..7530477511
--- /dev/null
+++ b/package/murata-cyw-fw/Config.in
@@ -0,0 +1,97 @@
+config BR2_PACKAGE_MURATA_CYW_FW
+	bool "murata-cyw-fw"
+	help
+	  Murata Wireless firmware, NVRAM and Bluetooth HCD patch files.
+
+	  https://github.com/murata-wireless/cyw-fmac-fw
+	  https://github.com/murata-wireless/cyw-fmac-nvram
+	  https://github.com/murata-wireless/cyw-bt-patch
+
+if BR2_PACKAGE_MURATA_CYW_FW
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43012
+	bool "CYW43012 (1LV)"
+	help
+	  Murata Wireless CYW43012 (1LV) module firmware files.
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43340
+	bool "CYW43340/CYW43341 (1BW)"
+	help
+	  Murata Wireless CYW43340/CYW43341 (1BW) module firmware files.
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43362
+	bool "CYW43362 (SN8000)"
+	help
+	  Murata Wireless CYW43362 (SN8000) module firmware files.
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW4339
+	bool "CYW4339 (1CK/ZP)"
+	help
+	  Murata Wireless CYW4339 (1CK/ZP) module firmware files.
+
+choice
+	prompt "CYW4339 module" if BR2_PACKAGE_MURATA_CYW_FW_CYW4339
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW4339_1CK
+	bool "1CK"
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW4339_ZP
+	bool "ZP"
+
+endchoice
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43430
+	bool "CYW43430/CYW4343W/CYW43364 (1DX/1FX/1LN)"
+	help
+	  Murata Wireless CYW43430/CYW4343W/CYW43364 (1DX/1FX/1LN)
+	  module firmware files.
+
+choice
+	prompt "CYW43430/CYW4343W/CYW43364 module" if BR2_PACKAGE_MURATA_CYW_FW_CYW43430
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1DX
+	bool "1DX"
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1FX
+	bool "1FX"
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1LN
+	bool "1LN"
+
+endchoice
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43455
+	bool "CYW43455 (1HK/1LC/1MW)"
+	help
+	  Murata Wireless CYW43455 (1HK/1LC/1MW) module firmware files.
+
+choice
+	prompt "CYW43455 module" if BR2_PACKAGE_MURATA_CYW_FW_CYW43455
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1HK
+	bool "1HK"
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1LC
+	bool "1LC"
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1MW
+	bool "1MW"
+
+endchoice
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW4354
+	bool "CYW4354 (1BB)"
+	help
+	  Murata Wireless CYW4354 (1BB) module firmware files.
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW4356
+	bool "CYW4356 (1CX)"
+	help
+	  Murata Wireless CYW4356 (1CX) module firmware files.
+
+config BR2_PACKAGE_MURATA_CYW_FW_CYW4359
+	bool "CYW4359 (1FD)"
+	help
+	  Murata Wireless CYW4359 (1FD) module firmware files.
+
+endif
diff --git a/package/murata-cyw-fw/murata-cyw-fw.hash b/package/murata-cyw-fw/murata-cyw-fw.hash
new file mode 100644
index 0000000000..c1afb229eb
--- /dev/null
+++ b/package/murata-cyw-fw/murata-cyw-fw.hash
@@ -0,0 +1,5 @@
+# Locally calculated
+sha256 c3ecf357786d6db6f3283c0ea36ec067b1728f801fd8871694aed1502a82e9bc murata-cyw-fw-8d87950bfad28c65926695b7357bd8995b60016a.tar.gz
+sha256 03c140ae04f9c2036678262d6457b9c4b4a9ebb523c5e681af6d57b97c11da37 cyw-fmac-nvram-d27f1bf105fa1e5b828e355793b88d4b66188411.tar.gz
+sha256 8f23ebb9a262112b62ace1e1bedcdeb00523d9a45e8d48a829d4ca35db4f0280 cyw-bt-patch-748462f0b02ec4aeb500bedd60780ac51c37be31.tar.gz
+sha256 3a892759b73e8b459f1a750954b316118b0061fd9d1868d11fa258c104ee7e0c LICENCE.cypress
diff --git a/package/murata-cyw-fw/murata-cyw-fw.mk b/package/murata-cyw-fw/murata-cyw-fw.mk
new file mode 100644
index 0000000000..0196b47821
--- /dev/null
+++ b/package/murata-cyw-fw/murata-cyw-fw.mk
@@ -0,0 +1,100 @@
+################################################################################
+#
+# murata-cyw-fw
+#
+################################################################################
+
+MURATA_CYW_FW_VERSION = 8d87950bfad28c65926695b7357bd8995b60016a
+MURATA_CYW_FW_VERSION_NVRAM = d27f1bf105fa1e5b828e355793b88d4b66188411
+MURATA_CYW_FW_VERSION_BT_PATCH = 748462f0b02ec4aeb500bedd60780ac51c37be31
+MURATA_CYW_FW_SITE = $(call github,murata-wireless,cyw-fmac-fw,$(MURATA_CYW_FW_VERSION))
+MURATA_CYW_FW_EXTRA_DOWNLOADS = \
+	$(call github,murata-wireless,cyw-fmac-nvram,$(MURATA_CYW_FW_VERSION_NVRAM))/cyw-fmac-nvram-$(MURATA_CYW_FW_VERSION_NVRAM).tar.gz \
+	$(call github,murata-wireless,cyw-bt-patch,$(MURATA_CYW_FW_VERSION_BT_PATCH))/cyw-bt-patch-$(MURATA_CYW_FW_VERSION_BT_PATCH).tar.gz
+MURATA_CYW_FW_LICENSE = PROPRIETARY
+MURATA_CYW_FW_LICENSE_FILES = LICENCE.cypress
+MURATA_CYW_FW_REDISTRIBUTE = NO
+
+define MURATA_CYW_FW_EXTRACT_NVRAM_PATCH
+	$(foreach tar, $(notdir $(MURATA_CYW_FW_EXTRA_DOWNLOADS)), \
+		$(call suitable-extractor,$(tar)) $(MURATA_CYW_FW_DL_DIR)/$(tar) | \
+		$(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) -$(sep) \
+	)
+endef
+MURATA_CYW_FW_POST_EXTRACT_HOOKS += MURATA_CYW_FW_EXTRACT_NVRAM_PATCH
+
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43012) += \
+	brcmfmac43012-sdio.bin \
+	brcmfmac43012-sdio.1LV.clm_blob \
+	brcmfmac43012-sdio.1LV.txt \
+	CYW43012C0.1LV.hcd
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43340) += \
+	brcmfmac43340-sdio.bin \
+	brcmfmac43340-sdio.1BW.txt \
+	CYW43341B0.1BW.hcd
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43362) += \
+	brcmfmac43362-sdio.bin \
+	brcmfmac43362-sdio.SN8000.txt
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4339) += \
+	brcmfmac4339-sdio.bin
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4339_1CK) += \
+	brcmfmac4339-sdio.1CK.txt
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4339_ZP) += \
+	brcmfmac4339-sdio.ZP.txt \
+	CYW4335C0.ZP.hcd
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430) += \
+	brcmfmac43430-sdio.bin
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1DX) += \
+	brcmfmac43430-sdio.1DX.clm_blob \
+	brcmfmac43430-sdio.1DX.txt \
+	CYW43430A1.1DX.hcd
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1FX) += \
+	brcmfmac43430-sdio.1FX.clm_blob \
+	brcmfmac43430-sdio.1FX.txt
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43430_1LN) += \
+	brcmfmac43430-sdio.1LN.clm_blob \
+	brcmfmac43430-sdio.1LN.txt
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455) += \
+	brcmfmac43455-sdio.bin
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1HK) += \
+	brcmfmac43455-sdio.1HK.clm_blob \
+	brcmfmac43455-sdio.1HK.txt
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1LC) += \
+	brcmfmac43455-sdio.1LC.clm_blob \
+	brcmfmac43455-sdio.1LC.txt
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43455_1MW) += \
+	brcmfmac43455-sdio.1MW.clm_blob \
+	brcmfmac43455-sdio.1MW.txt \
+	CYW4345C0.1MW.hcd
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4354) += \
+	brcmfmac4354-sdio.bin \
+	brcmfmac4354-sdio.1BB.clm_blob \
+	brcmfmac4354-sdio.1BB.txt \
+	CYW4350C0.1BB.hcd
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4356) += \
+	brcmfmac4356-pcie.bin \
+	brcmfmac4356-pcie.1CX.clm_blob \
+	brcmfmac4356-pcie.1CX.txt \
+	CYW4354A2.1CX.hcd
+MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4359) += \
+	brcmfmac4359-pcie.bin \
+	brcmfmac4359-pcie.1FD.clm_blob
+
+# Helper that assumes filename with model has two dots (CHIP.MODEL.EXT),
+# but filename without model has only single dot (CHIP.EXT).
+murata-cyw-fw-strip-model = $(shell echo -n $(1) | sed 's/\..*\./\./')
+
+# Helper that strips model name and renames Bluetooth patch files to the ones
+# expected by Linux kernel.
+murata-cyw-fw-file-rename = $(call murata-cyw-fw-strip-model,$(patsubst CYW%,BCM%,$(f)))
+
+ifneq ($(MURATA_CYW_FW_FILES_y),)
+define MURATA_CYW_FW_INSTALL_TARGET_CMDS
+	mkdir -p $(TARGET_DIR)/lib/firmware/brcm
+	$(foreach f,$(MURATA_CYW_FW_FILES_y), \
+		$(INSTALL) -m 0644 $(@D)/$(f) \
+			$(TARGET_DIR)/lib/firmware/brcm/$(call murata-cyw-fw-file-rename,$(f))$(sep))
+endef
+endif
+
+$(eval $(generic-package))
-- 
2.21.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v3 1/2] package/murata-cyw-fw: new package
  2019-05-10  8:35 ` [Buildroot] [PATCH v3 1/2] " Marcin Niestroj
@ 2019-05-20 20:20   ` Thomas Petazzoni
  0 siblings, 0 replies; 6+ messages in thread
From: Thomas Petazzoni @ 2019-05-20 20:20 UTC (permalink / raw)
  To: buildroot

Hello Marcin,

On Fri, 10 May 2019 10:35:04 +0200
Marcin Niestroj <m.niestroj@grinn-global.com> wrote:

> Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>

I have applied your patch to next, with a few changes, see below.

> +define MURATA_CYW_FW_EXTRACT_NVRAM_PATCH
> +	$(foreach tar, $(notdir $(MURATA_CYW_FW_EXTRA_DOWNLOADS)), \
> +		$(call suitable-extractor,$(tar)) $(MURATA_CYW_FW_DL_DIR)/$(tar) | \
> +		$(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) -$(sep) \

I dropped the $(sep) and final backslash, as this is how we typically
write foreach loops.

> +	)
> +ifneq ($(MURATA_CYW_FW_FILES_y),)

This condition was not really needed: if this variable is empty, the
foreach loop will iterate on an empty list, and do nothing.

> +define MURATA_CYW_FW_INSTALL_TARGET_CMDS
> +	mkdir -p $(TARGET_DIR)/lib/firmware/brcm

I dropped this, and instead added the -D flag to $(INSTALL), which
takes care of creating all intermediate directories.

> +	$(foreach f,$(MURATA_CYW_FW_FILES_y), \
> +		$(INSTALL) -m 0644 $(@D)/$(f) \
> +			$(TARGET_DIR)/lib/firmware/brcm/$(call murata-cyw-fw-file-rename,$(f))$(sep))

I have dropped the $(sep) and moved the final closing parenthesis to
the next line, which does the same thing, but is a bit more common in
Buildroot.

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v3 2/2] package/murata-cyw-fw: download NVRAM and BT_PATCH only when needed
  2019-05-10  8:35 [Buildroot] [PATCH v3 0/2] package/murata-cyw-fw: new package Marcin Niestroj
  2019-05-10  8:35 ` [Buildroot] [PATCH v3 1/2] " Marcin Niestroj
@ 2019-05-10  8:35 ` Marcin Niestroj
  2019-05-20 20:21   ` Thomas Petazzoni
  1 sibling, 1 reply; 6+ messages in thread
From: Marcin Niestroj @ 2019-05-10  8:35 UTC (permalink / raw)
  To: buildroot

Do not download NVRAM and BT_PATCH repositories when selected modules do
not require files from them. One of the example module is CYW4359, which
has neither NVRAM nor BT_PATCH files.

There is also drawback of this approach: NVRAM and BT_PATCH are not
downloaded when package is being rebuilt with changed set selected
modules, so the whole build fails because of missing files.

Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
---
Changes v2 -> v3: add this patch

 package/murata-cyw-fw/murata-cyw-fw.mk | 29 ++++++++++++++++----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/package/murata-cyw-fw/murata-cyw-fw.mk b/package/murata-cyw-fw/murata-cyw-fw.mk
index 0196b47821..c0ada217af 100644
--- a/package/murata-cyw-fw/murata-cyw-fw.mk
+++ b/package/murata-cyw-fw/murata-cyw-fw.mk
@@ -8,21 +8,10 @@ MURATA_CYW_FW_VERSION = 8d87950bfad28c65926695b7357bd8995b60016a
 MURATA_CYW_FW_VERSION_NVRAM = d27f1bf105fa1e5b828e355793b88d4b66188411
 MURATA_CYW_FW_VERSION_BT_PATCH = 748462f0b02ec4aeb500bedd60780ac51c37be31
 MURATA_CYW_FW_SITE = $(call github,murata-wireless,cyw-fmac-fw,$(MURATA_CYW_FW_VERSION))
-MURATA_CYW_FW_EXTRA_DOWNLOADS = \
-	$(call github,murata-wireless,cyw-fmac-nvram,$(MURATA_CYW_FW_VERSION_NVRAM))/cyw-fmac-nvram-$(MURATA_CYW_FW_VERSION_NVRAM).tar.gz \
-	$(call github,murata-wireless,cyw-bt-patch,$(MURATA_CYW_FW_VERSION_BT_PATCH))/cyw-bt-patch-$(MURATA_CYW_FW_VERSION_BT_PATCH).tar.gz
 MURATA_CYW_FW_LICENSE = PROPRIETARY
 MURATA_CYW_FW_LICENSE_FILES = LICENCE.cypress
 MURATA_CYW_FW_REDISTRIBUTE = NO
 
-define MURATA_CYW_FW_EXTRACT_NVRAM_PATCH
-	$(foreach tar, $(notdir $(MURATA_CYW_FW_EXTRA_DOWNLOADS)), \
-		$(call suitable-extractor,$(tar)) $(MURATA_CYW_FW_DL_DIR)/$(tar) | \
-		$(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) -$(sep) \
-	)
-endef
-MURATA_CYW_FW_POST_EXTRACT_HOOKS += MURATA_CYW_FW_EXTRACT_NVRAM_PATCH
-
 MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW43012) += \
 	brcmfmac43012-sdio.bin \
 	brcmfmac43012-sdio.1LV.clm_blob \
@@ -80,6 +69,24 @@ MURATA_CYW_FW_FILES_$(BR2_PACKAGE_MURATA_CYW_FW_CYW4359) += \
 	brcmfmac4359-pcie.bin \
 	brcmfmac4359-pcie.1FD.clm_blob
 
+ifneq ($(findstring .txt,$(MURATA_CYW_FW_FILES_y)),)
+MURATA_CYW_FW_EXTRA_DOWNLOADS += \
+	$(call github,murata-wireless,cyw-fmac-nvram,$(MURATA_CYW_FW_VERSION_NVRAM))/cyw-fmac-nvram-$(MURATA_CYW_FW_VERSION_NVRAM).tar.gz
+endif
+
+ifneq ($(findstring .hcd,$(MURATA_CYW_FW_FILES_y)),)
+MURATA_CYW_FW_EXTRA_DOWNLOADS += \
+	$(call github,murata-wireless,cyw-bt-patch,$(MURATA_CYW_FW_VERSION_BT_PATCH))/cyw-bt-patch-$(MURATA_CYW_FW_VERSION_BT_PATCH).tar.gz
+endif
+
+define MURATA_CYW_FW_EXTRACT_NVRAM_PATCH
+	$(foreach tar, $(notdir $(MURATA_CYW_FW_EXTRA_DOWNLOADS)), \
+		$(call suitable-extractor,$(tar)) $(MURATA_CYW_FW_DL_DIR)/$(tar) | \
+		$(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) -$(sep) \
+	)
+endef
+MURATA_CYW_FW_POST_EXTRACT_HOOKS += MURATA_CYW_FW_EXTRACT_NVRAM_PATCH
+
 # Helper that assumes filename with model has two dots (CHIP.MODEL.EXT),
 # but filename without model has only single dot (CHIP.EXT).
 murata-cyw-fw-strip-model = $(shell echo -n $(1) | sed 's/\..*\./\./')
-- 
2.21.0

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v3 2/2] package/murata-cyw-fw: download NVRAM and BT_PATCH only when needed
  2019-05-10  8:35 ` [Buildroot] [PATCH v3 2/2] package/murata-cyw-fw: download NVRAM and BT_PATCH only when needed Marcin Niestroj
@ 2019-05-20 20:21   ` Thomas Petazzoni
  2019-05-20 20:25     ` Yann E. MORIN
  0 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2019-05-20 20:21 UTC (permalink / raw)
  To: buildroot

Hello Marcin,

On Fri, 10 May 2019 10:35:05 +0200
Marcin Niestroj <m.niestroj@grinn-global.com> wrote:

> Do not download NVRAM and BT_PATCH repositories when selected modules do
> not require files from them. One of the example module is CYW4359, which
> has neither NVRAM nor BT_PATCH files.
> 
> There is also drawback of this approach: NVRAM and BT_PATCH are not
> downloaded when package is being rebuilt with changed set selected
> modules, so the whole build fails because of missing files.
> 
> Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
> ---
> Changes v2 -> v3: add this patch

I looked at the size of the different tarballs:

-rw-r--r-- 1 thomas thomas 193K 20 mai   21:53 cyw-bt-patch-748462f0b02ec4aeb500bedd60780ac51c37be31.tar.gz
-rw-r--r-- 1 thomas thomas  12K 20 mai   21:53 cyw-fmac-nvram-d27f1bf105fa1e5b828e355793b88d4b66188411.tar.gz
-rw-r--r-- 1 thomas thomas 2,7M 20 mai   21:53 murata-cyw-fw-8d87950bfad28c65926695b7357bd8995b60016a.tar.gz

So the main tarball is 2.7 MB, and it gets always downloaded. The other
ones are 193 KB and 12 KB. I don't think this really warrants some
additional complexity: we can simply always download all tarballs, as
you did in PATCH 1/2.

So I marked PATCH 2/2 as Rejected.

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH v3 2/2] package/murata-cyw-fw: download NVRAM and BT_PATCH only when needed
  2019-05-20 20:21   ` Thomas Petazzoni
@ 2019-05-20 20:25     ` Yann E. MORIN
  0 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2019-05-20 20:25 UTC (permalink / raw)
  To: buildroot

Thomas, All,

On 2019-05-20 22:21 +0200, Thomas Petazzoni spake thusly:
> On Fri, 10 May 2019 10:35:05 +0200
> Marcin Niestroj <m.niestroj@grinn-global.com> wrote:
> > Do not download NVRAM and BT_PATCH repositories when selected modules do
> > not require files from them. One of the example module is CYW4359, which
> > has neither NVRAM nor BT_PATCH files.
> > 
> > There is also drawback of this approach: NVRAM and BT_PATCH are not
> > downloaded when package is being rebuilt with changed set selected
> > modules, so the whole build fails because of missing files.
> > 
> > Signed-off-by: Marcin Niestroj <m.niestroj@grinn-global.com>
> > ---
> > Changes v2 -> v3: add this patch
> 
> I looked at the size of the different tarballs:
> 
> -rw-r--r-- 1 thomas thomas 193K 20 mai   21:53 cyw-bt-patch-748462f0b02ec4aeb500bedd60780ac51c37be31.tar.gz
> -rw-r--r-- 1 thomas thomas  12K 20 mai   21:53 cyw-fmac-nvram-d27f1bf105fa1e5b828e355793b88d4b66188411.tar.gz
> -rw-r--r-- 1 thomas thomas 2,7M 20 mai   21:53 murata-cyw-fw-8d87950bfad28c65926695b7357bd8995b60016a.tar.gz
> 
> So the main tarball is 2.7 MB, and it gets always downloaded. The other
> ones are 193 KB and 12 KB. I don't think this really warrants some
> additional complexity: we can simply always download all tarballs, as
> you did in PATCH 1/2.

It was I who suggested Marcin could do this conditional download, after
they explained the extra downloads where not always required.

However, I did not know the relative sizes. Now that I do, I do agree
that this does not warrant the extra complexity.

> So I marked PATCH 2/2 as Rejected.

Agreed.

Regards,
Yann E. MORIN.

> Best regards,
> 
> Thomas
> -- 
> Thomas Petazzoni, CTO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2019-05-20 20:25 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-10  8:35 [Buildroot] [PATCH v3 0/2] package/murata-cyw-fw: new package Marcin Niestroj
2019-05-10  8:35 ` [Buildroot] [PATCH v3 1/2] " Marcin Niestroj
2019-05-20 20:20   ` Thomas Petazzoni
2019-05-10  8:35 ` [Buildroot] [PATCH v3 2/2] package/murata-cyw-fw: download NVRAM and BT_PATCH only when needed Marcin Niestroj
2019-05-20 20:21   ` Thomas Petazzoni
2019-05-20 20:25     ` Yann E. MORIN

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox