core/linux-sun7i to 3.4.103-1

core/linux-sun7i/PKGBUILD

@@ -4,12 +4,12 @@
 buildarch=4
 
 pkgbase=linux-sun7i
-_commit=e37d760b363888f3a65cd6455c99a75cac70a7b8
+_commit=9a1cd034181af628d4145202289e1993c1687db6
 _srcname=linux-sunxi-${_commit}
 _kernelname=${pkgbase#linux}
 _desc="sun7i"
-pkgver=3.4.90
-pkgrel=5
+pkgver=3.4.103
+pkgrel=1
 arch=('armv7h')
 url="https://github.com/linux-sunxi/linux-sunxi/"
 license=('GPL2')
@@ -17,22 +17,20 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'uboot-mkimage' 'git'
 options=('!strip')
 source=("https://github.com/linux-sunxi/linux-sunxi/archive/${_commit}.tar.gz"
         'config'
-        'working-bcmdhd-driver.patch'
-        '0001-Backport-BFP-XOR-operation.patch')
-md5sums=('dbf73f4cb6b1399e73449f4e91bf5694'
-         '75d4998cd9544be9423d80564441ec31'
-         '07c260ca97572a830778362c7b744f9c'
-         'ca5b466850782493b99e824d6efbea4d')
+        '0001-Backport-BFP-XOR-operation.patch'
+        '0001-Backport-firmware-loader.patch')
+md5sums=('6cdd44f9131a854cdbf5ddad86187c57'
+         '7e789e3271e1b7b2a4426b3eb3253468'
+         'ca5b466850782493b99e824d6efbea4d'
+         '520bde63dd6803f3332e9b26cb34cff9')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
 
   cat "${srcdir}/config" > ./.config
 
-  # patch bcmdhd driver with a working version
-  patch -Np1 -i "${srcdir}/working-bcmdhd-driver.patch"
-
   git apply ../0001-Backport-BFP-XOR-operation.patch
+  git apply ../0001-Backport-firmware-loader.patch
 
   # add pkgrel to extraversion
   sed -ri "s|^(EXTRAVERSION =)(.*)|\1 \2-${pkgrel}|" Makefile

core/linux-sun7i/config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.4.90-3 Kernel Configuration
+# Linux/arm 3.4.103-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -1030,6 +1030,7 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_FW_LOADER=y
 CONFIG_FIRMWARE_IN_KERNEL=y
 CONFIG_EXTRA_FIRMWARE=""
+# CONFIG_FW_LOADER_USER_HELPER is not set
 # CONFIG_DEBUG_DRIVER is not set
 # CONFIG_DEBUG_DEVRES is not set
 # CONFIG_SYS_HYPERVISOR is not set
@@ -1481,11 +1482,16 @@ CONFIG_ATH6KL=m
 # CONFIG_B43 is not set
 # CONFIG_B43LEGACY is not set
 CONFIG_BCMDHD=m
+CONFIG_BCM4339=m
 CONFIG_BCMDHD_FW_PATH="/lib/firmware/ap6210/fw_bcmxxxx.bin"
 CONFIG_BCMDHD_NVRAM_PATH="/lib/firmware/ap6210/nvram_apxxxx.txt"
-CONFIG_BCMDHD_OOB=y
-# CONFIG_BCMDHD_SDIO_IRQ is not set
-# CONFIG_BRCMFMAC is not set
+# CONFIG_DHD_USE_STATIC_BUF is not set
+# CONFIG_DHD_USE_SCHED_SCAN is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+# CONFIG_BRCMDBG is not set
 CONFIG_BCM4330=m
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y