Skip to contentSkip to conversation

nitrogen6x-lite: Add Broadcom firmware

PATCH New Eric Nelson 1 participant 1 message Oct 7, 2013

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 nitrogen6x-lite: Add Broadcom firmware

The Nitrogen6-Lite board supports Wi-fi with a daughterboard with the Broadcom 4330 ABGN chip.

This patch adds the driver, firmware, and calibration (nvram) files to the build using the broadcom-nvram-config recipe.

---
V2 uses the broadcom-nvram-config recipe to do this, adds support for the nvram file, and updates the kernel configuration to specify the location of both the firmware and nvram files.

Requires Luca's patch set adding nitrogen6x-lite support:

	http://patches.openembedded.org/patch/59323/
 conf/machine/nitrogen6x-lite.conf                  |  1 +
 .../broadcom-nvram-config/broadcom-nvram-config.bb |  3 +-
 .../files/nitrogen6x-lite/nvram.txt                | 80 ++++++++++++++++++++++
 .../nitrogen6x-lite/defconfig                      |  4 +-
 4 files changed, 85 insertions(+), 3 deletions(-)
 create mode 100644 recipes-bsp/broadcom-nvram-config/files/nitrogen6x-lite/nvram.txt
conf/machine/nitrogen6x-lite.conf +1 -0
index a394dfb..ff58715 100644
@@ -24,4 +24,5 @@ UBOOT_MACHINE ?= "nit6xlite_config"
 
 SERIAL_CONSOLE = "115200 ttymxc1"
 
+MACHINE_EXTRA_RRECOMMENDS += " broadcom-nvram-config"
 MACHINE_FEATURES += " pci wifi bluetooth"
recipes-bsp/broadcom-nvram-config/broadcom-nvram-config.bb +2 -1
index 7566b74..501cc20 100644
@@ -22,9 +22,10 @@ FILES_${PN} = " \
   /lib/firmware/brcm/brcmfmac-sdio.txt \
 "
 BROADCOM_FIRMWARE = "INVALID"
+BROADCOM_FIRMWARE_nitrogen6x-lite = "bcm4330"
 BROADCOM_FIRMWARE_wandboard-dual = "bcm4329"
 BROADCOM_FIRMWARE_wandboard-quad = "bcm4329"
 
 RDEPENDS_${PN} = "linux-firmware-${BROADCOM_FIRMWARE}"
 
-COMPATIBLE_MACHINE = "(wandboard-dual|wandboard-quad)"
+COMPATIBLE_MACHINE = "(nitrogen6x-lite|wandboard-dual|wandboard-quad)"
recipes-bsp/broadcom-nvram-config/files/nitrogen6x-lite/nvram.txt new file +80 -0

80 lines not on this page · raw message

recipes-kernel/linux/linux-boundary-3.0.35/nitrogen6x-lite/defconfig +2 -2
index 1b9b181..ad0795d 100644
@@ -114,8 +114,8 @@ CONFIG_FEC_NAPI=y
 # CONFIG_NETDEV_1000 is not set
 # CONFIG_NETDEV_10000 is not set
 CONFIG_BCMDHD=m
-CONFIG_BCMDHD_FW_PATH="/lib/firmware/fw_bcmdhd.bin"
-CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/bcmdhd.cal"
+CONFIG_BCMDHD_FW_PATH="/lib/firmware/brcm/brcmfmac-sdio.bin"
+CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/brcm/brcmfmac-sdio.txt"
 CONFIG_INPUT_POLLDEV=y
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
Signature · 1 line
1.8.1.2