Update veyron for 2017.2

2017-09-20 16:45:59 -05:00
parent af5cd68c86
commit 9885e7a051
4 changed files with 247 additions and 157 deletions
--- a/chromebook-arm-veyron.sh
+++ b/chromebook-arm-veyron.sh
@@ -29,18 +29,19 @@ unset CROSS_COMPILE

 arm="abootimg cgpt fake-hwclock ntpdate u-boot-tools vboot-utils vboot-kernel-utils"
 base="alsa-utils btrfs-tools e2fsprogs initramfs-tools kali-defaults kali-menu parted pulseaudio sudo usbutils"
-desktop="fonts-croscore fonts-crosextra-caladea fonts-crosextra-carlito gnome-theme-kali gtk3-engines-xfce kali-desktop-xfce kali-root-login lightdm network-manager network-manager-gnome xfce4 xserver-xorg-video-fbdev"
+desktop="fonts-croscore fonts-crosextra-caladea fonts-crosextra-carlito gnome-theme-kali gtk3-engines-xfce kali-desktop-xfce kali-root-login lightdm network-manager network-manager-gnome xfce4 xserver-xorg-video-fbdev xserver-xorg-input-synaptics xserver-xorg-input-all xserver-xorg-input-libinput"
 tools="aircrack-ng ethtool hydra john libnfc-bin mfoc nmap passing-the-hash sqlmap usbutils winexe wireshark"
 services="apache2 openssh-server"
-extras="florence iceweasel xfce4-goodies xfce4-terminal xinput wpasupplicant"
+extras="florence iceweasel xfce4-goodies xfce4-terminal xinput wpasupplicant firmware-linux firmware-linux-nonfree firmware-libertas"

 packages="${arm} ${base} ${desktop} ${tools} ${services} ${extras}"
 architecture="armhf"
-kernel_commit="7247c395ff6b325d2dbffc5a9c9f1c30417ce133"
 # If you have your own preferred mirrors, set them here.
 # After generating the rootfs, we set the sources.list to the default settings.
 mirror=http.kali.org

+kernel_release="R60-9592.B-chromeos-3.14"
+
 # Set this to use an http proxy, like apt-cacher-ng, and uncomment further down
 # to unset it.
 #export http_proxy="http://localhost:3142/"
@@ -79,7 +80,7 @@ iface lo inet loopback
 EOF

 cat << EOF > kali-$architecture/etc/resolv.conf
-nameserver 8.8.8.8
+nameserver 192.168.11.1
 EOF

 export MALLOC_CHECK_=0 # workaround for LP: #520465
@@ -142,6 +143,10 @@ EOF
 chmod +x kali-$architecture/cleanup
 LANG=C chroot kali-$architecture /cleanup

+cat << EOF > kali-$architecture/etc/resolv.conf
+nameserver 8.8.8.8
+EOF
+
 umount kali-$architecture/proc/sys/fs/binfmt_misc
 umount kali-$architecture/dev/pts
 umount kali-$architecture/dev/
@@ -163,7 +168,7 @@ device="/dev/mapper/${device}"
 bootp=${device}p1
 rootp=${device}p2

-mkfs.ext4 -L rootfs $rootp
+mkfs.ext4 -O ^flex_bg -O ^metadata_csum -L rootfs $rootp

 mkdir -p ${basedir}/root
 mount $rootp ${basedir}/root
@@ -181,19 +186,17 @@ EOF

 # Kernel section.  If you want to use a custom kernel, or configuration, replace
 # them in this section.
-git clone --depth 1 https://chromium.googlesource.com/chromiumos/third_party/kernel -b chromeos-3.14 ${basedir}/root/usr/src/kernel
+git clone --depth 1 https://chromium.googlesource.com/chromiumos/third_party/kernel -b release-${kernel_release} ${basedir}/root/usr/src/kernel
 cd ${basedir}/root/usr/src/kernel
-git checkout $kernel_commit
 cp ${basedir}/../kernel-configs/chromebook-rockchip-3.14_wireless-3.8.config .config
 cp ${basedir}/../kernel-configs/chromebook-rockchip-3.14_wireless-3.8.config ../veyron.config
-echo $kernel_commit > ../kernel-at-commit
 export ARCH=arm
 # Edit the CROSS_COMPILE variable as needed.
 export CROSS_COMPILE=arm-linux-gnueabihf-
 touch .scmversion
 patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/mac80211-3.8.patch
 patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/0002-mwifiex-do-not-create-AP-and-P2P-interfaces-upon-dri.patch
-patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/0003-UPSTREAM-soc-rockchip-add-handler-for-usb-uart-funct.patch
+#patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/0003-UPSTREAM-soc-rockchip-add-handler-for-usb-uart-funct.patch
 patch -p1 --no-backup-if-mismatch < ${basedir}/../patches/0004-fix-brcmfmac-oops-and-race-condition.patch
 make WIFIVERSION="-3.8" -j$(grep -c processor /proc/cpuinfo)
 make WIFIVERSION="-3.8" dtbs
@@ -225,26 +228,6 @@ cat << __EOF__ > ${basedir}/root/usr/src/kernel/arch/arm/boot/kernel-veyron.its
            };
        };
        fdt@2{
-            description = "rk3288-jaq-rev1.dtb";
-            data = /incbin/("dts/rk3288-jaq-rev1.dtb");
-            type = "flat_dt";
-            arch = "arm";
-            compression = "none";
-            hash@1{
-                algo = "sha1";
-            };
-        };
-        fdt@3{
-            description = "rk3288-nicky-rev0.dtb";
-            data = /incbin/("dts/rk3288-nicky-rev0.dtb");
-            type = "flat_dt";
-            arch = "arm";
-            compression = "none";
-            hash@1{
-                algo = "sha1";
-            };
-        };
-        fdt@4{
            description = "rk3288-danger-rev0.dtb";
            data = /incbin/("dts/rk3288-danger-rev0.dtb");
            type = "flat_dt";
@@ -254,9 +237,29 @@ cat << __EOF__ > ${basedir}/root/usr/src/kernel/arch/arm/boot/kernel-veyron.its
                algo = "sha1";
            };
        };
+        fdt@3{
+            description = "rk3288-danger-rev1.dtb";
+            data = /incbin/("dts/rk3288-danger-rev1.dtb");
+            type = "flat_dt";
+            arch = "arm";
+            compression = "none";
+            hash@1{
+                algo = "sha1";
+            };
+        };
+        fdt@4{
+            description = "rk3288-emile-rev0.dtb";
+            data = /incbin/("dts/rk3288-emile-rev0.dtb");
+            type = "flat_dt";
+            arch = "arm";
+            compression = "none";
+            hash@1{
+                algo = "sha1";
+            };
+        };
        fdt@5{
-            description = "rk3288-jerry-rev2.dtb";
-            data = /incbin/("dts/rk3288-jerry-rev2.dtb");
+            description = "rk3288-evb-act8846.dtb";
+            data = /incbin/("dts/rk3288-evb-act8846.dtb");
            type = "flat_dt";
            arch = "arm";
            compression = "none";
@@ -265,8 +268,8 @@ cat << __EOF__ > ${basedir}/root/usr/src/kernel/arch/arm/boot/kernel-veyron.its
            };
        };
        fdt@6{
-	    description = "rk3288-rialto-rev0.dtb";
-	    data = /incbin/("dts/rk3288-rialto-rev0.dtb");
+	    description = "rk3288-evb-rk808.dtb";
+	    data = /incbin/("dts/rk3288-evb-rk808.dtb");
 	    type = "flat_dt";
 	    arch = "arm";
 	    compression = "none";
@@ -275,8 +278,8 @@ cat << __EOF__ > ${basedir}/root/usr/src/kernel/arch/arm/boot/kernel-veyron.its
 	    };
 	};
        fdt@7{
-	    description = "rk3288-danger-rev1.dtb";
-	    data = /incbin/("dts/rk3288-danger-rev1.dtb");
+	    description = "rk3288-fievel-rev0.dtb";
+	    data = /incbin/("dts/rk3288-fievel-rev0.dtb");
 	    type = "flat_dt";
 	    arch = "arm";
 	    compression = "none";
@@ -285,6 +288,46 @@ cat << __EOF__ > ${basedir}/root/usr/src/kernel/arch/arm/boot/kernel-veyron.its
 	    };
 	};
        fdt@8{
+	    description = "rk3288-gus-rev1.dtb";
+	    data = /incbin/("dts/rk3288-gus-rev1.dtb");
+	    type = "flat_dt";
+	    arch = "arm";
+	    compression = "none";
+	    hash@1{
+		algo = "sha1";
+	    };
+	};
+        fdt@9{
+	    description = "rk3288-jaq-rev1.dtb";
+	    data = /incbin/("dts/rk3288-jaq-rev1.dtb");
+	    type = "flat_dt";
+	    arch = "arm";
+	    compression = "none";
+	    hash@1{
+		algo = "sha1";
+	    };
+	};
+        fdt@10{
+	    description = "rk3288-jerry-rev10.dtb";
+	    data = /incbin/("dts/rk3288-jerry-rev10.dtb");
+	    type = "flat_dt";
+	    arch = "arm";
+	    compression = "none";
+	    hash@1{
+		algo = "sha1";
+	    };
+	};
+        fdt@11{
+	    description = "rk3288-jerry-rev2.dtb";
+	    data = /incbin/("dts/rk3288-jerry-rev2.dtb");
+	    type = "flat_dt";
+	    arch = "arm";
+	    compression = "none";
+	    hash@1{
+		algo = "sha1";
+	    };
+	};
+        fdt@12{
 	    description = "rk3288-jerry-rev3.dtb";
 	    data = /incbin/("dts/rk3288-jerry-rev3.dtb");
 	    type = "flat_dt";
@@ -294,27 +337,7 @@ cat << __EOF__ > ${basedir}/root/usr/src/kernel/arch/arm/boot/kernel-veyron.its
 		algo = "sha1";
 	    };
 	};
-        fdt@9{
-	    description = "rk3288-speedy.dtb";
-	    data = /incbin/("dts/rk3288-speedy.dtb");
-	    type = "flat_dt";
-	    arch = "arm";
-	    compression = "none";
-	    hash@1{
-		algo = "sha1";
-	    };
-	};
-        fdt@10{
-	    description = "rk3288-evb-act8846.dtb";
-	    data = /incbin/("dts/rk3288-evb-act8846.dtb");
-	    type = "flat_dt";
-	    arch = "arm";
-	    compression = "none";
-	    hash@1{
-		algo = "sha1";
-	    };
-	};
-        fdt@11{
+        fdt@13{
 	    description = "rk3288-mickey-rev0.dtb";
 	    data = /incbin/("dts/rk3288-mickey-rev0.dtb");
 	    type = "flat_dt";
@@ -324,26 +347,6 @@ cat << __EOF__ > ${basedir}/root/usr/src/kernel/arch/arm/boot/kernel-veyron.its
 		algo = "sha1";
 	    };
 	};
-        fdt@12{
-	    description = "rk3288-speedy-rev1.dtb";
-	    data = /incbin/("dts/rk3288-speedy-rev1.dtb");
-	    type = "flat_dt";
-	    arch = "arm";
-	    compression = "none";
-	    hash@1{
-		algo = "sha1";
-	    };
-	};
-        fdt@13{
-	    description = "rk3288-evb-rk808.dtb";
-	    data = /incbin/("dts/rk3288-evb-rk808.dtb");
-	    type = "flat_dt";
-	    arch = "arm";
-	    compression = "none";
-	    hash@1{
-		algo = "sha1";
-	    };
-	};
        fdt@14{
 	    description = "rk3288-mighty-rev1.dtb";
 	    data = /incbin/("dts/rk3288-mighty-rev1.dtb");
@@ -355,26 +358,6 @@ cat << __EOF__ > ${basedir}/root/usr/src/kernel/arch/arm/boot/kernel-veyron.its
 	    };
 	};
        fdt@15{
-	    description = "rk3288-thea-rev0.dtb";
-	    data = /incbin/("dts/rk3288-thea-rev0.dtb");
-	    type = "flat_dt";
-	    arch = "arm";
-	    compression = "none";
-	    hash@1{
-		algo = "sha1";
-	    };
-	};
-        fdt@16{
-	    description = "rk3288-gus-rev1.dtb";
-	    data = /incbin/("dts/rk3288-gus-rev1.dtb");
-	    type = "flat_dt";
-	    arch = "arm";
-	    compression = "none";
-	    hash@1{
-		algo = "sha1";
-	    };
-	};
-        fdt@17{
 	    description = "rk3288-minnie-rev0.dtb";
 	    data = /incbin/("dts/rk3288-minnie-rev0.dtb");
 	    type = "flat_dt";
@@ -384,6 +367,66 @@ cat << __EOF__ > ${basedir}/root/usr/src/kernel/arch/arm/boot/kernel-veyron.its
 		algo = "sha1";
 	    };
 	};
+        fdt@16{
+	    description = "rk3288-nicky-rev0.dtb";
+	    data = /incbin/("dts/rk3288-nicky-rev0.dtb");
+	    type = "flat_dt";
+	    arch = "arm";
+	    compression = "none";
+	    hash@1{
+		algo = "sha1";
+	    };
+	};
+        fdt@17{
+	    description = "rk3288-rialto-rev0.dtb";
+	    data = /incbin/("dts/rk3288-rialto-rev0.dtb");
+	    type = "flat_dt";
+	    arch = "arm";
+	    compression = "none";
+	    hash@1{
+		algo = "sha1";
+	    };
+	};
+        fdt@18{
+            description = "rk3288-speedy.dtb";
+            data = /incbin/("dts/rk3288-speedy.dtb");
+            type = "flat_dt";
+            arch = "arm";
+            compression = "none";
+            hash@1{
+                algo = "sha1";
+            };
+        };
+        fdt@19{
+            description = "rk3288-speedy-rev1.dtb";
+            data = /incbin/("dts/rk3288-speedy-rev1.dtb");
+            type = "flat_dt";
+            arch = "arm";
+            compression = "none";
+            hash@1{
+                algo = "sha1";
+            };
+        };
+        fdt@20{
+            description = "rk3288-thea-rev0.dtb";
+            data = /incbin/("dts/rk3288-thea-rev0.dtb");
+            type = "flat_dt";
+            arch = "arm";
+            compression = "none";
+            hash@1{
+                algo = "sha1";
+            };
+        };
+        fdt@21{
+            description = "rk3288-tiger-rev0.dtb";
+            data = /incbin/("dts/rk3288-tiger-rev0.dtb");
+            type = "flat_dt";
+            arch = "arm";
+            compression = "none";
+            hash@1{
+                algo = "sha1";
+            };
+        };

    };
    configurations {
@@ -456,6 +499,22 @@ cat << __EOF__ > ${basedir}/root/usr/src/kernel/arch/arm/boot/kernel-veyron.its
 	    kernel = "kernel@1";
 	    fdt = "fdt@17";
 	};
+        conf@18{
+            kernel = "kernel@1";
+            fdt = "fdt@18";
+        };
+        conf@19{
+            kernel = "kernel@1";
+            fdt = "fdt@19";
+        };
+        conf@20{
+            kernel = "kernel@1";
+            fdt = "fdt@20";
+        };
+        conf@21{
+            kernel = "kernel@1";
+            fdt = "fdt@21";
+        };
    };
 };
 __EOF__
@@ -476,11 +535,25 @@ cp ${basedir}/../kernel-configs/chromebook-rockchip-3.14_wireless-3.8.config .co
 make WIFIVERSION="-3.8" modules_prepare
 cd ${basedir}

+# Fix up the symlink for building external modules
+# kernver is used so we don't need to keep track of what the current compiled
+# version is
+kernver=$(ls ${basedir}/root/lib/modules/)
+cd ${basedir}/root/lib/modules/$kernver
+rm build
+rm source
+ln -s /usr/src/kernel build
+ln -s /usr/src/kernel source
+cd ${basedir}
+
 # Bit of a hack to hide the emmc partitions from XFCE
 cat << EOF > ${basedir}/root/etc/udev/rules.d/99-hide-emmc-partitions.rules
 KERNEL=="mmcblk0*", ENV{UDISKS_IGNORE}="1"
 EOF

+# Disable uap0 and p2p0 interfaces in NetworkManager
+printf '\n[keyfile]\nunmanaged-devices=interface-name:p2p0\n' >> ${basedir}/root/etc/NetworkManager/NetworkManager.conf
+
 # Create these if they don't exist, to make sure we have proper audio with pulse
 mkdir -p ${basedir}/root/var/lib/alsa/
 cat << EOF > ${basedir}/root/var/lib/alsa/asound.state
@@ -2285,10 +2358,6 @@ EOF
 cp ${basedir}/../misc/zram ${basedir}/root/etc/init.d/zram
 chmod +x ${basedir}/root/etc/init.d/zram

-rm -rf ${basedir}/root/lib/firmware
-cd ${basedir}/root/lib
-git clone https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git firmware
-rm -rf ${basedir}/root/lib/firmware/.git
 # Copy the broadcom firmware files in (for now) - once sources are released,
 # will be able to do this without having a local copy.
 mkdir -p ${basedir}/root/lib/firmware/brcm/
@@ -2306,6 +2375,8 @@ cat << EOF > ${basedir}/root/etc/udev/rules.d/80-brcm-sdio-added.rules
 ACTION=="add", SUBSYSTEM=="sdio", ENV{SDIO_CLASS}=="02", ENV{SDIO_ID}=="02D0:4354", RUN+="/usr/sbin/brcm_patchram_plus -d --patchram /lib/firmware/brcm/BCM4354_003.001.012.0306.0659.hcd --no2bytes --enable_hci --enable_lpm --scopcm=1,2,0,1,1,0,0,0,0,0 --baudrate 3000000 --use_baudrate_for_download --tosleep=50000 /dev/ttyS0"
 EOF

+sed -i -e 's/^#PermitRootLogin.*/PermitRootLogin yes/' ${basedir}/root/etc/ssh/sshd_config
+
 # Unmount partitions
 umount $rootp

@@ -2323,16 +2394,16 @@ echo "Removing temporary build files"
 rm -rf ${basedir}/kernel ${basedir}/kernel.bin ${basedir}/root ${basedir}/kali-$architecture ${basedir}/patches ${basedir}/bootloader.bin

 # If you're building an image for yourself, comment all of this out, as you
-# don't need the sha1sum or to compress the image, since you will be testing it
+# don't need the sha256sum or to compress the image, since you will be testing it
 # soon.
-echo "Generating sha1sum for kali-$1-veyron.img"
-sha1sum kali-$1-veyron.img > ${basedir}/kali-$1-veyron.img.sha1sum
+echo "Generating sha256sum for kali-$1-veyron.img"
+sha256sum kali-$1-veyron.img > ${basedir}/kali-$1-veyron.img.sha256sum
 # Don't pixz on 32bit, there isn't enough memory to compress the images.
 MACHINE_TYPE=`uname -m`
 if [ ${MACHINE_TYPE} == 'x86_64' ]; then
 echo "Compressing kali-$1-veyron.img"
 pixz ${basedir}/kali-$1-veyron.img ${basedir}/kali-$1-veyron.img.xz
 rm ${basedir}/kali-$1-veyron.img
-echo "Generating sha1sum for kali-$1-veyron.img.xz"
-sha1sum kali-$1-veyron.img.xz > ${basedir}/kali-$1-veyron.img.xz.sha1sum
+echo "Generating sha256sum for kali-$1-veyron.img.xz"
+sha256sum kali-$1-veyron.img.xz > ${basedir}/kali-$1-veyron.img.xz.sha256sum
 fi
--- a/kernel-configs/chromebook-rockchip-3.14_wireless-3.8.config
+++ b/kernel-configs/chromebook-rockchip-3.14_wireless-3.8.config
@@ -215,6 +215,11 @@ CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
 CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
 CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
 CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
+CONFIG_ARCH_MMAP_RND_BITS=8
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
@@ -417,6 +422,12 @@ CONFIG_MULTI_IRQ_HANDLER=y
 # CONFIG_ARM_ERRATA_775420 is not set
 # CONFIG_ARM_ERRATA_798181 is not set
 # CONFIG_ARM_ERRATA_773022 is not set
+# CONFIG_ARM_ERRATA_818325_852422 is not set
+# CONFIG_ARM_ERRATA_821420 is not set
+# CONFIG_ARM_ERRATA_825619 is not set
+# CONFIG_ARM_ERRATA_FOOBAR is not set
+# CONFIG_ARM_ERRATA_852421 is not set
+# CONFIG_ARM_ERRATA_852423 is not set

 #
 # Bus support
@@ -576,7 +587,6 @@ CONFIG_NEON=y
 # Userspace binary formats
 #
 CONFIG_BINFMT_ELF=y
-CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
 # CONFIG_HAVE_AOUT is not set
@@ -697,7 +707,6 @@ CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
 # CONFIG_IPV6_MROUTE is not set
 # CONFIG_NETLABEL is not set
-# CONFIG_ANDROID_PARANOID_NETWORK is not set
 CONFIG_NET_ACTIVITY_STATS=y
 CONFIG_NETWORK_SECMARK=y
 CONFIG_NETWORK_PHY_TIMESTAMPING=y
@@ -1046,7 +1055,9 @@ CONFIG_BT_RFCOMM=m
 # CONFIG_BT_RFCOMM_TTY is not set
 # CONFIG_BT_BNEP is not set
 CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
 CONFIG_BT_LE=y
+CONFIG_BT_LEDS=y
 # CONFIG_BT_SELFTEST is not set
 CONFIG_BT_DEBUGFS=y

@@ -1055,8 +1066,10 @@ CONFIG_BT_DEBUGFS=y
 #
 CONFIG_BT_INTEL=m
 CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
 CONFIG_BT_HCIBTUSB=m
 CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_RTL=y
 CONFIG_BT_HCIBTSDIO=m
 CONFIG_BT_HCIUART=m
 CONFIG_BT_HCIUART_H4=y
@@ -1066,6 +1079,9 @@ CONFIG_BT_HCIUART_LL=y
 # CONFIG_BT_HCIUART_3WIRE is not set
 # CONFIG_BT_HCIUART_INTEL is not set
 # CONFIG_BT_HCIUART_BCM is not set
+# CONFIG_BT_HCIUART_QCA is not set
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIUART_MRVL=y
 # CONFIG_BT_HCIBCM203X is not set
 # CONFIG_BT_HCIBPA10X is not set
 CONFIG_BT_HCIBFUSB=m
@@ -1127,7 +1143,25 @@ CONFIG_RFKILL_LEDS=y
 # CONFIG_NET_9P is not set
 # CONFIG_CAIF is not set
 # CONFIG_CEPH_LIB is not set
-# CONFIG_NFC is not set
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+# CONFIG_NFC_NCI_SPI is not set
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_PN533=m
+# CONFIG_NFC_SIM is not set
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_PN544=m
+# CONFIG_NFC_PN544_I2C is not set
+CONFIG_NFC_MICROREAD=m
+# CONFIG_NFC_MICROREAD_I2C is not set
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
 CONFIG_HAVE_BPF_JIT=y

 #
@@ -2430,6 +2464,7 @@ CONFIG_DRM_ROCKCHIP=y
 CONFIG_ROCKCHIP_DW_HDMI=y
 CONFIG_ROCKCHIP_EDP=y
 CONFIG_DRM_UDL=y
+# CONFIG_DRM_EVDI is not set
 # CONFIG_DRM_ARMADA is not set
 # CONFIG_DRM_RCAR_DU is not set
 # CONFIG_DRM_SHMOBILE is not set
@@ -2447,24 +2482,21 @@ CONFIG_DRM_PANEL_SIMPLE=y
 # ARM GPU Configuration
 #
 CONFIG_MALI_MIDGARD=y
-CONFIG_MALI_TIMELINE_DISABLED=y
 # CONFIG_MALI_GATOR_SUPPORT is not set
-# CONFIG_MALI_MIPE_ENABLED is not set
 CONFIG_MALI_MIDGARD_DVFS=y
-# CONFIG_MALI_MIDGARD_RT_PM is not set
 # CONFIG_MALI_MIDGARD_ENABLE_TRACE is not set
-CONFIG_MALI_MIDGARD_DEBUG_SYS=y
 # CONFIG_MALI_DEVFREQ is not set
 CONFIG_MALI_EXPERT=y
+# CONFIG_MALI_PRFCNT_SET_SECONDARY is not set
 # CONFIG_MALI_DEBUG_SHADER_SPLIT_FS is not set
 CONFIG_MALI_PLATFORM_FAKE=y
+# CONFIG_MALI_PLATFORM_DEVICETREE is not set
 CONFIG_MALI_PLATFORM_THIRDPARTY=y
 CONFIG_MALI_PLATFORM_THIRDPARTY_NAME="rk"
 # CONFIG_MALI_DEBUG is not set
 # CONFIG_MALI_NO_MALI is not set
 # CONFIG_MALI_TRACE_TIMELINE is not set
 # CONFIG_MALI_SYSTEM_TRACE is not set
-# CONFIG_MALI_GPU_TRACEPOINTS is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_VIDEOMODE_HELPERS=y
@@ -3279,7 +3311,6 @@ CONFIG_CHROMEOS_VBC_EC=y
 # SOC (System On Chip) specific Drivers
 #
 # CONFIG_SOC_IMG is not set
-CONFIG_ROCKCHIP_USB_UART=y
 # CONFIG_TEGRA_124_DVFS is not set
 # CONFIG_EDP_MANAGEMENT is not set
 CONFIG_CLKDEV_LOOKUP=y
@@ -3523,8 +3554,10 @@ CONFIG_DCACHE_WORD_ACCESS=y
 # CONFIG_EXT3_FS is not set
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT23=y
-CONFIG_EXT4_FS_POSIX_ACL=y
+# CONFIG_EXT4_FS_POSIX_ACL is not set
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXT4_ENCRYPTION=y
+CONFIG_EXT4_FS_ENCRYPTION=y
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
@@ -3594,6 +3627,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_PROC_FS=y
 CONFIG_PROC_SYSCTL=y
 CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_KERNFS=y
 CONFIG_SYSFS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
@@ -3807,6 +3841,7 @@ CONFIG_HAVE_C_RECORDMCOUNT=y
 CONFIG_TRACE_CLOCK=y
 CONFIG_RING_BUFFER=y
 CONFIG_EVENT_TRACING=y
+CONFIG_GPU_TRACEPOINTS=y
 CONFIG_CONTEXT_SWITCH_TRACER=y
 CONFIG_TRACING=y
 CONFIG_GENERIC_TRACER=y
@@ -3872,9 +3907,10 @@ CONFIG_KEYS=y
 # CONFIG_PERSISTENT_KEYRINGS is not set
 # CONFIG_BIG_KEYS is not set
 # CONFIG_TRUSTED_KEYS is not set
-# CONFIG_ENCRYPTED_KEYS is not set
+CONFIG_ENCRYPTED_KEYS=y
 CONFIG_KEYS_DEBUG_PROC_KEYS=y
 # CONFIG_SECURITY_DMESG_RESTRICT is not set
+# CONFIG_SECURITY_PERF_EVENTS_RESTRICT is not set
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
 CONFIG_SECURITY_NETWORK=y
@@ -3886,6 +3922,7 @@ CONFIG_SECURITY_PATH=y
 CONFIG_SECURITY_YAMA=y
 CONFIG_SECURITY_YAMA_STACKED=y
 # CONFIG_SECURITY_CHROMIUMOS is not set
+# CONFIG_SECURITY_CHROMIUMOS_DEVICE_JAIL is not set
 # CONFIG_IMA is not set
 # CONFIG_EVM is not set
 # CONFIG_DEFAULT_SECURITY_YAMA is not set
@@ -3907,14 +3944,14 @@ CONFIG_CRYPTO_BLKCIPHER=y
 CONFIG_CRYPTO_BLKCIPHER2=y
 CONFIG_CRYPTO_HASH=y
 CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
+CONFIG_CRYPTO_RNG=y
 CONFIG_CRYPTO_RNG2=y
 CONFIG_CRYPTO_PCOMP2=y
 CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_USER is not set
 CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
-# CONFIG_CRYPTO_GF128MUL is not set
+CONFIG_CRYPTO_GF128MUL=y
 # CONFIG_CRYPTO_NULL is not set
 # CONFIG_CRYPTO_PCRYPT is not set
 CONFIG_CRYPTO_WORKQUEUE=y
@@ -3927,18 +3964,18 @@ CONFIG_CRYPTO_AUTHENC=y
 #
 CONFIG_CRYPTO_CCM=m
 # CONFIG_CRYPTO_GCM is not set
-CONFIG_CRYPTO_SEQIV=m
+CONFIG_CRYPTO_SEQIV=y

 #
 # Block modes
 #
 CONFIG_CRYPTO_CBC=y
-CONFIG_CRYPTO_CTR=m
-# CONFIG_CRYPTO_CTS is not set
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTS=y
 CONFIG_CRYPTO_ECB=y
 # CONFIG_CRYPTO_LRW is not set
 # CONFIG_CRYPTO_PCBC is not set
-# CONFIG_CRYPTO_XTS is not set
+CONFIG_CRYPTO_XTS=y

 #
 # Hash modes
--- a/patches/0002-mwifiex-do-not-create-AP-and-P2P-interfaces-upon-dri.patch
+++ b/patches/0002-mwifiex-do-not-create-AP-and-P2P-interfaces-upon-dri.patch
@@ -1,7 +1,7 @@
-From d24fdf29978108413eb405302255139fdbb94a16 Mon Sep 17 00:00:00 2001
+From 4cc0eec56f57f137ac6ae3b91dbafa5541811644 Mon Sep 17 00:00:00 2001
 From: Bing Zhao <bzhao@marvell.com>
 Date: Mon, 19 Aug 2013 16:10:21 -0700
-Subject: [PATCH 2/2] mwifiex: do not create AP and P2P interfaces upon driver
+Subject: [PATCH 2/4] mwifiex: do not create AP and P2P interfaces upon driver
 loading

 Bug 60747 - 1286:2044 [Microsoft Surface Pro]
@@ -31,33 +31,36 @@ other applications manually when they are needed.
 Signed-off-by: Bing Zhao <bzhao@marvell.com>
 Signed-off-by: Avinash Patil <patila@marvell.com>
 ---
- drivers/net/wireless-3.8/mwifiex/main.c | 13 -------------
- 1 file changed, 13 deletions(-)
+ drivers/net/wireless-3.8/mwifiex/main.c | 16 ----------------
+ 1 file changed, 16 deletions(-)

 diff --git a/drivers/net/wireless-3.8/mwifiex/main.c b/drivers/net/wireless-3.8/mwifiex/main.c
-index b3f9247..a503264 100644
+index e43afc127119..587f4ae4818d 100644
 --- a/drivers/net/wireless-3.8/mwifiex/main.c
 +++ b/drivers/net/wireless-3.8/mwifiex/main.c
-@@ -515,19 +515,6 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context)
+@@ -523,22 +523,6 @@ static void mwifiex_fw_dpc(const struct firmware *firmware, void *context)
+ 			    "cannot create default STA interface\n");
 		goto err_add_intf;
 	}
- 
+-
 -	/* Create AP interface by default */
 -	if (!mwifiex_add_virtual_intf(adapter->wiphy, "uap%d",
 -				      NL80211_IFTYPE_AP, NULL, NULL)) {
-		dev_err(adapter->dev, "cannot create default AP interface\n");
+-		mwifiex_dbg(adapter, ERROR,
+-			    "cannot create default AP interface\n");
 -		goto err_add_intf;
 -	}
 -
 -	/* Create P2P interface by default */
 -	if (!mwifiex_add_virtual_intf(adapter->wiphy, "p2p%d",
 -				      NL80211_IFTYPE_P2P_CLIENT, NULL, NULL)) {
-		dev_err(adapter->dev, "cannot create default P2P interface\n");
+-		mwifiex_dbg(adapter, ERROR,
+-			    "cannot create default P2P interface\n");
 -		goto err_add_intf;
 -	}
 	rtnl_unlock();
 
 	mwifiex_drv_get_driver_version(adapter, fmt, sizeof(fmt) - 1);
 -- 
-2.4.4
+2.11.0

--- a/patches/0004-fix-brcmfmac-oops-and-race-condition.patch
+++ b/patches/0004-fix-brcmfmac-oops-and-race-condition.patch
@@ -1,4 +1,4 @@
-From 6dc781566c97f06b5c0d491f34c9b23e72cb74be Mon Sep 17 00:00:00 2001
+From e9d25d3d9e86de0ff89e9d9f9d32f97205e2afab Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Thu, 2 Jul 2015 17:48:41 -0600
 Subject: [PATCH 4/4] fix brcmfmac oops and race condition
@@ -15,11 +15,10 @@ hack.
 Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 ---
 .../wireless-3.8/brcm80211/brcmfmac/dhd_common.c   | 47 ++++++++++++++--------
- .../wireless-3.8/brcm80211/brcmfmac/dhd_linux.c    |  4 +-
- 2 files changed, 32 insertions(+), 19 deletions(-)
+ 1 file changed, 30 insertions(+), 17 deletions(-)

 diff --git a/drivers/net/wireless-3.8/brcm80211/brcmfmac/dhd_common.c b/drivers/net/wireless-3.8/brcm80211/brcmfmac/dhd_common.c
-index 05d4042..7006d19 100644
+index 05d40426b85b..7006d19fb8d1 100644
 --- a/drivers/net/wireless-3.8/brcm80211/brcmfmac/dhd_common.c
 +++ b/drivers/net/wireless-3.8/brcm80211/brcmfmac/dhd_common.c
@@ -252,25 +252,34 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
@@ -89,26 +88,6 @@ index 05d4042..7006d19 100644
 	}
 
 	/*
-diff --git a/drivers/net/wireless-3.8/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless-3.8/brcm80211/brcmfmac/dhd_linux.c
-index 128161c..d3db8f7 100644
--- a/drivers/net/wireless-3.8/brcm80211/brcmfmac/dhd_linux.c
-+++ b/drivers/net/wireless-3.8/brcm80211/brcmfmac/dhd_linux.c
-@@ -974,13 +974,13 @@ fail:
- 			brcmf_fws_deinit(drvr);
- 		}
- 		if (drvr->iflist[0]) {
-			if (ifp->ndev->destructor == NULL)
-+			if (ifp->ndev->destructor == NULL && ifp->vif)
- 				brcmf_free_vif(ifp->vif);
- 			free_netdev(ifp->ndev);
- 			drvr->iflist[0] = NULL;
- 		}
- 		if (p2p_ifp) {
-			if (p2p_ifp->ndev->destructor == NULL)
-+			if (p2p_ifp->ndev->destructor == NULL && p2p_ifp->vif)
- 				brcmf_free_vif(p2p_ifp->vif);
- 			free_netdev(p2p_ifp->ndev);
- 			drvr->iflist[1] = NULL;
 -- 
-2.4.4
+2.11.0