Merge pull request #1127 from piso77/firmware-brcm43xx_fixes

alarm/firmware-brcm43xx Fixes for the bcm4330 chip

alarm/firmware-brcm43xx/PKGBUILD

@@ -5,19 +5,19 @@ buildarch=4
 pkgname=firmware-brcm43xx
 pkgdesc="bluetooth firmware and firware loading utility for the bcm43xx bluetooth"
 pkgver=1.1
-pkgrel=2
+pkgrel=3
 arch=('armv7h')
 url="https://github.com/OpenBricks/openbricks/tree/master/packages/brcm-patchram-plus"
 license=('apache' 'custom')
 makedepends=('')
 depends=('bluez-utils')
 backup=('etc/conf.d/bcm43xx')
-source=('https://raw.githubusercontent.com/OpenBricks/openbricks/master/packages/firmware-wifi-brcm80211/config/bcm4329_nvram.txt'
-        'https://raw.githubusercontent.com/OpenBricks/openbricks/master/packages/firmware-wifi-brcm80211/config/bcm4330_nvram.txt'
-        'https://raw.githubusercontent.com/OpenBricks/openbricks/master/packages/firmware-wifi-brcm80211/config/bcm4330_nvram.txt'
-        'https://github.com/OpenBricks/openbricks/raw/master/packages/brcm-patchram-plus/sources/bcm4329.hcd'
-        'https://github.com/OpenBricks/openbricks/raw/master/packages/brcm-patchram-plus/sources/bcm4330.hcd'
-        'https://raw.githubusercontent.com/OpenBricks/openbricks/master/packages/brcm-patchram-plus/sources/brcm_patchram_plus.c'
+source=('https://raw.githubusercontent.com/OpenBricks/openbricks/master/packages/firmware/firmware-wifi-brcm80211/config/bcm4329_nvram.txt'
+        'https://raw.githubusercontent.com/OpenBricks/openbricks/master/packages/firmware/firmware-wifi-brcm80211/config/bcm4330_nvram.txt'
+        'https://raw.githubusercontent.com/OpenBricks/openbricks/master/packages/firmware/firmware-wifi-brcm80211/config/bcm4330_nvram.txt'
+        'https://github.com/OpenBricks/openbricks/raw/master/packages/net/brcm-patchram-plus/sources/bcm4329.hcd'
+        'https://github.com/OpenBricks/openbricks/raw/master/packages/net/brcm-patchram-plus/sources/bcm4330.hcd'
+        'https://raw.githubusercontent.com/OpenBricks/openbricks/master/packages/net/brcm-patchram-plus/sources/brcm_patchram_plus.c'
         'brcm43xx-firmware-update'
         'brcm43xx-firmware.service'
         'brcm43xx.service'
@@ -28,7 +28,7 @@ md5sums=('bf01292eec17815baa68a83d3d7722ad'
          'ff27325602dc223203adfdd23a89844b'
          '8e32f9168aaa540467589c153129c57a'
          '627e9612337e5ef6027a87a79c491446'
-         '2c2d2288e519e605a7f0d04c4e0dc720'
+         'c318d1d7cc65e89d5238e7c9ec0f4bfc'
          'a1bd492bdafced5b41abe4bdebbb07e2'
          'cb3cbf6ee612e711d4b2c578d93fdae5'
          'f21bddcbe8c4e1dedaf31e2959b284d9')

alarm/firmware-brcm43xx/brcm43xx-firmware-update

@@ -28,7 +28,7 @@ fi
 HCD_BASE=$(basename "$HCD")
 
 # Device specific options
-[ "$HCD_BASE" = "bcm4330.hcd" ] && OPTIONS="--no2bytes --enable_lpm --tosleep=50000 $OPTIONS"
+[ "$HCD_BASE" = "bcm4330.hcd" ] && OPTIONS="--no2bytes --tosleep=50000 $OPTIONS"
 
 [ ! -e "$HCD" ] && HCD="/lib/firmware/brcm/${HCD_BASE}"
 if [ ! -e "$HCD" ]; then