Skip to contentSkip to conversation

broadcom-nvram-config: add cubox-i

PATCH In review Benjamin Cohen 2 participants 2 messages Nov 13, 2014 – Nov 27, 2014

lore
Share & tools
lore

Benjamin Cohen

author
#0 lore raw

PATCH 1/1 broadcom-nvram-config: add cubox-i

- add bcm4330 nvram config for cubox-i
- add bcm4330-nvram-config to MACHINE_EXTRA_RRECOMMENDS for cubox-i

Signed-off-by Benjamin Cohen <[email protected]>
---
 conf/machine/cubox-i.conf                          |    4 ++
 .../broadcom-nvram-config/bcm4330-nvram-config.bb  |    2 +-
 .../files/cubox-i/brcmfmac4330-sdio.txt            |   40 ++++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 recipes-bsp/broadcom-nvram-config/files/cubox-i/brcmfmac4330-sdio.txt
conf/machine/cubox-i.conf +4 -0
index 6c67c19..fa90d7c 100644
@@ -33,4 +33,8 @@ KERNEL_DEVICETREE = "imx6dl-cubox-i.dtb imx6q-cubox-i.dtb imx6dl-hummingboard.dt
 MACHINE_FEATURES += "pci wifi bluetooth alsa bluetooth irda serial usbhost wifi"
 MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
 
+MACHINE_EXTRA_RRECOMMENDS += " \
+	bcm4330-nvram-config \
+"
+
 SERIAL_CONSOLE = "115200 ttymxc0"
recipes-bsp/broadcom-nvram-config/bcm4330-nvram-config.bb +1 -1
index 592cfc9..d5e7ebb 100644
@@ -5,4 +5,4 @@ include broadcom-nvram-config.inc
 
 CHIP_MODEL = "4330"
 
-COMPATIBLE_MACHINE = "(nitrogen6x-lite|wandboard-dual|wandboard-quad)"
+COMPATIBLE_MACHINE = "(nitrogen6x-lite|wandboard-dual|wandboard-quad|cubox-i)"
recipes-bsp/broadcom-nvram-config/files/cubox-i/brcmfmac4330-sdio.txt new file +40 -0
new file mode 100644
index 0000000..9546246
@@ -0,0 +1,40 @@
+# bcm94330wlsdgb.txt
+manfid=0x2d0
+prodid=0x0552
+vendid=0x14e4
+devid=0x4360
+boardtype=0x0552
+boardrev=0x11
+# this design has 2.4GHz SP3T switch
+boardflags=0x00080200
+nocrc=1
+xtalfreq=37400
+boardnum=22
+macaddr=00:90:4c:c5:12:38
+ag0=255
+aa2g=1
+ccode=CN
+pa0b0=0x14d0
+pa0b1=0xfd98
+pa0b2=0xff78
+rssismf2g=0xa
+rssismc2g=0x3
+rssisav2g=0x7
+maxp2ga0=0x50
+sromrev=3
+il0macaddr=00:90:4c:c5:12:38
+wl0id=0x431b
+cckPwrOffset=5
+ofdm2gpo=0x66666666
+mcs2gpo0=0x6666
+mcs2gpo1=0x6666
+swctrlmap_2g=0x04040404,0x02020202,0x02020404,0x10202,0x1ff
+swctrlmap_5g=0x00100010,0x00280020,0x00200010,0x14202,0x2f8
+rfreg033=0x19
+rfreg033_cck=0x1f
+dacrate2g=160
+txalpfbyp2g=1
+bphyscale=17
+cckPwrIdxCorr=-15
+pacalidx2g=45
+txgaintbl=1
Signature · 1 line
1.7.10.4
#1 lore raw

Since I am not knowledgeable about the Broadcom hardware, I asked around. As a conclusion, it looks fine, except for two things:

* ccode=CN should use =ALL instead. This is the parameter that specifies which frequency spectrum to scan. The spectrum in EU and US are different than in CN. Perhaps this should be configurable.
* MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k" should be changed as well. Something like "linux-firmware-brcmfmac" would make more sense, if such a package exists.

Quoted 80 lines · Benjamin Cohen

- add bcm4330 nvram config for cubox-i
- add bcm4330-nvram-config to MACHINE_EXTRA_RRECOMMENDS for cubox-i

Signed-off-by Benjamin Cohen <[email protected]>
---
  conf/machine/cubox-i.conf                          |    4 ++
  .../broadcom-nvram-config/bcm4330-nvram-config.bb  |    2 +-
  .../files/cubox-i/brcmfmac4330-sdio.txt            |   40 ++++++++++++++++++++
  3 files changed, 45 insertions(+), 1 deletion(-)

create mode 100644 recipes-bsp/broadcom-nvram-config/files/cubox-i/brcmfmac4330-sdio.txt

conf/machine/cubox-i.conf +4 -0
index 6c67c19..fa90d7c 100644
@@ -33,4 +33,8 @@ KERNEL_DEVICETREE = "imx6dl-cubox-i.dtb imx6q-cubox-i.dtb imx6dl-hummingboard.dt
  MACHINE_FEATURES += "pci wifi bluetooth alsa bluetooth irda serial usbhost wifi"
  MACHINE_FIRMWARE_append_mx6 = " linux-firmware-ath6k"
 
+MACHINE_EXTRA_RRECOMMENDS += " \
+	bcm4330-nvram-config \
+"
+
  SERIAL_CONSOLE = "115200 ttymxc0"
recipes-bsp/broadcom-nvram-config/bcm4330-nvram-config.bb +1 -1
index 592cfc9..d5e7ebb 100644
@@ -5,4 +5,4 @@ include broadcom-nvram-config.inc
 
  CHIP_MODEL = "4330"
 
-COMPATIBLE_MACHINE = "(nitrogen6x-lite|wandboard-dual|wandboard-quad)"
+COMPATIBLE_MACHINE = "(nitrogen6x-lite|wandboard-dual|wandboard-quad|cubox-i)"
recipes-bsp/broadcom-nvram-config/files/cubox-i/brcmfmac4330-sdio.txt new file +40 -0
new file mode 100644
index 0000000..9546246
@@ -0,0 +1,40 @@
+# bcm94330wlsdgb.txt
+manfid=0x2d0
+prodid=0x0552
+vendid=0x14e4
+devid=0x4360
+boardtype=0x0552
+boardrev=0x11
+# this design has 2.4GHz SP3T switch
+boardflags=0x00080200
+nocrc=1
+xtalfreq=37400
+boardnum=22
+macaddr=00:90:4c:c5:12:38
+ag0=255
+aa2g=1
+ccode=CN
+pa0b0=0x14d0
+pa0b1=0xfd98
+pa0b2=0xff78
+rssismf2g=0xa
+rssismc2g=0x3
+rssisav2g=0x7
+maxp2ga0=0x50
+sromrev=3
+il0macaddr=00:90:4c:c5:12:38
+wl0id=0x431b
+cckPwrOffset=5
+ofdm2gpo=0x66666666
+mcs2gpo0=0x6666
+mcs2gpo1=0x6666
+swctrlmap_2g=0x04040404,0x02020202,0x02020404,0x10202,0x1ff
+swctrlmap_5g=0x00100010,0x00280020,0x00200010,0x14202,0x2f8
+rfreg033=0x19
+rfreg033_cck=0x1f
+dacrate2g=160
+txalpfbyp2g=1
+bphyscale=17
+cckPwrIdxCorr=-15
+pacalidx2g=45
+txgaintbl=1