From a531257c40920de0161150091eaccbbc1182eb96 Mon Sep 17 00:00:00 2001 From: Henry Ptasinski Date: Fri, 8 Apr 2011 07:51:13 -0700 Subject: [PATCH] linux-firmware: Removed codeversion from brcm firmware filenames. The basename-apiversion-codeversion construction for firmware filenames is not used by most other firmware files, adds complexity, and is not providing any value. Renamed the firmware files using just basename-apiversion and fixed WHENCE to have correct names and path to these files. Signed-off-by: Henry Ptasinski Signed-off-by: David Woodhouse --- WHENCE | 12 ++++++------ ...ullmac-4-218-248-5.bin => bcm4329-fullmac-4.bin} | Bin ...ullmac-4-218-248-5.txt => bcm4329-fullmac-4.txt} | 0 brcm/{bcm43xx-0-610-809-0.fw => bcm43xx-0.fw} | Bin ...{bcm43xx_hdr-0-610-809-0.fw => bcm43xx_hdr-0.fw} | Bin 5 files changed, 6 insertions(+), 6 deletions(-) rename brcm/{bcm4329-fullmac-4-218-248-5.bin => bcm4329-fullmac-4.bin} (100%) rename brcm/{bcm4329-fullmac-4-218-248-5.txt => bcm4329-fullmac-4.txt} (100%) rename brcm/{bcm43xx-0-610-809-0.fw => bcm43xx-0.fw} (100%) rename brcm/{bcm43xx_hdr-0-610-809-0.fw => bcm43xx_hdr-0.fw} (100%) diff --git a/WHENCE b/WHENCE index 88d7722..b240756 100644 --- a/WHENCE +++ b/WHENCE @@ -1433,19 +1433,19 @@ Licence: -------------------------------------------------------------------------- -Driver: brcm80211 - Broadcom 802.11n wireless LAN driver. +Driver: brcmsmac - Broadcom 802.11n softmac wireless LAN driver. -File: brcm/bcm43xx-0-610-809-0.fw -File: brcm/bcm43xx_hdr-0-610-809-0.fw +File: brcm/bcm43xx-0.fw +File: brcm/bcm43xx_hdr-0.fw Licence: Redistributable. See LICENCE.broadcom_bcm43xx for details. -------------------------------------------------------------------------- -Driver: brcm80211 - Broadcom 802.11n wireless LAN driver. +Driver: brcmfmac - Broadcom 802.11n fullmac wireless LAN driver. -File: bcm4329-fullmac-4-218-248-5.bin -File: bcm4329-fullmac-4-218-248-5.txt +File: brcm/bcm4329-fullmac-4.bin +File: brcm/bcm4329-fullmac-4.txt Licence: Redistributable. See LICENCE.broadcom_bcm43xx for details. diff --git a/brcm/bcm4329-fullmac-4-218-248-5.bin b/brcm/bcm4329-fullmac-4.bin similarity index 100% rename from brcm/bcm4329-fullmac-4-218-248-5.bin rename to brcm/bcm4329-fullmac-4.bin diff --git a/brcm/bcm4329-fullmac-4-218-248-5.txt b/brcm/bcm4329-fullmac-4.txt similarity index 100% rename from brcm/bcm4329-fullmac-4-218-248-5.txt rename to brcm/bcm4329-fullmac-4.txt diff --git a/brcm/bcm43xx-0-610-809-0.fw b/brcm/bcm43xx-0.fw similarity index 100% rename from brcm/bcm43xx-0-610-809-0.fw rename to brcm/bcm43xx-0.fw diff --git a/brcm/bcm43xx_hdr-0-610-809-0.fw b/brcm/bcm43xx_hdr-0.fw similarity index 100% rename from brcm/bcm43xx_hdr-0-610-809-0.fw rename to brcm/bcm43xx_hdr-0.fw