From: Álvaro Fernández Rojas <noltari@gmail.com>
Date: Thu, 15 Sep 2016 07:07:50 +0000 (+0200)
Subject: brcmfmac43430-firmware: rename to brcmfmac-firmware-43430-sdio
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=ba5a9aba5c2bcc22cf8f11c5c4aba2be644bb5ad;p=openwrt%2Fstaging%2Fblocktrron.git

brcmfmac43430-firmware: rename to brcmfmac-firmware-43430-sdio

This is consistent with the rest of brcmfmac firmwares.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---

diff --git a/package/firmware/brcmfmac43430-firmware/Makefile b/package/firmware/brcmfmac43430-firmware/Makefile
index dfc2b256fd..7a6bcc0466 100644
--- a/package/firmware/brcmfmac43430-firmware/Makefile
+++ b/package/firmware/brcmfmac43430-firmware/Makefile
@@ -7,7 +7,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=brcmfmac43430-firmware-sdio
+PKG_NAME:=brcmfmac-firmware-43430-sdio
 PKG_VERSION:=2016-06-07
 PKG_RELEASE:=a7491de4c4b2f1ceb5d0dfa5350b95e5c6fb9bd4
 
@@ -32,14 +32,14 @@ define Download/brcmfmac43430_sdio_txt
 endef
 $(eval $(call Download,brcmfmac43430_sdio_txt))
 
-define Package/brcmfmac43430-firmware-sdio
+define Package/brcmfmac-firmware-43430-sdio
   SECTION:=firmware
   CATEGORY:=Firmware
-  TITLE:=Broadcom BCM43430 fullmac SDIO firmware
+  TITLE:=Broadcom BCM43430 FullMac SDIO firmware
   URL:=http://www.broadcom.com/
 endef
 
-define Package/brcmfmac43430-firmware-sdio/description
+define Package/brcmfmac-firmware-43430-sdio/description
 	Broadcom BCM43430 fullmac SDIO firmware
 endef
 
@@ -54,10 +54,10 @@ define Build/Compile
 	true
 endef
 
-define Package/brcmfmac43430-firmware-sdio/install
+define Package/brcmfmac-firmware-43430-sdio/install
 	$(INSTALL_DIR) $(1)/lib/firmware/brcm/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/brcmfmac43430-sdio.bin $(1)/lib/firmware/brcm/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/brcmfmac43430-sdio.txt $(1)/lib/firmware/brcm/
 endef
 
-$(eval $(call BuildPackage,brcmfmac43430-firmware-sdio))
+$(eval $(call BuildPackage,brcmfmac-firmware-43430-sdio))
diff --git a/target/linux/brcm2708/image/Makefile b/target/linux/brcm2708/image/Makefile
index 85c72e27da..f19f57cb2c 100644
--- a/target/linux/brcm2708/image/Makefile
+++ b/target/linux/brcm2708/image/Makefile
@@ -70,7 +70,7 @@ endif
 define Device/rpi-3
   DEVICE_TITLE := Raspberry Pi 3 B/CM
   DEVICE_DTS := bcm2710-rpi-3-b bcm2710-rpi-cm3
-  DEVICE_PACKAGES := brcmfmac43430-firmware-sdio kmod-brcmfmac wpad-mini
+  DEVICE_PACKAGES := brcmfmac-firmware-43430-sdio kmod-brcmfmac wpad-mini
 endef
 ifeq ($(SUBTARGET),bcm2710)
   TARGET_DEVICES += rpi-3