core/linux-chromebook2 to 20140707-1

core/linux-chromebook2/PKGBUILD

@@ -5,8 +5,8 @@ buildarch=4
 
 pkgbase=linux-chromebook2
 pkgname=('linux-chromebook2' 'linux-headers-chromebook2')
-pkgver=20140628
-pkgrel=2
+pkgver=20140707
+pkgrel=1
 _kernelname=${pkgname#linux}
 pkgdesc="ChromiumOS kernel with ArchLinux ARM tweaks"
 _basever=3.8
@@ -17,14 +17,18 @@ makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'dtc' 'inetutils' 'kmod' 'vbo
 options=('!strip')
 _commit=e27730dd2877ee4aca8d1f002b70807504140336
 source=("https://chromium.googlesource.com/chromiumos/third_party/kernel/+archive/${_commit}.tar.gz"
+        'http://archlinuxarm.org/builder/src/sd8797_uapsta_cros.bin'
         '0001-exynos-drm-smem-start-len.patch'
+        'mwifiex-cros.patch'
         'config'
         'kernel.its'
         'kernel.keyblock'
         'kernel_data_key.vbprivk')
 noextract=("${_commit}.tar.gz")
 md5sums=('SKIP'
+         'dc6da2272ffb8ea63f10bc4457cc3f70'
          'dc8c3ffa65edd9ee30a1f9805d2b3460'
+         '533ebbdc096adab3ec0d649fd04a0ca5'
          'a5d06241e13c11fae3eff39aa737dddf'
          '1e66637b4771568d2dfa161f5e0357f7'
          '61c5ff73c136ed07a7aadbf58db3d96a'
@@ -41,6 +45,9 @@ prepare() {
   # fix for using xf86-video-fbturbo
   git apply ../0001-exynos-drm-smem-start-len.patch
 
+  # use ChromeOS version of mwifiex 8797 firmware we provide
+  patch -p1 -i ../mwifiex-cros.patch
+
   # Kernel configuration
   cp "${srcdir}/config" .config
 
@@ -122,6 +129,10 @@ package_linux-chromebook2() {
   mkdir -p "${pkgdir}/lib/modules/extramodules-${_basekernel}-${_kernelname:-ARCH}"
   echo "${_kernver}" > "${pkgdir}/lib/modules/extramodules-${_basekernel}-${_kernelname:-ARCH}/version"
 
+  # install ChromeOS mwifiex 8797 firmware
+  mkdir -p "${pkgdir}"/usr/lib/firmware/mrvl
+  cp ../sd8797_uapsta_cros.bin "${pkgdir}"/usr/lib/firmware/mrvl
+
   # Now we call depmod...
   depmod -b "$pkgdir" -F System.map "$_kernver"
 

core/linux-chromebook2/mwifiex-cros.patch

@@ -0,0 +1,12 @@
+diff -urN a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h
+--- a/drivers/net/wireless/mwifiex/sdio.h	2014-06-28 19:50:40.000000000 -0600
++++ b/drivers/net/wireless/mwifiex/sdio.h	2014-07-07 19:58:34.086771670 -0600
+@@ -31,7 +31,7 @@
+ 
+ #define SD8786_DEFAULT_FW_NAME "mrvl/sd8786_uapsta.bin"
+ #define SD8787_DEFAULT_FW_NAME "mrvl/sd8787_uapsta.bin"
+-#define SD8797_DEFAULT_FW_NAME "mrvl/sd8797_uapsta.bin"
++#define SD8797_DEFAULT_FW_NAME "mrvl/sd8797_uapsta_cros.bin"
+ #define SD8897_DEFAULT_FW_NAME "mrvl/sd8897_uapsta.bin"
+ 
+ #define BLOCK_MODE	1