diff --git a/board/odroidc1/kernel.config b/board/odroidc1/kernel.config
index 65c64c05bf..1fdeb060b1 100644
--- a/board/odroidc1/kernel.config
+++ b/board/odroidc1/kernel.config
@@ -139,7 +139,7 @@ CONFIG_PERF_USE_VMALLOC=y
 #
 # CONFIG_PERF_EVENTS is not set
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG is not set
 CONFIG_COMPAT_BRK=y
 # CONFIG_SLAB is not set
 CONFIG_SLUB=y
@@ -176,7 +176,6 @@ CONFIG_OLD_SIGACTION=y
 # GCOV-based kernel profiling
 #
 CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
 CONFIG_RT_MUTEXES=y
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
@@ -286,7 +285,6 @@ CONFIG_MESON_LEGACY_REGISTER_API=y
 CONFIG_CLKTREE_DEBUG=y
 # CONFIG_MESON_CPU_TEMP_SENSOR is not set
 # CONFIG_MESON_TRUSTZONE is not set
-CONFIG_MESON_GIC_FIQ=y
 # CONFIG_MESON_CUSTOM_BOARD_SUPPORT is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_PLAT_SPEAR is not set
@@ -1060,7 +1058,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y
 # CONFIG_CMA_SIZE_SEL_MIN is not set
 # CONFIG_CMA_SIZE_SEL_MAX is not set
 CONFIG_CMA_ALIGNMENT=8
-CONFIG_CMA_AREAS=7
+CONFIG_CMA_AREAS=16
 
 #
 # Bus devices
@@ -2906,7 +2904,6 @@ CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_TIMER_STATS is not set
 # CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
 # CONFIG_SLUB_STATS is not set
 CONFIG_HAVE_DEBUG_KMEMLEAK=y
 # CONFIG_DEBUG_KMEMLEAK is not set
@@ -3290,6 +3287,6 @@ CONFIG_BACKPORT_USB_NET_QMI_WWAN=m
 #
 CONFIG_BACKPORT_USB_WDM=m
 CONFIG_RTL8192CU=m
-# CONFIG_RTL8812AU is not set
+CONFIG_RTL8812AU=m
 CONFIG_RTL8188EU=m
 CONFIG_RTL8192DU=m
diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig
index f93d2174f9..36ed305cf3 100644
--- a/configs/raspberrypi2_defconfig
+++ b/configs/raspberrypi2_defconfig
@@ -25,7 +25,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi2/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/3782f2ad42c08f4d32f64138f8be7341afc380f5.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/bc1669c846b629cface0aaa367afb2b9c6226faf.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/raspberrypi2/kernel.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig
index c8c98f17a8..956b924cc4 100644
--- a/configs/raspberrypi_defconfig
+++ b/configs/raspberrypi_defconfig
@@ -24,7 +24,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi/overlay"
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/3782f2ad42c08f4d32f64138f8be7341afc380f5.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/bc1669c846b629cface0aaa367afb2b9c6226faf.tar.gz"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/raspberrypi/kernel.config"
 BR2_LINUX_KERNEL_ZIMAGE=y
diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk
index 8a8a2e63d2..ab7a94b1ff 100644
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-RPI_FIRMWARE_VERSION = af9b357c25c690c80b16ae75b3f8ac8dea20cd88
+RPI_FIRMWARE_VERSION = 2a329e0c7d8ea19c085bac5633aa4fccee0f21be
 RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
 RPI_FIRMWARE_LICENSE = BSD-3c
 RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom