Merge pull request #3376 from MilhouseVH/linux5.1.0

linux (RPi/Generic): update to linux-5.1
2025-07-24 11:16:51 +00:00 · 2019-05-12 21:21:47 +02:00 · 2019-05-12 21:21:47 +02:00 · 7e4975e93e
commit 7e4975e93e
parent bf6f4959bc 9012226b40
20 changed files with 324 additions and 1194 deletions
--- a/packages/devel/binutils/package.mk
+++ b/packages/devel/binutils/package.mk
@ -66,10 +66,12 @@ make_target() {
  make configure-host
  make -C libiberty
  make -C bfd
+  make -C opcodes
 }

 makeinstall_target() {
  mkdir -p $SYSROOT_PREFIX/usr/lib
    cp libiberty/libiberty.a $SYSROOT_PREFIX/usr/lib
  make DESTDIR="$SYSROOT_PREFIX" -C bfd install
+  make DESTDIR="$SYSROOT_PREFIX" -C opcodes install
 }
--- a/packages/linux-drivers/RTL8192CU/package.mk
+++ b/packages/linux-drivers/RTL8192CU/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="RTL8192CU"
-PKG_VERSION="d7c7e6aa73fc457cfc5e5272878d111c657ce6dc"
-PKG_SHA256="3b7a4b198913fa45958c7309e0358c34628d791038a473f6d4e95bcf70b7d56f"
+PKG_VERSION="f32ef3984db7c7f7644edec0fa28a63a47b1a7d6"
+PKG_SHA256="7e8df7cce0918630121c7493a6333d392b3099b1126e8c355aa221cee032c80b"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/pvaret/rtl8192cu-fixes"
 PKG_URL="$PKG_SITE/archive/$PKG_VERSION.tar.gz"
--- a/packages/linux-drivers/RTL8192DU/package.mk
+++ b/packages/linux-drivers/RTL8192DU/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="RTL8192DU"
-PKG_VERSION="3105cd3179d5e60a7aa675611a3592a45b29bfcb"
-PKG_SHA256="0a19e86192418d4179def917a9cea3aa0f2f2da7c44a520c085b9d78d9d2c09e"
+PKG_VERSION="72b53f8a6c2a6696d60791df4455c3073fffc4e4"
+PKG_SHA256="dec3cc45601c2c6dab47816523cb5a5731393d34cc75ec0f96a91191d3563fdd"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/lwfinger/rtl8192du"
 PKG_URL="https://github.com/lwfinger/rtl8192du/archive/$PKG_VERSION.tar.gz"
--- a/packages/linux-drivers/RTL8192EU/package.mk
+++ b/packages/linux-drivers/RTL8192EU/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="RTL8192EU"
-PKG_VERSION="b63646fb61fec4895f0fd4aec1a0cb0e8873eaeb"
-PKG_SHA256="7e24457f371121e1f587ec759b3338bc9b63bd03632840a11076791155c0c93f"
+PKG_VERSION="0a7199b457b25edc4d9534158a068e486b1c8bb0"
+PKG_SHA256="defee6fda236bc9d77cd5cf0ceca8e86f820a1f9fa5d63c5ca7c369be1a3513e"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/Mange/rtl8192eu-linux-driver"
 PKG_URL="https://github.com/Mange/rtl8192eu-linux-driver/archive/$PKG_VERSION.tar.gz"
--- a/packages/linux-drivers/RTL8812AU/package.mk
+++ b/packages/linux-drivers/RTL8812AU/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="RTL8812AU"
-PKG_VERSION="7c257daf52d0aac298c13135bd3ff5f388edc72b"
-PKG_SHA256="88eaed2f0b394a36f806f02bd245e7bd181e2aaafc2b7ff4521f4adb2fa6dc29"
+PKG_VERSION="bdfef37665b34be7a84835fba97e44447b30f98c"
+PKG_SHA256="44ccdeb90da2e750330108e71e6986e1a9000ba2e6b5709460a271d570a75769"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/MilhouseVH/RTL8812AU"
 PKG_URL="https://github.com/MilhouseVH/RTL8812AU/archive/$PKG_VERSION.tar.gz"
--- a/packages/linux-drivers/bcm_sta/patches/bcm_sta-0200-kernel-5.1-rc1-fix.patch
+++ b/packages/linux-drivers/bcm_sta/patches/bcm_sta-0200-kernel-5.1-rc1-fix.patch
@ -0,0 +1,68 @@
+From aa1fc45ace58d802d038857b6fed8af9d771fbcc Mon Sep 17 00:00:00 2001
+From: MilhouseVH <milhouseVH.github@nmacleod.com>
+Date: Mon, 18 Mar 2019 16:29:45 +0000
+Subject: [PATCH] get rid of legacy 'get_ds()' function
+
+https://github.com/torvalds/linux/commit/736706bee3298208343a76096370e4f6a5c55915
+---
+ x86-32/src/wl/sys/wl_cfg80211_hybrid.c | 2 +-
+ x86-32/src/wl/sys/wl_iw.c              | 2 +-
+ x86-64/src/wl/sys/wl_cfg80211_hybrid.c | 2 +-
+ x86-64/src/wl/sys/wl_iw.c              | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/x86-32/src/wl/sys/wl_cfg80211_hybrid.c b/x86-32/src/wl/sys/wl_cfg80211_hybrid.c
+index 7b606e0..51c81bc 100644
+--- a/x86-32/src/wl/sys/wl_cfg80211_hybrid.c
+++ b/x86-32/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -450,7 +450,7 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
+ 	ifr.ifr_data = (caddr_t)&ioc;
+ 
+ 	fs = get_fs();
+-	set_fs(get_ds());
+	set_fs(KERNEL_DS);
+ #if defined(WL_USE_NETDEV_OPS)
+ 	err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+ #else
+diff --git a/x86-32/src/wl/sys/wl_iw.c b/x86-32/src/wl/sys/wl_iw.c
+index c4c610b..9c3c74e 100644
+--- a/x86-32/src/wl/sys/wl_iw.c
+++ b/x86-32/src/wl/sys/wl_iw.c
+@@ -117,7 +117,7 @@ dev_wlc_ioctl(
+ 	ifr.ifr_data = (caddr_t) &ioc;
+ 
+ 	fs = get_fs();
+-	set_fs(get_ds());
+	set_fs(KERNEL_DS);
+ #if defined(WL_USE_NETDEV_OPS)
+ 	ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+ #else
+diff --git a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
+index 7b606e0..51c81bc 100644
+--- a/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
+++ b/x86-64/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -450,7 +450,7 @@ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
+ 	ifr.ifr_data = (caddr_t)&ioc;
+ 
+ 	fs = get_fs();
+-	set_fs(get_ds());
+	set_fs(KERNEL_DS);
+ #if defined(WL_USE_NETDEV_OPS)
+ 	err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+ #else
+diff --git a/x86-64/src/wl/sys/wl_iw.c b/x86-64/src/wl/sys/wl_iw.c
+index c4c610b..9c3c74e 100644
+--- a/x86-64/src/wl/sys/wl_iw.c
+++ b/x86-64/src/wl/sys/wl_iw.c
+@@ -117,7 +117,7 @@ dev_wlc_ioctl(
+ 	ifr.ifr_data = (caddr_t) &ioc;
+ 
+ 	fs = get_fs();
+-	set_fs(get_ds());
+	set_fs(KERNEL_DS);
+ #if defined(WL_USE_NETDEV_OPS)
+ 	ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+ #else
+-- 
+2.14.1
+
--- a/packages/linux-firmware/iwlwifi-firmware/package.mk
+++ b/packages/linux-firmware/iwlwifi-firmware/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="iwlwifi-firmware"
-PKG_VERSION="7b698fbf706a4294fbb148bef57d42cb729c147b"
-PKG_SHA256="c0da6400d4a7d06a41fc8d3130da7e23f13c7fab1aeae13d6dbbc7b06ae44cf7"
+PKG_VERSION="caaa6ccba6ebfa06b40d58e94b808202a735520c"
+PKG_SHA256="a9846956d89557e2608df467a8c6911e26dbbd09cadf4d307d52e930fc323cd2"
 PKG_LICENSE="Free-to-use"
 PKG_SITE="https://github.com/LibreELEC/iwlwifi-firmware"
 PKG_URL="https://github.com/LibreELEC/iwlwifi-firmware/archive/$PKG_VERSION.tar.gz"
--- a/packages/linux/package.mk
+++ b/packages/linux/package.mk
@ -23,14 +23,14 @@ case "$LINUX" in
    PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
    ;;
  raspberrypi)
-    PKG_VERSION="403bf7d1affd074c18f45bced1fef2896cc47989" # 5.0.13
-    PKG_SHA256="54fefc1152f142b7114f7cc2a6ea87686af999fe448d087ba800d7c2dd2ab619"
+    PKG_VERSION="b988f83d9cfc5ca11033b6509103b42dcda1bb7a" # 5.1
+    PKG_SHA256="c049323f7830fd525eff55a90d057416b8b6ff5bb82724ef9fcb10b9dc6cc90f"
    PKG_URL="https://github.com/raspberrypi/linux/archive/$PKG_VERSION.tar.gz"
    PKG_SOURCE_NAME="linux-$LINUX-$PKG_VERSION.tar.gz"
    ;;
  *)
-    PKG_VERSION="5.0.13"
-    PKG_SHA256="bcfd52bf1faa24f5f712146a873959461e001656ad67717e80b947aa6ad53479"
+    PKG_VERSION="5.1"
+    PKG_SHA256="d06a7be6e73f97d1350677ad3bae0ce7daecb79c2c2902aaabe806f7fa94f041"
    PKG_URL="https://www.kernel.org/pub/linux/kernel/v5.x/$PKG_NAME-$PKG_VERSION.tar.xz"
    PKG_PATCH_DIRS="default"
    ;;
--- a/packages/linux/patches/default/linux-902-extend-rc6-toggle-support-for-zotac.patch
+++ b/packages/linux/patches/default/linux-902-extend-rc6-toggle-support-for-zotac.patch
@ -1,41 +0,0 @@
-From ae1ccaa3587c0bd3d6d01841fa2e668cdf738f1e Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <hias@horus.com>
-Date: Sun, 3 Feb 2019 14:24:00 +0100
-Subject: [PATCH] media: rc: ir-rc6-decoder: enable toggle bit for Zotac
- remotes
-
-The Zotac RC2604323/01G and RC2604329/02BG remotes use the 32-bit
-rc6 protocol and toggle bit 15 (0x8000) on repeated button presses,
-like MCE remotes.
-
-Add the customer code 0x80340000 to the 32-bit rc6 toggle
-handling code to get proper scancodes and toggle reports.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
---
- drivers/media/rc/ir-rc6-decoder.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c
-index d96aed1343e4..5cc302fa4daa 100644
--- a/drivers/media/rc/ir-rc6-decoder.c
-+++ b/drivers/media/rc/ir-rc6-decoder.c
-@@ -40,6 +40,7 @@
- #define RC6_6A_MCE_TOGGLE_MASK	0x8000	/* for the body bits */
- #define RC6_6A_LCC_MASK		0xffff0000 /* RC6-6A-32 long customer code mask */
- #define RC6_6A_MCE_CC		0x800f0000 /* MCE customer code */
-+#define RC6_6A_ZOTAC_CC		0x80340000 /* Zotac customer code */
- #define RC6_6A_KATHREIN_CC	0x80460000 /* Kathrein RCU-676 customer code */
- #ifndef CHAR_BIT
- #define CHAR_BIT 8	/* Normally in <limits.h> */
-@@ -246,6 +247,7 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
- 				switch (scancode & RC6_6A_LCC_MASK) {
- 				case RC6_6A_MCE_CC:
- 				case RC6_6A_KATHREIN_CC:
-+				case RC6_6A_ZOTAC_CC:
- 					protocol = RC_PROTO_RC6_MCE;
- 					toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK);
- 					scancode &= ~RC6_6A_MCE_TOGGLE_MASK;
-- 
-2.20.1
-
--- a/packages/linux/patches/default/linux-903-backport-rcmm-ir-decoder.patch
+++ b/packages/linux/patches/default/linux-903-backport-rcmm-ir-decoder.patch
@ -1,506 +0,0 @@
-From da8a71104dda4a85a9d9546ff462542347f8efa6 Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <hias@horus.com>
-Date: Wed, 20 Mar 2019 09:11:53 +0100
-Subject: [PATCH] media: rc: rcmm decoder and encoder
-
-commit 721074b03411327e7bf41555d4cc7c18f49313f7 upstream.
-
-media: add support for RCMM infrared remote controls.
-
-Signed-off-by: Patrick Lerda <patrick9876@free.fr>
-Signed-off-by: Sean Young <sean@mess.org>
-Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-Signed-off-by: Matthias Reichl <hias@horus.com>
---
- Documentation/media/lirc.h.rst.exceptions |   3 +
- MAINTAINERS                               |   5 +
- drivers/media/rc/Kconfig                  |  13 ++
- drivers/media/rc/Makefile                 |   1 +
- drivers/media/rc/ir-rcmm-decoder.c        | 254 ++++++++++++++++++++++
- drivers/media/rc/rc-core-priv.h           |   5 +
- drivers/media/rc/rc-main.c                |   9 +
- include/media/rc-map.h                    |  14 +-
- include/uapi/linux/lirc.h                 |   6 +
- tools/include/uapi/linux/lirc.h           |  12 +
- 10 files changed, 319 insertions(+), 3 deletions(-)
- create mode 100644 drivers/media/rc/ir-rcmm-decoder.c
-
-diff --git a/Documentation/media/lirc.h.rst.exceptions b/Documentation/media/lirc.h.rst.exceptions
-index 984b61dc3f2e..e7a41d4b3d46 100644
--- a/Documentation/media/lirc.h.rst.exceptions
-+++ b/Documentation/media/lirc.h.rst.exceptions
-@@ -58,6 +58,9 @@ ignore symbol RC_PROTO_SHARP
- ignore symbol RC_PROTO_XMP
- ignore symbol RC_PROTO_CEC
- ignore symbol RC_PROTO_IMON
-+ignore symbol RC_PROTO_RCMM12
-+ignore symbol RC_PROTO_RCMM24
-+ignore symbol RC_PROTO_RCMM32
- 
- # Undocumented macros
- 
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 9e9b19ecf6f7..57b60dd42729 100644
--- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -15837,6 +15837,11 @@ M:	David Härdeman <david@hardeman.nu>
- S:	Maintained
- F:	drivers/media/rc/winbond-cir.c
- 
-+RCMM REMOTE CONTROLS DECODER
-+M:	Patrick Lerda <patrick9876@free.fr>
-+S:	Maintained
-+F:	drivers/media/rc/ir-rcmm-decoder.c
-+
- WINSYSTEMS EBC-C384 WATCHDOG DRIVER
- M:	William Breathitt Gray <vilhelm.gray@gmail.com>
- L:	linux-watchdog@vger.kernel.org
-diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
-index 1021c08a9ba4..8164a889011a 100644
--- a/drivers/media/rc/Kconfig
-+++ b/drivers/media/rc/Kconfig
-@@ -133,6 +133,19 @@ config IR_IMON_DECODER
- 	   remote control and you would like to use it with a raw IR
- 	   receiver, or if you wish to use an encoder to transmit this IR.
- 
-+config IR_RCMM_DECODER
-+	tristate "Enable IR raw decoder for the RC-MM protocol"
-+	depends on RC_CORE
-+	help
-+	   Enable this option when you have IR with RC-MM protocol, and
-+	   you need the software decoder. The driver supports 12,
-+	   24 and 32 bits RC-MM variants. You can enable or disable the
-+	   different modes using the following RC protocol keywords:
-+	   'rc-mm-12', 'rc-mm-24' and 'rc-mm-32'.
-+
-+	   To compile this driver as a module, choose M here: the module
-+	   will be called ir-rcmm-decoder.
-+
- endif #RC_DECODERS
- 
- menuconfig RC_DEVICES
-diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
-index e0340d043fe8..fc4058013234 100644
--- a/drivers/media/rc/Makefile
-+++ b/drivers/media/rc/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_IR_SHARP_DECODER) += ir-sharp-decoder.o
- obj-$(CONFIG_IR_MCE_KBD_DECODER) += ir-mce_kbd-decoder.o
- obj-$(CONFIG_IR_XMP_DECODER) += ir-xmp-decoder.o
- obj-$(CONFIG_IR_IMON_DECODER) += ir-imon-decoder.o
-+obj-$(CONFIG_IR_RCMM_DECODER) += ir-rcmm-decoder.o
- 
- # stand-alone IR receivers/transmitters
- obj-$(CONFIG_RC_ATI_REMOTE) += ati_remote.o
-diff --git a/drivers/media/rc/ir-rcmm-decoder.c b/drivers/media/rc/ir-rcmm-decoder.c
-new file mode 100644
-index 000000000000..f1096ac1e5c5
--- /dev/null
-+++ b/drivers/media/rc/ir-rcmm-decoder.c
-@@ -0,0 +1,254 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+// ir-rcmm-decoder.c - A decoder for the RCMM IR protocol
-+//
-+// Copyright (C) 2018 by Patrick Lerda <patrick9876@free.fr>
-+
-+#include "rc-core-priv.h"
-+#include <linux/module.h>
-+#include <linux/version.h>
-+
-+#define RCMM_UNIT		166667	/* nanosecs */
-+#define RCMM_PREFIX_PULSE	416666  /* 166666.666666666*2.5 */
-+#define RCMM_PULSE_0            277777  /* 166666.666666666*(1+2/3) */
-+#define RCMM_PULSE_1            444444  /* 166666.666666666*(2+2/3) */
-+#define RCMM_PULSE_2            611111  /* 166666.666666666*(3+2/3) */
-+#define RCMM_PULSE_3            777778  /* 166666.666666666*(4+2/3) */
-+
-+enum rcmm_state {
-+	STATE_INACTIVE,
-+	STATE_LOW,
-+	STATE_BUMP,
-+	STATE_VALUE,
-+	STATE_FINISHED,
-+};
-+
-+static bool rcmm_mode(const struct rcmm_dec *data)
-+{
-+	return !((0x000c0000 & data->bits) == 0x000c0000);
-+}
-+
-+static int rcmm_miscmode(struct rc_dev *dev, struct rcmm_dec *data)
-+{
-+	switch (data->count) {
-+	case 24:
-+		if (dev->enabled_protocols & RC_PROTO_BIT_RCMM24) {
-+			rc_keydown(dev, RC_PROTO_RCMM24, data->bits, 0);
-+			data->state = STATE_INACTIVE;
-+			return 0;
-+		}
-+		return -1;
-+
-+	case 12:
-+		if (dev->enabled_protocols & RC_PROTO_BIT_RCMM12) {
-+			rc_keydown(dev, RC_PROTO_RCMM12, data->bits, 0);
-+			data->state = STATE_INACTIVE;
-+			return 0;
-+		}
-+		return -1;
-+	}
-+
-+	return -1;
-+}
-+
-+/**
-+ * ir_rcmm_decode() - Decode one RCMM pulse or space
-+ * @dev:	the struct rc_dev descriptor of the device
-+ * @ev:		the struct ir_raw_event descriptor of the pulse/space
-+ *
-+ * This function returns -EINVAL if the pulse violates the state machine
-+ */
-+static int ir_rcmm_decode(struct rc_dev *dev, struct ir_raw_event ev)
-+{
-+	struct rcmm_dec *data = &dev->raw->rcmm;
-+	u32 scancode;
-+	u8 toggle;
-+	int value;
-+
-+	if (!(dev->enabled_protocols & (RC_PROTO_BIT_RCMM32 |
-+							RC_PROTO_BIT_RCMM24 |
-+							RC_PROTO_BIT_RCMM12)))
-+		return 0;
-+
-+	if (!is_timing_event(ev)) {
-+		if (ev.reset)
-+			data->state = STATE_INACTIVE;
-+		return 0;
-+	}
-+
-+	switch (data->state) {
-+	case STATE_INACTIVE:
-+		if (!ev.pulse)
-+			break;
-+
-+		if (!eq_margin(ev.duration, RCMM_PREFIX_PULSE, RCMM_UNIT / 2))
-+			break;
-+
-+		data->state = STATE_LOW;
-+		data->count = 0;
-+		data->bits  = 0;
-+		return 0;
-+
-+	case STATE_LOW:
-+		if (ev.pulse)
-+			break;
-+
-+		if (!eq_margin(ev.duration, RCMM_PULSE_0, RCMM_UNIT / 2))
-+			break;
-+
-+		data->state = STATE_BUMP;
-+		return 0;
-+
-+	case STATE_BUMP:
-+		if (!ev.pulse)
-+			break;
-+
-+		if (!eq_margin(ev.duration, RCMM_UNIT, RCMM_UNIT / 2))
-+			break;
-+
-+		data->state = STATE_VALUE;
-+		return 0;
-+
-+	case STATE_VALUE:
-+		if (ev.pulse)
-+			break;
-+
-+		if (eq_margin(ev.duration, RCMM_PULSE_0, RCMM_UNIT / 2))
-+			value = 0;
-+		else if (eq_margin(ev.duration, RCMM_PULSE_1, RCMM_UNIT / 2))
-+			value = 1;
-+		else if (eq_margin(ev.duration, RCMM_PULSE_2, RCMM_UNIT / 2))
-+			value = 2;
-+		else if (eq_margin(ev.duration, RCMM_PULSE_3, RCMM_UNIT / 2))
-+			value = 3;
-+		else
-+			value = -1;
-+
-+		if (value == -1) {
-+			if (!rcmm_miscmode(dev, data))
-+				return 0;
-+			break;
-+		}
-+
-+		data->bits <<= 2;
-+		data->bits |= value;
-+
-+		data->count += 2;
-+
-+		if (data->count < 32)
-+			data->state = STATE_BUMP;
-+		else
-+			data->state = STATE_FINISHED;
-+
-+		return 0;
-+
-+	case STATE_FINISHED:
-+		if (!ev.pulse)
-+			break;
-+
-+		if (!eq_margin(ev.duration, RCMM_UNIT, RCMM_UNIT / 2))
-+			break;
-+
-+		if (rcmm_mode(data)) {
-+			toggle = !!(0x8000 & data->bits);
-+			scancode = data->bits & ~0x8000;
-+		} else {
-+			toggle = 0;
-+			scancode = data->bits;
-+		}
-+
-+		if (dev->enabled_protocols & RC_PROTO_BIT_RCMM32) {
-+			rc_keydown(dev, RC_PROTO_RCMM32, scancode, toggle);
-+			data->state = STATE_INACTIVE;
-+			return 0;
-+		}
-+
-+		break;
-+	}
-+
-+	data->state = STATE_INACTIVE;
-+	return -EINVAL;
-+}
-+
-+static const int rcmmspace[] = {
-+	RCMM_PULSE_0,
-+	RCMM_PULSE_1,
-+	RCMM_PULSE_2,
-+	RCMM_PULSE_3,
-+};
-+
-+static int ir_rcmm_rawencoder(struct ir_raw_event **ev, unsigned int max,
-+			      unsigned int n, u32 data)
-+{
-+	int i;
-+	int ret;
-+
-+	ret = ir_raw_gen_pulse_space(ev, &max, RCMM_PREFIX_PULSE, RCMM_PULSE_0);
-+	if (ret)
-+		return ret;
-+
-+	for (i = n - 2; i >= 0; i -= 2) {
-+		const unsigned int space = rcmmspace[(data >> i) & 3];
-+
-+		ret = ir_raw_gen_pulse_space(ev, &max, RCMM_UNIT, space);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	return ir_raw_gen_pulse_space(ev, &max, RCMM_UNIT, RCMM_PULSE_3 * 2);
-+}
-+
-+static int ir_rcmm_encode(enum rc_proto protocol, u32 scancode,
-+			  struct ir_raw_event *events, unsigned int max)
-+{
-+	struct ir_raw_event *e = events;
-+	int ret;
-+
-+	switch (protocol) {
-+	case RC_PROTO_RCMM32:
-+		ret = ir_rcmm_rawencoder(&e, max, 32, scancode);
-+		break;
-+	case RC_PROTO_RCMM24:
-+		ret = ir_rcmm_rawencoder(&e, max, 24, scancode);
-+		break;
-+	case RC_PROTO_RCMM12:
-+		ret = ir_rcmm_rawencoder(&e, max, 12, scancode);
-+		break;
-+	default:
-+		ret = -EINVAL;
-+	}
-+
-+	if (ret < 0)
-+		return ret;
-+
-+	return e - events;
-+}
-+
-+static struct ir_raw_handler rcmm_handler = {
-+	.protocols	= RC_PROTO_BIT_RCMM32 |
-+			  RC_PROTO_BIT_RCMM24 |
-+			  RC_PROTO_BIT_RCMM12,
-+	.decode		= ir_rcmm_decode,
-+	.encode         = ir_rcmm_encode,
-+	.carrier        = 36000,
-+	.min_timeout	= RCMM_PULSE_3 + RCMM_UNIT,
-+};
-+
-+static int __init ir_rcmm_decode_init(void)
-+{
-+	ir_raw_handler_register(&rcmm_handler);
-+
-+	pr_info("IR RCMM protocol handler initialized\n");
-+	return 0;
-+}
-+
-+static void __exit ir_rcmm_decode_exit(void)
-+{
-+	ir_raw_handler_unregister(&rcmm_handler);
-+}
-+
-+module_init(ir_rcmm_decode_init);
-+module_exit(ir_rcmm_decode_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Patrick Lerda");
-+MODULE_DESCRIPTION("RCMM IR protocol decoder");
-diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
-index e847bdad5c51..59c252f24194 100644
--- a/drivers/media/rc/rc-core-priv.h
-+++ b/drivers/media/rc/rc-core-priv.h
-@@ -136,6 +136,11 @@ struct ir_raw_event_ctrl {
- 		struct input_dev *idev;
- 		char name[64];
- 	} imon;
-+	struct rcmm_dec {
-+		int state;
-+		unsigned int count;
-+		u32 bits;
-+	} rcmm;
- };
- 
- /* Mutex for locking raw IR processing and handler change */
-diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
-index 0f218afdadaa..78e79c37f208 100644
--- a/drivers/media/rc/rc-main.c
-+++ b/drivers/media/rc/rc-main.c
-@@ -70,6 +70,12 @@ static const struct {
- 	[RC_PROTO_CEC] = { .name = "cec", .repeat_period = 0 },
- 	[RC_PROTO_IMON] = { .name = "imon",
- 		.scancode_bits = 0x7fffffff, .repeat_period = 114 },
-+	[RC_PROTO_RCMM12] = { .name = "rc-mm-12",
-+		.scancode_bits = 0x00000fff, .repeat_period = 114 },
-+	[RC_PROTO_RCMM24] = { .name = "rc-mm-24",
-+		.scancode_bits = 0x00ffffff, .repeat_period = 114 },
-+	[RC_PROTO_RCMM32] = { .name = "rc-mm-32",
-+		.scancode_bits = 0xffffffff, .repeat_period = 114 },
- };
- 
- /* Used to keep track of known keymaps */
-@@ -1018,6 +1024,9 @@ static const struct {
- 	{ RC_PROTO_BIT_XMP,	"xmp",		"ir-xmp-decoder"	},
- 	{ RC_PROTO_BIT_CEC,	"cec",		NULL			},
- 	{ RC_PROTO_BIT_IMON,	"imon",		"ir-imon-decoder"	},
-+	{ RC_PROTO_BIT_RCMM12 |
-+	  RC_PROTO_BIT_RCMM24 |
-+	  RC_PROTO_BIT_RCMM32,	"rc-mm",	"ir-rcmm-decoder"	},
- };
- 
- /**
-diff --git a/include/media/rc-map.h b/include/media/rc-map.h
-index bfa3017cecba..cf308b73edae 100644
--- a/include/media/rc-map.h
-+++ b/include/media/rc-map.h
-@@ -37,6 +37,9 @@
- #define RC_PROTO_BIT_XMP		BIT_ULL(RC_PROTO_XMP)
- #define RC_PROTO_BIT_CEC		BIT_ULL(RC_PROTO_CEC)
- #define RC_PROTO_BIT_IMON		BIT_ULL(RC_PROTO_IMON)
-+#define RC_PROTO_BIT_RCMM12		BIT_ULL(RC_PROTO_RCMM12)
-+#define RC_PROTO_BIT_RCMM24		BIT_ULL(RC_PROTO_RCMM24)
-+#define RC_PROTO_BIT_RCMM32		BIT_ULL(RC_PROTO_RCMM32)
- 
- #define RC_PROTO_BIT_ALL \
- 			(RC_PROTO_BIT_UNKNOWN | RC_PROTO_BIT_OTHER | \
-@@ -51,7 +54,8 @@
- 			 RC_PROTO_BIT_RC6_6A_24 | RC_PROTO_BIT_RC6_6A_32 | \
- 			 RC_PROTO_BIT_RC6_MCE | RC_PROTO_BIT_SHARP | \
- 			 RC_PROTO_BIT_XMP | RC_PROTO_BIT_CEC | \
-			 RC_PROTO_BIT_IMON)
-+			 RC_PROTO_BIT_IMON | RC_PROTO_BIT_RCMM12 | \
-+			 RC_PROTO_BIT_RCMM24 | RC_PROTO_BIT_RCMM32)
- /* All rc protocols for which we have decoders */
- #define RC_PROTO_BIT_ALL_IR_DECODER \
- 			(RC_PROTO_BIT_RC5 | RC_PROTO_BIT_RC5X_20 | \
-@@ -64,7 +68,9 @@
- 			 RC_PROTO_BIT_RC6_0 | RC_PROTO_BIT_RC6_6A_20 | \
- 			 RC_PROTO_BIT_RC6_6A_24 |  RC_PROTO_BIT_RC6_6A_32 | \
- 			 RC_PROTO_BIT_RC6_MCE | RC_PROTO_BIT_SHARP | \
-			 RC_PROTO_BIT_XMP | RC_PROTO_BIT_IMON)
-+			 RC_PROTO_BIT_XMP | RC_PROTO_BIT_IMON | \
-+			 RC_PROTO_BIT_RCMM12 | RC_PROTO_BIT_RCMM24 | \
-+			 RC_PROTO_BIT_RCMM32)
- 
- #define RC_PROTO_BIT_ALL_IR_ENCODER \
- 			(RC_PROTO_BIT_RC5 | RC_PROTO_BIT_RC5X_20 | \
-@@ -77,7 +83,9 @@
- 			 RC_PROTO_BIT_RC6_0 | RC_PROTO_BIT_RC6_6A_20 | \
- 			 RC_PROTO_BIT_RC6_6A_24 | \
- 			 RC_PROTO_BIT_RC6_6A_32 | RC_PROTO_BIT_RC6_MCE | \
-			 RC_PROTO_BIT_SHARP | RC_PROTO_BIT_IMON)
-+			 RC_PROTO_BIT_SHARP | RC_PROTO_BIT_IMON | \
-+			 RC_PROTO_BIT_RCMM12 | RC_PROTO_BIT_RCMM24 | \
-+			 RC_PROTO_BIT_RCMM32)
- 
- #define RC_SCANCODE_UNKNOWN(x)			(x)
- #define RC_SCANCODE_OTHER(x)			(x)
-diff --git a/include/uapi/linux/lirc.h b/include/uapi/linux/lirc.h
-index 6b319581882f..45fcbf99d72e 100644
--- a/include/uapi/linux/lirc.h
-+++ b/include/uapi/linux/lirc.h
-@@ -192,6 +192,9 @@ struct lirc_scancode {
-  * @RC_PROTO_XMP: XMP protocol
-  * @RC_PROTO_CEC: CEC protocol
-  * @RC_PROTO_IMON: iMon Pad protocol
-+ * @RC_PROTO_RCMM12: RC-MM protocol 12 bits
-+ * @RC_PROTO_RCMM24: RC-MM protocol 24 bits
-+ * @RC_PROTO_RCMM32: RC-MM protocol 32 bits
-  */
- enum rc_proto {
- 	RC_PROTO_UNKNOWN	= 0,
-@@ -218,6 +221,9 @@ enum rc_proto {
- 	RC_PROTO_XMP		= 21,
- 	RC_PROTO_CEC		= 22,
- 	RC_PROTO_IMON		= 23,
-+	RC_PROTO_RCMM12		= 24,
-+	RC_PROTO_RCMM24		= 25,
-+	RC_PROTO_RCMM32		= 26,
- };
- 
- #endif
-diff --git a/tools/include/uapi/linux/lirc.h b/tools/include/uapi/linux/lirc.h
-index f189931042a7..45fcbf99d72e 100644
--- a/tools/include/uapi/linux/lirc.h
-+++ b/tools/include/uapi/linux/lirc.h
-@@ -133,6 +133,12 @@
- 
- #define LIRC_SET_WIDEBAND_RECEIVER     _IOW('i', 0x00000023, __u32)
- 
-+/*
-+ * Return the recording timeout, which is either set by
-+ * the ioctl LIRC_SET_REC_TIMEOUT or by the kernel after setting the protocols.
-+ */
-+#define LIRC_GET_REC_TIMEOUT	       _IOR('i', 0x00000024, __u32)
-+
- /*
-  * struct lirc_scancode - decoded scancode with protocol for use with
-  *	LIRC_MODE_SCANCODE
-@@ -186,6 +192,9 @@ struct lirc_scancode {
-  * @RC_PROTO_XMP: XMP protocol
-  * @RC_PROTO_CEC: CEC protocol
-  * @RC_PROTO_IMON: iMon Pad protocol
-+ * @RC_PROTO_RCMM12: RC-MM protocol 12 bits
-+ * @RC_PROTO_RCMM24: RC-MM protocol 24 bits
-+ * @RC_PROTO_RCMM32: RC-MM protocol 32 bits
-  */
- enum rc_proto {
- 	RC_PROTO_UNKNOWN	= 0,
-@@ -212,6 +221,9 @@ enum rc_proto {
- 	RC_PROTO_XMP		= 21,
- 	RC_PROTO_CEC		= 22,
- 	RC_PROTO_IMON		= 23,
-+	RC_PROTO_RCMM12		= 24,
-+	RC_PROTO_RCMM24		= 25,
-+	RC_PROTO_RCMM32		= 26,
- };
- 
- #endif
-- 
-2.20.1
-
--- a/packages/linux/patches/raspberrypi/linux-902-extend-rc6-toggle-support-for-zotac.patch
+++ b/packages/linux/patches/raspberrypi/linux-902-extend-rc6-toggle-support-for-zotac.patch
@ -1,41 +0,0 @@
-From ae1ccaa3587c0bd3d6d01841fa2e668cdf738f1e Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <hias@horus.com>
-Date: Sun, 3 Feb 2019 14:24:00 +0100
-Subject: [PATCH] media: rc: ir-rc6-decoder: enable toggle bit for Zotac
- remotes
-
-The Zotac RC2604323/01G and RC2604329/02BG remotes use the 32-bit
-rc6 protocol and toggle bit 15 (0x8000) on repeated button presses,
-like MCE remotes.
-
-Add the customer code 0x80340000 to the 32-bit rc6 toggle
-handling code to get proper scancodes and toggle reports.
-
-Signed-off-by: Matthias Reichl <hias@horus.com>
---
- drivers/media/rc/ir-rc6-decoder.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/media/rc/ir-rc6-decoder.c b/drivers/media/rc/ir-rc6-decoder.c
-index d96aed1343e4..5cc302fa4daa 100644
--- a/drivers/media/rc/ir-rc6-decoder.c
-+++ b/drivers/media/rc/ir-rc6-decoder.c
-@@ -40,6 +40,7 @@
- #define RC6_6A_MCE_TOGGLE_MASK	0x8000	/* for the body bits */
- #define RC6_6A_LCC_MASK		0xffff0000 /* RC6-6A-32 long customer code mask */
- #define RC6_6A_MCE_CC		0x800f0000 /* MCE customer code */
-+#define RC6_6A_ZOTAC_CC		0x80340000 /* Zotac customer code */
- #define RC6_6A_KATHREIN_CC	0x80460000 /* Kathrein RCU-676 customer code */
- #ifndef CHAR_BIT
- #define CHAR_BIT 8	/* Normally in <limits.h> */
-@@ -246,6 +247,7 @@ static int ir_rc6_decode(struct rc_dev *dev, struct ir_raw_event ev)
- 				switch (scancode & RC6_6A_LCC_MASK) {
- 				case RC6_6A_MCE_CC:
- 				case RC6_6A_KATHREIN_CC:
-+				case RC6_6A_ZOTAC_CC:
- 					protocol = RC_PROTO_RC6_MCE;
- 					toggle = !!(scancode & RC6_6A_MCE_TOGGLE_MASK);
- 					scancode &= ~RC6_6A_MCE_TOGGLE_MASK;
-- 
-2.20.1
-
--- a/packages/linux/patches/raspberrypi/linux-903-backport-rcmm-ir-decoder.patch
+++ b/packages/linux/patches/raspberrypi/linux-903-backport-rcmm-ir-decoder.patch
@ -1,506 +0,0 @@
-From da8a71104dda4a85a9d9546ff462542347f8efa6 Mon Sep 17 00:00:00 2001
-From: Matthias Reichl <hias@horus.com>
-Date: Wed, 20 Mar 2019 09:11:53 +0100
-Subject: [PATCH] media: rc: rcmm decoder and encoder
-
-commit 721074b03411327e7bf41555d4cc7c18f49313f7 upstream.
-
-media: add support for RCMM infrared remote controls.
-
-Signed-off-by: Patrick Lerda <patrick9876@free.fr>
-Signed-off-by: Sean Young <sean@mess.org>
-Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-Signed-off-by: Matthias Reichl <hias@horus.com>
---
- Documentation/media/lirc.h.rst.exceptions |   3 +
- MAINTAINERS                               |   5 +
- drivers/media/rc/Kconfig                  |  13 ++
- drivers/media/rc/Makefile                 |   1 +
- drivers/media/rc/ir-rcmm-decoder.c        | 254 ++++++++++++++++++++++
- drivers/media/rc/rc-core-priv.h           |   5 +
- drivers/media/rc/rc-main.c                |   9 +
- include/media/rc-map.h                    |  14 +-
- include/uapi/linux/lirc.h                 |   6 +
- tools/include/uapi/linux/lirc.h           |  12 +
- 10 files changed, 319 insertions(+), 3 deletions(-)
- create mode 100644 drivers/media/rc/ir-rcmm-decoder.c
-
-diff --git a/Documentation/media/lirc.h.rst.exceptions b/Documentation/media/lirc.h.rst.exceptions
-index 984b61dc3f2e..e7a41d4b3d46 100644
--- a/Documentation/media/lirc.h.rst.exceptions
-+++ b/Documentation/media/lirc.h.rst.exceptions
-@@ -58,6 +58,9 @@ ignore symbol RC_PROTO_SHARP
- ignore symbol RC_PROTO_XMP
- ignore symbol RC_PROTO_CEC
- ignore symbol RC_PROTO_IMON
-+ignore symbol RC_PROTO_RCMM12
-+ignore symbol RC_PROTO_RCMM24
-+ignore symbol RC_PROTO_RCMM32
- 
- # Undocumented macros
- 
-diff --git a/MAINTAINERS b/MAINTAINERS
-index 9e9b19ecf6f7..57b60dd42729 100644
--- a/MAINTAINERS
-+++ b/MAINTAINERS
-@@ -15837,6 +15837,11 @@ M:	David Härdeman <david@hardeman.nu>
- S:	Maintained
- F:	drivers/media/rc/winbond-cir.c
- 
-+RCMM REMOTE CONTROLS DECODER
-+M:	Patrick Lerda <patrick9876@free.fr>
-+S:	Maintained
-+F:	drivers/media/rc/ir-rcmm-decoder.c
-+
- WINSYSTEMS EBC-C384 WATCHDOG DRIVER
- M:	William Breathitt Gray <vilhelm.gray@gmail.com>
- L:	linux-watchdog@vger.kernel.org
-diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
-index 1021c08a9ba4..8164a889011a 100644
--- a/drivers/media/rc/Kconfig
-+++ b/drivers/media/rc/Kconfig
-@@ -133,6 +133,19 @@ config IR_IMON_DECODER
- 	   remote control and you would like to use it with a raw IR
- 	   receiver, or if you wish to use an encoder to transmit this IR.
- 
-+config IR_RCMM_DECODER
-+	tristate "Enable IR raw decoder for the RC-MM protocol"
-+	depends on RC_CORE
-+	help
-+	   Enable this option when you have IR with RC-MM protocol, and
-+	   you need the software decoder. The driver supports 12,
-+	   24 and 32 bits RC-MM variants. You can enable or disable the
-+	   different modes using the following RC protocol keywords:
-+	   'rc-mm-12', 'rc-mm-24' and 'rc-mm-32'.
-+
-+	   To compile this driver as a module, choose M here: the module
-+	   will be called ir-rcmm-decoder.
-+
- endif #RC_DECODERS
- 
- menuconfig RC_DEVICES
-diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
-index e0340d043fe8..fc4058013234 100644
--- a/drivers/media/rc/Makefile
-+++ b/drivers/media/rc/Makefile
-@@ -16,6 +16,7 @@ obj-$(CONFIG_IR_SHARP_DECODER) += ir-sharp-decoder.o
- obj-$(CONFIG_IR_MCE_KBD_DECODER) += ir-mce_kbd-decoder.o
- obj-$(CONFIG_IR_XMP_DECODER) += ir-xmp-decoder.o
- obj-$(CONFIG_IR_IMON_DECODER) += ir-imon-decoder.o
-+obj-$(CONFIG_IR_RCMM_DECODER) += ir-rcmm-decoder.o
- 
- # stand-alone IR receivers/transmitters
- obj-$(CONFIG_RC_ATI_REMOTE) += ati_remote.o
-diff --git a/drivers/media/rc/ir-rcmm-decoder.c b/drivers/media/rc/ir-rcmm-decoder.c
-new file mode 100644
-index 000000000000..f1096ac1e5c5
--- /dev/null
-+++ b/drivers/media/rc/ir-rcmm-decoder.c
-@@ -0,0 +1,254 @@
-+// SPDX-License-Identifier: GPL-2.0+
-+// ir-rcmm-decoder.c - A decoder for the RCMM IR protocol
-+//
-+// Copyright (C) 2018 by Patrick Lerda <patrick9876@free.fr>
-+
-+#include "rc-core-priv.h"
-+#include <linux/module.h>
-+#include <linux/version.h>
-+
-+#define RCMM_UNIT		166667	/* nanosecs */
-+#define RCMM_PREFIX_PULSE	416666  /* 166666.666666666*2.5 */
-+#define RCMM_PULSE_0            277777  /* 166666.666666666*(1+2/3) */
-+#define RCMM_PULSE_1            444444  /* 166666.666666666*(2+2/3) */
-+#define RCMM_PULSE_2            611111  /* 166666.666666666*(3+2/3) */
-+#define RCMM_PULSE_3            777778  /* 166666.666666666*(4+2/3) */
-+
-+enum rcmm_state {
-+	STATE_INACTIVE,
-+	STATE_LOW,
-+	STATE_BUMP,
-+	STATE_VALUE,
-+	STATE_FINISHED,
-+};
-+
-+static bool rcmm_mode(const struct rcmm_dec *data)
-+{
-+	return !((0x000c0000 & data->bits) == 0x000c0000);
-+}
-+
-+static int rcmm_miscmode(struct rc_dev *dev, struct rcmm_dec *data)
-+{
-+	switch (data->count) {
-+	case 24:
-+		if (dev->enabled_protocols & RC_PROTO_BIT_RCMM24) {
-+			rc_keydown(dev, RC_PROTO_RCMM24, data->bits, 0);
-+			data->state = STATE_INACTIVE;
-+			return 0;
-+		}
-+		return -1;
-+
-+	case 12:
-+		if (dev->enabled_protocols & RC_PROTO_BIT_RCMM12) {
-+			rc_keydown(dev, RC_PROTO_RCMM12, data->bits, 0);
-+			data->state = STATE_INACTIVE;
-+			return 0;
-+		}
-+		return -1;
-+	}
-+
-+	return -1;
-+}
-+
-+/**
-+ * ir_rcmm_decode() - Decode one RCMM pulse or space
-+ * @dev:	the struct rc_dev descriptor of the device
-+ * @ev:		the struct ir_raw_event descriptor of the pulse/space
-+ *
-+ * This function returns -EINVAL if the pulse violates the state machine
-+ */
-+static int ir_rcmm_decode(struct rc_dev *dev, struct ir_raw_event ev)
-+{
-+	struct rcmm_dec *data = &dev->raw->rcmm;
-+	u32 scancode;
-+	u8 toggle;
-+	int value;
-+
-+	if (!(dev->enabled_protocols & (RC_PROTO_BIT_RCMM32 |
-+							RC_PROTO_BIT_RCMM24 |
-+							RC_PROTO_BIT_RCMM12)))
-+		return 0;
-+
-+	if (!is_timing_event(ev)) {
-+		if (ev.reset)
-+			data->state = STATE_INACTIVE;
-+		return 0;
-+	}
-+
-+	switch (data->state) {
-+	case STATE_INACTIVE:
-+		if (!ev.pulse)
-+			break;
-+
-+		if (!eq_margin(ev.duration, RCMM_PREFIX_PULSE, RCMM_UNIT / 2))
-+			break;
-+
-+		data->state = STATE_LOW;
-+		data->count = 0;
-+		data->bits  = 0;
-+		return 0;
-+
-+	case STATE_LOW:
-+		if (ev.pulse)
-+			break;
-+
-+		if (!eq_margin(ev.duration, RCMM_PULSE_0, RCMM_UNIT / 2))
-+			break;
-+
-+		data->state = STATE_BUMP;
-+		return 0;
-+
-+	case STATE_BUMP:
-+		if (!ev.pulse)
-+			break;
-+
-+		if (!eq_margin(ev.duration, RCMM_UNIT, RCMM_UNIT / 2))
-+			break;
-+
-+		data->state = STATE_VALUE;
-+		return 0;
-+
-+	case STATE_VALUE:
-+		if (ev.pulse)
-+			break;
-+
-+		if (eq_margin(ev.duration, RCMM_PULSE_0, RCMM_UNIT / 2))
-+			value = 0;
-+		else if (eq_margin(ev.duration, RCMM_PULSE_1, RCMM_UNIT / 2))
-+			value = 1;
-+		else if (eq_margin(ev.duration, RCMM_PULSE_2, RCMM_UNIT / 2))
-+			value = 2;
-+		else if (eq_margin(ev.duration, RCMM_PULSE_3, RCMM_UNIT / 2))
-+			value = 3;
-+		else
-+			value = -1;
-+
-+		if (value == -1) {
-+			if (!rcmm_miscmode(dev, data))
-+				return 0;
-+			break;
-+		}
-+
-+		data->bits <<= 2;
-+		data->bits |= value;
-+
-+		data->count += 2;
-+
-+		if (data->count < 32)
-+			data->state = STATE_BUMP;
-+		else
-+			data->state = STATE_FINISHED;
-+
-+		return 0;
-+
-+	case STATE_FINISHED:
-+		if (!ev.pulse)
-+			break;
-+
-+		if (!eq_margin(ev.duration, RCMM_UNIT, RCMM_UNIT / 2))
-+			break;
-+
-+		if (rcmm_mode(data)) {
-+			toggle = !!(0x8000 & data->bits);
-+			scancode = data->bits & ~0x8000;
-+		} else {
-+			toggle = 0;
-+			scancode = data->bits;
-+		}
-+
-+		if (dev->enabled_protocols & RC_PROTO_BIT_RCMM32) {
-+			rc_keydown(dev, RC_PROTO_RCMM32, scancode, toggle);
-+			data->state = STATE_INACTIVE;
-+			return 0;
-+		}
-+
-+		break;
-+	}
-+
-+	data->state = STATE_INACTIVE;
-+	return -EINVAL;
-+}
-+
-+static const int rcmmspace[] = {
-+	RCMM_PULSE_0,
-+	RCMM_PULSE_1,
-+	RCMM_PULSE_2,
-+	RCMM_PULSE_3,
-+};
-+
-+static int ir_rcmm_rawencoder(struct ir_raw_event **ev, unsigned int max,
-+			      unsigned int n, u32 data)
-+{
-+	int i;
-+	int ret;
-+
-+	ret = ir_raw_gen_pulse_space(ev, &max, RCMM_PREFIX_PULSE, RCMM_PULSE_0);
-+	if (ret)
-+		return ret;
-+
-+	for (i = n - 2; i >= 0; i -= 2) {
-+		const unsigned int space = rcmmspace[(data >> i) & 3];
-+
-+		ret = ir_raw_gen_pulse_space(ev, &max, RCMM_UNIT, space);
-+		if (ret)
-+			return ret;
-+	}
-+
-+	return ir_raw_gen_pulse_space(ev, &max, RCMM_UNIT, RCMM_PULSE_3 * 2);
-+}
-+
-+static int ir_rcmm_encode(enum rc_proto protocol, u32 scancode,
-+			  struct ir_raw_event *events, unsigned int max)
-+{
-+	struct ir_raw_event *e = events;
-+	int ret;
-+
-+	switch (protocol) {
-+	case RC_PROTO_RCMM32:
-+		ret = ir_rcmm_rawencoder(&e, max, 32, scancode);
-+		break;
-+	case RC_PROTO_RCMM24:
-+		ret = ir_rcmm_rawencoder(&e, max, 24, scancode);
-+		break;
-+	case RC_PROTO_RCMM12:
-+		ret = ir_rcmm_rawencoder(&e, max, 12, scancode);
-+		break;
-+	default:
-+		ret = -EINVAL;
-+	}
-+
-+	if (ret < 0)
-+		return ret;
-+
-+	return e - events;
-+}
-+
-+static struct ir_raw_handler rcmm_handler = {
-+	.protocols	= RC_PROTO_BIT_RCMM32 |
-+			  RC_PROTO_BIT_RCMM24 |
-+			  RC_PROTO_BIT_RCMM12,
-+	.decode		= ir_rcmm_decode,
-+	.encode         = ir_rcmm_encode,
-+	.carrier        = 36000,
-+	.min_timeout	= RCMM_PULSE_3 + RCMM_UNIT,
-+};
-+
-+static int __init ir_rcmm_decode_init(void)
-+{
-+	ir_raw_handler_register(&rcmm_handler);
-+
-+	pr_info("IR RCMM protocol handler initialized\n");
-+	return 0;
-+}
-+
-+static void __exit ir_rcmm_decode_exit(void)
-+{
-+	ir_raw_handler_unregister(&rcmm_handler);
-+}
-+
-+module_init(ir_rcmm_decode_init);
-+module_exit(ir_rcmm_decode_exit);
-+
-+MODULE_LICENSE("GPL");
-+MODULE_AUTHOR("Patrick Lerda");
-+MODULE_DESCRIPTION("RCMM IR protocol decoder");
-diff --git a/drivers/media/rc/rc-core-priv.h b/drivers/media/rc/rc-core-priv.h
-index e847bdad5c51..59c252f24194 100644
--- a/drivers/media/rc/rc-core-priv.h
-+++ b/drivers/media/rc/rc-core-priv.h
-@@ -136,6 +136,11 @@ struct ir_raw_event_ctrl {
- 		struct input_dev *idev;
- 		char name[64];
- 	} imon;
-+	struct rcmm_dec {
-+		int state;
-+		unsigned int count;
-+		u32 bits;
-+	} rcmm;
- };
- 
- /* Mutex for locking raw IR processing and handler change */
-diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
-index 0f218afdadaa..78e79c37f208 100644
--- a/drivers/media/rc/rc-main.c
-+++ b/drivers/media/rc/rc-main.c
-@@ -70,6 +70,12 @@ static const struct {
- 	[RC_PROTO_CEC] = { .name = "cec", .repeat_period = 0 },
- 	[RC_PROTO_IMON] = { .name = "imon",
- 		.scancode_bits = 0x7fffffff, .repeat_period = 114 },
-+	[RC_PROTO_RCMM12] = { .name = "rc-mm-12",
-+		.scancode_bits = 0x00000fff, .repeat_period = 114 },
-+	[RC_PROTO_RCMM24] = { .name = "rc-mm-24",
-+		.scancode_bits = 0x00ffffff, .repeat_period = 114 },
-+	[RC_PROTO_RCMM32] = { .name = "rc-mm-32",
-+		.scancode_bits = 0xffffffff, .repeat_period = 114 },
- };
- 
- /* Used to keep track of known keymaps */
-@@ -1018,6 +1024,9 @@ static const struct {
- 	{ RC_PROTO_BIT_XMP,	"xmp",		"ir-xmp-decoder"	},
- 	{ RC_PROTO_BIT_CEC,	"cec",		NULL			},
- 	{ RC_PROTO_BIT_IMON,	"imon",		"ir-imon-decoder"	},
-+	{ RC_PROTO_BIT_RCMM12 |
-+	  RC_PROTO_BIT_RCMM24 |
-+	  RC_PROTO_BIT_RCMM32,	"rc-mm",	"ir-rcmm-decoder"	},
- };
- 
- /**
-diff --git a/include/media/rc-map.h b/include/media/rc-map.h
-index bfa3017cecba..cf308b73edae 100644
--- a/include/media/rc-map.h
-+++ b/include/media/rc-map.h
-@@ -37,6 +37,9 @@
- #define RC_PROTO_BIT_XMP		BIT_ULL(RC_PROTO_XMP)
- #define RC_PROTO_BIT_CEC		BIT_ULL(RC_PROTO_CEC)
- #define RC_PROTO_BIT_IMON		BIT_ULL(RC_PROTO_IMON)
-+#define RC_PROTO_BIT_RCMM12		BIT_ULL(RC_PROTO_RCMM12)
-+#define RC_PROTO_BIT_RCMM24		BIT_ULL(RC_PROTO_RCMM24)
-+#define RC_PROTO_BIT_RCMM32		BIT_ULL(RC_PROTO_RCMM32)
- 
- #define RC_PROTO_BIT_ALL \
- 			(RC_PROTO_BIT_UNKNOWN | RC_PROTO_BIT_OTHER | \
-@@ -51,7 +54,8 @@
- 			 RC_PROTO_BIT_RC6_6A_24 | RC_PROTO_BIT_RC6_6A_32 | \
- 			 RC_PROTO_BIT_RC6_MCE | RC_PROTO_BIT_SHARP | \
- 			 RC_PROTO_BIT_XMP | RC_PROTO_BIT_CEC | \
-			 RC_PROTO_BIT_IMON)
-+			 RC_PROTO_BIT_IMON | RC_PROTO_BIT_RCMM12 | \
-+			 RC_PROTO_BIT_RCMM24 | RC_PROTO_BIT_RCMM32)
- /* All rc protocols for which we have decoders */
- #define RC_PROTO_BIT_ALL_IR_DECODER \
- 			(RC_PROTO_BIT_RC5 | RC_PROTO_BIT_RC5X_20 | \
-@@ -64,7 +68,9 @@
- 			 RC_PROTO_BIT_RC6_0 | RC_PROTO_BIT_RC6_6A_20 | \
- 			 RC_PROTO_BIT_RC6_6A_24 |  RC_PROTO_BIT_RC6_6A_32 | \
- 			 RC_PROTO_BIT_RC6_MCE | RC_PROTO_BIT_SHARP | \
-			 RC_PROTO_BIT_XMP | RC_PROTO_BIT_IMON)
-+			 RC_PROTO_BIT_XMP | RC_PROTO_BIT_IMON | \
-+			 RC_PROTO_BIT_RCMM12 | RC_PROTO_BIT_RCMM24 | \
-+			 RC_PROTO_BIT_RCMM32)
- 
- #define RC_PROTO_BIT_ALL_IR_ENCODER \
- 			(RC_PROTO_BIT_RC5 | RC_PROTO_BIT_RC5X_20 | \
-@@ -77,7 +83,9 @@
- 			 RC_PROTO_BIT_RC6_0 | RC_PROTO_BIT_RC6_6A_20 | \
- 			 RC_PROTO_BIT_RC6_6A_24 | \
- 			 RC_PROTO_BIT_RC6_6A_32 | RC_PROTO_BIT_RC6_MCE | \
-			 RC_PROTO_BIT_SHARP | RC_PROTO_BIT_IMON)
-+			 RC_PROTO_BIT_SHARP | RC_PROTO_BIT_IMON | \
-+			 RC_PROTO_BIT_RCMM12 | RC_PROTO_BIT_RCMM24 | \
-+			 RC_PROTO_BIT_RCMM32)
- 
- #define RC_SCANCODE_UNKNOWN(x)			(x)
- #define RC_SCANCODE_OTHER(x)			(x)
-diff --git a/include/uapi/linux/lirc.h b/include/uapi/linux/lirc.h
-index 6b319581882f..45fcbf99d72e 100644
--- a/include/uapi/linux/lirc.h
-+++ b/include/uapi/linux/lirc.h
-@@ -192,6 +192,9 @@ struct lirc_scancode {
-  * @RC_PROTO_XMP: XMP protocol
-  * @RC_PROTO_CEC: CEC protocol
-  * @RC_PROTO_IMON: iMon Pad protocol
-+ * @RC_PROTO_RCMM12: RC-MM protocol 12 bits
-+ * @RC_PROTO_RCMM24: RC-MM protocol 24 bits
-+ * @RC_PROTO_RCMM32: RC-MM protocol 32 bits
-  */
- enum rc_proto {
- 	RC_PROTO_UNKNOWN	= 0,
-@@ -218,6 +221,9 @@ enum rc_proto {
- 	RC_PROTO_XMP		= 21,
- 	RC_PROTO_CEC		= 22,
- 	RC_PROTO_IMON		= 23,
-+	RC_PROTO_RCMM12		= 24,
-+	RC_PROTO_RCMM24		= 25,
-+	RC_PROTO_RCMM32		= 26,
- };
- 
- #endif
-diff --git a/tools/include/uapi/linux/lirc.h b/tools/include/uapi/linux/lirc.h
-index f189931042a7..45fcbf99d72e 100644
--- a/tools/include/uapi/linux/lirc.h
-+++ b/tools/include/uapi/linux/lirc.h
-@@ -133,6 +133,12 @@
- 
- #define LIRC_SET_WIDEBAND_RECEIVER     _IOW('i', 0x00000023, __u32)
- 
-+/*
-+ * Return the recording timeout, which is either set by
-+ * the ioctl LIRC_SET_REC_TIMEOUT or by the kernel after setting the protocols.
-+ */
-+#define LIRC_GET_REC_TIMEOUT	       _IOR('i', 0x00000024, __u32)
-+
- /*
-  * struct lirc_scancode - decoded scancode with protocol for use with
-  *	LIRC_MODE_SCANCODE
-@@ -186,6 +192,9 @@ struct lirc_scancode {
-  * @RC_PROTO_XMP: XMP protocol
-  * @RC_PROTO_CEC: CEC protocol
-  * @RC_PROTO_IMON: iMon Pad protocol
-+ * @RC_PROTO_RCMM12: RC-MM protocol 12 bits
-+ * @RC_PROTO_RCMM24: RC-MM protocol 24 bits
-+ * @RC_PROTO_RCMM32: RC-MM protocol 32 bits
-  */
- enum rc_proto {
- 	RC_PROTO_UNKNOWN	= 0,
-@@ -212,6 +221,9 @@ enum rc_proto {
- 	RC_PROTO_XMP		= 21,
- 	RC_PROTO_CEC		= 22,
- 	RC_PROTO_IMON		= 23,
-+	RC_PROTO_RCMM12		= 24,
-+	RC_PROTO_RCMM24		= 25,
-+	RC_PROTO_RCMM32		= 26,
- };
- 
- #endif
-- 
-2.20.1
-
--- a/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-02-fix-linux-5.1.patch
+++ b/packages/x11/driver/xf86-video-nvidia-legacy/patches/xf86-video-nvidia-legacy-02-fix-linux-5.1.patch
@ -0,0 +1,16 @@
+diff -Nur nv/kernel/nv-drm.c nv2/kernel/nv-drm.c
+--- nv/kernel/nv-drm.c	2018-05-25 06:16:20.000000000 +0200
+++ nv2/kernel/nv-drm.c	2019-05-09 20:51:33.364278935 +0200
+@@ -146,11 +146,7 @@
+ };
+ 
+ static struct drm_driver nv_drm_driver = {
+-#if defined(DRIVER_LEGACY)
+     .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY,
+-#else
+-    .driver_features = DRIVER_GEM | DRIVER_PRIME,
+-#endif
+     .load = nv_drm_load,
+     .unload = nv_drm_unload,
+     .fops = &nv_drm_fops,
+
--- a/packages/x11/driver/xf86-video-nvidia/package.mk
+++ b/packages/x11/driver/xf86-video-nvidia/package.mk
@ -6,8 +6,8 @@ PKG_NAME="xf86-video-nvidia"
 # Remember to run "python packages/x11/driver/xf86-video-nvidia/scripts/make_nvidia_udev.py" and commit changes to
 # "packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules" whenever bumping version.
 # Host may require installation of python-lxml and python-requests packages.
-PKG_VERSION="410.104"
-PKG_SHA256="0f4f61a742831d82a94457ff12c4583a6e17ace71e0e6ca794ee3ce0a0b9db32"
+PKG_VERSION="418.74"
+PKG_SHA256="f58ce7bce5117759c6272b17ec585659c3c4f9daf139b5bbda98fd4a447e78ee"
 PKG_ARCH="x86_64"
 PKG_LICENSE="nonfree"
 PKG_SITE="http://www.nvidia.com/"
@ -48,7 +48,7 @@ makeinstall_target() {
    cp -P libnvidia-glcore.so.$PKG_VERSION $INSTALL/usr/lib
    cp -P libnvidia-ml.so.$PKG_VERSION $INSTALL/usr/lib
      ln -sf /var/lib/libnvidia-ml.so.1 $INSTALL/usr/lib/libnvidia-ml.so.1
-    cp -P tls/libnvidia-tls.so.$PKG_VERSION $INSTALL/usr/lib
+    cp -P libnvidia-tls.so.$PKG_VERSION $INSTALL/usr/lib
  # rename to not conflicting with Mesa libGL.so
    cp -P libGL.so.$PKG_VERSION $INSTALL/usr/lib/libGL_nvidia.so.1

--- a/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules
+++ b/packages/x11/driver/xf86-video-nvidia/udev.d/96-nvidia.rules
@ -237,6 +237,7 @@ ATTRS{device}=="0x1c21", GOTO="configure_nvidia"
 ATTRS{device}=="0x1c22", GOTO="configure_nvidia"
 ATTRS{device}=="0x1c23", GOTO="configure_nvidia"
 ATTRS{device}=="0x1c30", GOTO="configure_nvidia"
+ATTRS{device}=="0x1c31", GOTO="configure_nvidia"
 ATTRS{device}=="0x1c60", GOTO="configure_nvidia"
 ATTRS{device}=="0x1c61", GOTO="configure_nvidia"
 ATTRS{device}=="0x1c62", GOTO="configure_nvidia"
@ -246,6 +247,8 @@ ATTRS{device}=="0x1c83", GOTO="configure_nvidia"
 ATTRS{device}=="0x1c8c", GOTO="configure_nvidia"
 ATTRS{device}=="0x1c8d", GOTO="configure_nvidia"
 ATTRS{device}=="0x1c8f", GOTO="configure_nvidia"
+ATTRS{device}=="0x1c90", GOTO="configure_nvidia"
+ATTRS{device}=="0x1c91", GOTO="configure_nvidia"
 ATTRS{device}=="0x1c92", GOTO="configure_nvidia"
 ATTRS{device}=="0x1cb1", GOTO="configure_nvidia"
 ATTRS{device}=="0x1cb2", GOTO="configure_nvidia"
@ -254,10 +257,14 @@ ATTRS{device}=="0x1cb6", GOTO="configure_nvidia"
 ATTRS{device}=="0x1cba", GOTO="configure_nvidia"
 ATTRS{device}=="0x1cbb", GOTO="configure_nvidia"
 ATTRS{device}=="0x1cbc", GOTO="configure_nvidia"
+ATTRS{device}=="0x1cbd", GOTO="configure_nvidia"
 ATTRS{device}=="0x1d01", GOTO="configure_nvidia"
 ATTRS{device}=="0x1d10", GOTO="configure_nvidia"
+ATTRS{device}=="0x1d11", GOTO="configure_nvidia"
 ATTRS{device}=="0x1d12", GOTO="configure_nvidia"
+ATTRS{device}=="0x1d13", GOTO="configure_nvidia"
 ATTRS{device}=="0x1d33", GOTO="configure_nvidia"
+ATTRS{device}=="0x1d52", GOTO="configure_nvidia"
 ATTRS{device}=="0x1d81", GOTO="configure_nvidia"
 ATTRS{device}=="0x1db1", GOTO="configure_nvidia"
 ATTRS{device}=="0x1db3", GOTO="configure_nvidia"
@ -268,16 +275,30 @@ ATTRS{device}=="0x1db7", GOTO="configure_nvidia"
 ATTRS{device}=="0x1db8", GOTO="configure_nvidia"
 ATTRS{device}=="0x1dba", GOTO="configure_nvidia"
 ATTRS{device}=="0x1df5", GOTO="configure_nvidia"
+ATTRS{device}=="0x1e02", GOTO="configure_nvidia"
 ATTRS{device}=="0x1e04", GOTO="configure_nvidia"
 ATTRS{device}=="0x1e07", GOTO="configure_nvidia"
 ATTRS{device}=="0x1e30", GOTO="configure_nvidia"
 ATTRS{device}=="0x1e82", GOTO="configure_nvidia"
 ATTRS{device}=="0x1e87", GOTO="configure_nvidia"
+ATTRS{device}=="0x1e90", GOTO="configure_nvidia"
 ATTRS{device}=="0x1eb0", GOTO="configure_nvidia"
 ATTRS{device}=="0x1eb1", GOTO="configure_nvidia"
 ATTRS{device}=="0x1eb8", GOTO="configure_nvidia"
+ATTRS{device}=="0x1ed0", GOTO="configure_nvidia"
 ATTRS{device}=="0x1f02", GOTO="configure_nvidia"
 ATTRS{device}=="0x1f07", GOTO="configure_nvidia"
+ATTRS{device}=="0x1f08", GOTO="configure_nvidia"
+ATTRS{device}=="0x1f10", GOTO="configure_nvidia"
+ATTRS{device}=="0x1f11", GOTO="configure_nvidia"
+ATTRS{device}=="0x1f50", GOTO="configure_nvidia"
+ATTRS{device}=="0x1f51", GOTO="configure_nvidia"
+ATTRS{device}=="0x1f82", GOTO="configure_nvidia"
+ATTRS{device}=="0x1f91", GOTO="configure_nvidia"
+ATTRS{device}=="0x2182", GOTO="configure_nvidia"
+ATTRS{device}=="0x2184", GOTO="configure_nvidia"
+ATTRS{device}=="0x2191", GOTO="configure_nvidia"
+ATTRS{device}=="0x21d1", GOTO="configure_nvidia"
 GOTO="configure_nvidia-legacy"

 LABEL="configure_nvidia"
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.0.12 Kernel Configuration
+# Linux/x86_64 5.1.0 Kernel Configuration
 #

 #
@ -10,6 +10,7 @@ CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=70200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y
 CONFIG_THREAD_INFO_IN_TASK=y
@ -193,6 +194,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
@ -469,6 +471,7 @@ CONFIG_ACPI_THERMAL=y
 CONFIG_ACPI_NUMA=y
 CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
 CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_TABLE_OVERRIDE_VIA_BUILTIN_INITRD is not set
 # CONFIG_ACPI_DEBUG is not set
 # CONFIG_ACPI_PCI_SLOT is not set
 CONFIG_ACPI_CONTAINER=y
@ -531,6 +534,7 @@ CONFIG_X86_SPEEDSTEP_LIB=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_CPU_IDLE_GOV_TEO is not set
 CONFIG_INTEL_IDLE=y

 #
@ -549,7 +553,6 @@ CONFIG_AMD_NB=y
 # Binary Emulations
 #
 CONFIG_IA32_EMULATION=y
-# CONFIG_IA32_AOUT is not set
 # CONFIG_X86_X32 is not set
 CONFIG_COMPAT_32=y
 CONFIG_COMPAT=y
@ -837,6 +840,7 @@ CONFIG_SKB_EXTENSIONS=y
 CONFIG_PACKET=y
 # CONFIG_PACKET_DIAG is not set
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 # CONFIG_UNIX_DIAG is not set
 # CONFIG_TLS is not set
 # CONFIG_XFRM_USER is not set
@ -960,6 +964,7 @@ CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_MASQUERADE=y
 # CONFIG_NF_TABLES is not set
 CONFIG_NETFILTER_XTABLES=m

@ -1053,8 +1058,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 # CONFIG_NF_LOG_ARP is not set
 # CONFIG_NF_LOG_IPV4 is not set
 CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_IPV4=m
-CONFIG_NF_NAT_MASQUERADE_IPV4=y
 CONFIG_IP_NF_IPTABLES=m
 # CONFIG_IP_NF_MATCH_AH is not set
 # CONFIG_IP_NF_MATCH_ECN is not set
@ -1082,7 +1085,6 @@ CONFIG_IP_NF_MANGLE=m
 # CONFIG_NF_DUP_IPV6 is not set
 CONFIG_NF_REJECT_IPV6=m
 # CONFIG_NF_LOG_IPV6 is not set
-CONFIG_NF_NAT_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 # CONFIG_IP6_NF_MATCH_AH is not set
 # CONFIG_IP6_NF_MATCH_EUI64 is not set
@ -1312,7 +1314,6 @@ CONFIG_RFKILL_INPUT=y
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 # CONFIG_NET_DEVLINK is not set
-CONFIG_MAY_USE_DEVLINK=y
 CONFIG_FAILOVER=y
 CONFIG_HAVE_EBPF_JIT=y

@ -1337,6 +1338,7 @@ CONFIG_PCIEASPM_DEFAULT=y
 CONFIG_PCIE_PME=y
 # CONFIG_PCIE_DPC is not set
 # CONFIG_PCIE_PTM is not set
+# CONFIG_PCIE_BW is not set
 CONFIG_PCI_MSI=y
 CONFIG_PCI_MSI_IRQ_DOMAIN=y
 CONFIG_PCI_QUIRKS=y
@ -1502,6 +1504,7 @@ CONFIG_ALTERA_STAPL=m
 # CONFIG_INTEL_MEI is not set
 # CONFIG_INTEL_MEI_ME is not set
 # CONFIG_INTEL_MEI_TXE is not set
+# CONFIG_INTEL_MEI_HDCP is not set
 # CONFIG_VMWARE_VMCI is not set

 #
@ -1547,6 +1550,7 @@ CONFIG_ALTERA_STAPL=m
 # CONFIG_MISC_ALCOR_PCI is not set
 CONFIG_MISC_RTSX_PCI=y
 CONFIG_MISC_RTSX_USB=y
+# CONFIG_HABANA_AI is not set
 CONFIG_HAVE_IDE=y
 # CONFIG_IDE is not set

@ -1640,7 +1644,6 @@ CONFIG_MEGARAID_SAS=y
 # CONFIG_SCSI_PM8001 is not set
 # CONFIG_SCSI_VIRTIO is not set
 # CONFIG_SCSI_DH is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
 CONFIG_ATA=y
 # CONFIG_ATA_VERBOSE_ERROR is not set
 CONFIG_ATA_ACPI=y
@ -2162,6 +2165,7 @@ CONFIG_MT76x0E=m
 CONFIG_MT76x2_COMMON=m
 CONFIG_MT76x2E=m
 CONFIG_MT76x2U=m
+CONFIG_MT7603E=m
 CONFIG_WLAN_VENDOR_RALINK=y
 CONFIG_RT2X00=m
 CONFIG_RT2400PCI=m
@ -2422,6 +2426,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_AD714X is not set
 # CONFIG_INPUT_BMA150 is not set
 # CONFIG_INPUT_E3X0_BUTTON is not set
+# CONFIG_INPUT_MSM_VIBRATOR is not set
 # CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_APANEL is not set
 # CONFIG_INPUT_GP2A is not set
@ -2708,6 +2713,7 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_MB86S7X is not set
 # CONFIG_GPIO_MOCKUP is not set
 # CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_AMD_FCH is not set

 #
 # Port-mapped I/O GPIO drivers
@ -3047,6 +3053,7 @@ CONFIG_MFD_INTEL_LPSS_PCI=y
 # CONFIG_TWL6040_CORE is not set
 # CONFIG_MFD_WL1273_CORE is not set
 # CONFIG_MFD_LM3533 is not set
+# CONFIG_MFD_TQMX86 is not set
 # CONFIG_MFD_VX855 is not set
 # CONFIG_MFD_ARIZONA_I2C is not set
 # CONFIG_MFD_WM8400 is not set
@ -3417,10 +3424,6 @@ CONFIG_VIDEO_SAA6752HS=m
 #
 # Miscellaneous helper chips
 #
-
-#
-# Sensors used on soc_camera driver
-#
 CONFIG_MEDIA_TUNER=m
 CONFIG_MEDIA_TUNER_SIMPLE=m
 CONFIG_MEDIA_TUNER_TDA18250=m
@ -3643,6 +3646,10 @@ CONFIG_DRM_SCHED=y
 # CONFIG_DRM_I2C_SIL164 is not set
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+
+#
+# ARM devices
+#
 CONFIG_DRM_RADEON=y
 # CONFIG_DRM_RADEON_USERPTR is not set
 CONFIG_DRM_AMDGPU=y
@ -3716,6 +3723,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # Display Interface Bridges
 #
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
+# CONFIG_DRM_ETNAVIV is not set
 # CONFIG_DRM_HISI_HIBMC is not set
 # CONFIG_DRM_TINYDRM is not set
 # CONFIG_DRM_LEGACY is not set
@ -3995,6 +4003,7 @@ CONFIG_SND_SOC_AMD_ACP3x=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_ESAI is not set
+# CONFIG_SND_SOC_FSL_MICFIL is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_SOC_IMG is not set
@ -4044,11 +4053,14 @@ CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
 # CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH is not set
 # CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH is not set
 CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+# CONFIG_SND_SOC_MTK_BTCVSD is not set

 #
 # STMicroelectronics STM32 SOC audio support
 #
 # CONFIG_SND_SOC_XILINX_I2S is not set
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 # CONFIG_ZX_TDM is not set
 CONFIG_SND_SOC_I2C_AND_SPI=y
@ -4074,6 +4086,7 @@ CONFIG_SND_SOC_ADAU7002=m
 # CONFIG_SND_SOC_CS35L33 is not set
 # CONFIG_SND_SOC_CS35L34 is not set
 # CONFIG_SND_SOC_CS35L35 is not set
+# CONFIG_SND_SOC_CS35L36 is not set
 # CONFIG_SND_SOC_CS42L42 is not set
 # CONFIG_SND_SOC_CS42L51_I2C is not set
 # CONFIG_SND_SOC_CS42L52 is not set
@ -4084,6 +4097,7 @@ CONFIG_SND_SOC_ADAU7002=m
 # CONFIG_SND_SOC_CS4271_I2C is not set
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS43130 is not set
+# CONFIG_SND_SOC_CS4341 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
 CONFIG_SND_SOC_DA7213=m
@ -4113,6 +4127,7 @@ CONFIG_SND_SOC_MAX98927=m
 # CONFIG_SND_SOC_PCM3060_I2C is not set
 # CONFIG_SND_SOC_PCM3168A_I2C is not set
 # CONFIG_SND_SOC_PCM512x_I2C is not set
+# CONFIG_SND_SOC_RK3328 is not set
 CONFIG_SND_SOC_RL6231=m
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
@ -4159,6 +4174,7 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_WM8782 is not set
 # CONFIG_SND_SOC_WM8804_I2C is not set
 # CONFIG_SND_SOC_WM8903 is not set
+# CONFIG_SND_SOC_WM8904 is not set
 # CONFIG_SND_SOC_WM8960 is not set
 # CONFIG_SND_SOC_WM8962 is not set
 # CONFIG_SND_SOC_WM8974 is not set
@ -4167,6 +4183,7 @@ CONFIG_SND_SOC_TS3A227E=m
 # CONFIG_SND_SOC_ZX_AUD96P22 is not set
 # CONFIG_SND_SOC_MAX9759 is not set
 # CONFIG_SND_SOC_MT6351 is not set
+# CONFIG_SND_SOC_MT6358 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
@ -4223,6 +4240,7 @@ CONFIG_HID_EZKEY=y
 CONFIG_HID_KYE=y
 # CONFIG_HID_UCLOGIC is not set
 # CONFIG_HID_WALTOP is not set
+# CONFIG_HID_VIEWSONIC is not set
 CONFIG_HID_GYRATION=y
 # CONFIG_HID_ICADE is not set
 # CONFIG_HID_ITE is not set
@ -4240,6 +4258,7 @@ CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWHEELS_FF=y
 # CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MALTRON is not set
 # CONFIG_HID_MAYFLASH is not set
 # CONFIG_HID_REDRAGON is not set
 CONFIG_HID_MICROSOFT=y
@ -4316,6 +4335,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
+CONFIG_USB_AUTOSUSPEND_DELAY=2
 CONFIG_USB_MON=m
 # CONFIG_USB_WUSB_CBAF is not set

@ -4331,6 +4351,7 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_EHCI_TT_NEWSCHED=y
 CONFIG_USB_EHCI_PCI=y
+# CONFIG_USB_EHCI_FSL is not set
 # CONFIG_USB_EHCI_HCD_PLATFORM is not set
 # CONFIG_USB_OXU210HP_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
@ -4624,6 +4645,7 @@ CONFIG_RTC_INTF_DEV=y
 # I2C RTC drivers
 #
 # CONFIG_RTC_DRV_ABB5ZES3 is not set
+# CONFIG_RTC_DRV_ABEOZ9 is not set
 # CONFIG_RTC_DRV_ABX80X is not set
 # CONFIG_RTC_DRV_DS1307 is not set
 # CONFIG_RTC_DRV_DS1374 is not set
@ -4646,7 +4668,9 @@ CONFIG_RTC_INTF_DEV=y
 # CONFIG_RTC_DRV_RX8581 is not set
 # CONFIG_RTC_DRV_RX8025 is not set
 # CONFIG_RTC_DRV_EM3027 is not set
+# CONFIG_RTC_DRV_RV3028 is not set
 # CONFIG_RTC_DRV_RV8803 is not set
+# CONFIG_RTC_DRV_SD3078 is not set

 #
 # SPI RTC drivers
@ -4687,7 +4711,6 @@ CONFIG_RTC_DRV_CMOS=y
 #
 # HID Sensor RTC drivers
 #
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set

@ -4759,7 +4782,6 @@ CONFIG_RTS5208=y
 # CONFIG_VT6655 is not set
 CONFIG_VT6656=m
 # CONFIG_FB_SM750 is not set
-# CONFIG_FB_XGI is not set

 #
 # Speakup console speech
@ -4768,6 +4790,10 @@ CONFIG_VT6656=m
 CONFIG_STAGING_MEDIA=y
 # CONFIG_VIDEO_ZORAN is not set

+#
+# soc_camera sensor drivers
+#
+
 #
 # Android
 #
@ -4780,7 +4806,6 @@ CONFIG_STAGING_MEDIA=y
 # CONFIG_KS7010 is not set
 # CONFIG_GREYBUS is not set
 # CONFIG_DRM_VBOXVIDEO is not set
-# CONFIG_MTK_MMC is not set

 #
 # Gasket devices
@ -4848,6 +4873,7 @@ CONFIG_WMI_BMOF=y
 # CONFIG_I2C_MULTI_INSTANTIATE is not set
 CONFIG_INTEL_ATOMISP2_PM=y
 # CONFIG_HUAWEI_WMI is not set
+# CONFIG_PCENGINES_APU2 is not set
 CONFIG_PMC_ATOM=y
 # CONFIG_CHROME_PLATFORMS is not set
 # CONFIG_MELLANOX_PLATFORM is not set
@ -4968,11 +4994,13 @@ CONFIG_NVMEM=y
 # CONFIG_UNISYS_VISORBUS is not set
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
+# CONFIG_INTERCONNECT is not set

 #
 # File systems
 #
 CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
 CONFIG_FS_IOMAP=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
@ -4980,7 +5008,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_ENCRYPTION is not set
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
@ -5149,6 +5176,7 @@ CONFIG_SUNRPC_GSS=y
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 # CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=y
@ -5233,7 +5261,7 @@ CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 # CONFIG_FORTIFY_SOURCE is not set
 # CONFIG_STATIC_USERMODEHELPER is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
+CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
 CONFIG_XOR_BLOCKS=y
 CONFIG_CRYPTO=y

@ -5263,6 +5291,7 @@ CONFIG_CRYPTO_MANAGER=y
 CONFIG_CRYPTO_MANAGER2=y
 # CONFIG_CRYPTO_USER is not set
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
 CONFIG_CRYPTO_GF128MUL=m
 CONFIG_CRYPTO_NULL=y
 CONFIG_CRYPTO_NULL2=y
@ -5487,6 +5516,7 @@ CONFIG_NEED_SG_DMA_LENGTH=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_SWIOTLB=y
+# CONFIG_DMA_API_DEBUG is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_CHECK_SIGNATURE=y
@ -5520,6 +5550,7 @@ CONFIG_SBITMAP=y
 # printk and dmesg options
 #
 CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
@ -5535,7 +5566,6 @@ CONFIG_FRAME_WARN=1024
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_PAGE_OWNER is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
@ -5553,6 +5583,7 @@ CONFIG_DEBUG_KERNEL=y
 #
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
@ -5701,7 +5732,6 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
 CONFIG_TRACING_EVENTS_GPIO=y
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_DMA_API_DEBUG is not set
 CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_LKDTM is not set
 # CONFIG_TEST_LIST_SORT is not set
@ -5725,6 +5755,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_HASH is not set
 # CONFIG_TEST_IDA is not set
 # CONFIG_TEST_LKM is not set
+# CONFIG_TEST_VMALLOC is not set
 # CONFIG_TEST_USER_COPY is not set
 # CONFIG_TEST_BPF is not set
 # CONFIG_FIND_BIT_BENCHMARK is not set
@ -5734,6 +5765,7 @@ CONFIG_RUNTIME_TESTING_MENU=y
 # CONFIG_TEST_STATIC_KEYS is not set
 # CONFIG_TEST_KMOD is not set
 # CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_STACKINIT is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
 # CONFIG_SAMPLES is not set
@ -5741,6 +5773,7 @@ CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
 # CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 CONFIG_STRICT_DEVMEM=y
 # CONFIG_IO_STRICT_DEVMEM is not set
--- a/projects/Generic/options
+++ b/projects/Generic/options
@ -97,7 +97,7 @@
  # driver addons to install:
  # for a list of additional drivers see packages/linux-driver-addons
  # Space separated list is supported,
-    DRIVER_ADDONS="crazycat digital_devices dvb-latest"
+#    DRIVER_ADDONS="crazycat digital_devices dvb-latest"

  # Default size of the ova image, in MB, eg. 4096
    OVA_SIZE="4096"
--- a/projects/RPi/devices/RPi/linux/linux.arm.conf
+++ b/projects/RPi/devices/RPi/linux/linux.arm.conf
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.0.8 Kernel Configuration
+# Linux/arm 5.1.0-rc7 Kernel Configuration
 #

 #
@ -10,6 +10,7 @@ CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=70200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y

@ -162,6 +163,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
@ -399,6 +401,7 @@ CONFIG_ARM_BCM2835_CPUFREQ=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_CPU_IDLE_GOV_TEO is not set

 #
 # ARM CPU Idle Drivers
@ -473,6 +476,7 @@ CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_32BIT_OFF_T=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_RSEQ=y
 CONFIG_HAVE_CLK=y
@ -498,6 +502,7 @@ CONFIG_ARCH_MMAP_RND_BITS=8
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
 # CONFIG_STRICT_KERNEL_RWX is not set
@ -629,6 +634,7 @@ CONFIG_SKB_EXTENSIONS=y
 CONFIG_PACKET=y
 # CONFIG_PACKET_DIAG is not set
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 # CONFIG_UNIX_DIAG is not set
 # CONFIG_TLS is not set
 # CONFIG_XFRM_USER is not set
@ -751,6 +757,7 @@ CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_MASQUERADE=y
 # CONFIG_NF_TABLES is not set
 CONFIG_NETFILTER_XTABLES=m

@ -844,8 +851,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 # CONFIG_NF_LOG_ARP is not set
 # CONFIG_NF_LOG_IPV4 is not set
 CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_IPV4=m
-CONFIG_NF_NAT_MASQUERADE_IPV4=y
 CONFIG_IP_NF_IPTABLES=m
 # CONFIG_IP_NF_MATCH_AH is not set
 # CONFIG_IP_NF_MATCH_ECN is not set
@ -873,7 +878,6 @@ CONFIG_IP_NF_MANGLE=m
 # CONFIG_NF_DUP_IPV6 is not set
 CONFIG_NF_REJECT_IPV6=m
 # CONFIG_NF_LOG_IPV6 is not set
-CONFIG_NF_NAT_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 # CONFIG_IP6_NF_MATCH_AH is not set
 # CONFIG_IP6_NF_MATCH_EUI64 is not set
@ -1087,7 +1091,6 @@ CONFIG_RFKILL_INPUT=y
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 # CONFIG_NET_DEVLINK is not set
-CONFIG_MAY_USE_DEVLINK=y
 # CONFIG_FAILOVER is not set
 CONFIG_HAVE_EBPF_JIT=y

@ -1127,17 +1130,6 @@ CONFIG_REGMAP_MMIO=m
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
-CONFIG_DMA_CMA=y
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=5
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8

 #
 # Bus devices
@ -1244,6 +1236,7 @@ CONFIG_EEPROM_93CX6=m
 #
 # VOP Bus Driver
 #
+# CONFIG_VOP_BUS is not set

 #
 # Intel MIC Host Driver
@ -1305,7 +1298,6 @@ CONFIG_ISCSI_BOOT_SYSFS=y
 # CONFIG_SCSI_UFSHCD is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_DH is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
 # CONFIG_ATA is not set
 # CONFIG_MD is not set
 # CONFIG_TARGET_CORE is not set
@ -1346,6 +1338,7 @@ CONFIG_MDIO_BUS=y
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 # CONFIG_MDIO_MSCC_MIIM is not set
 CONFIG_PHYLIB=y
@ -1745,6 +1738,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
 # CONFIG_INPUT_BMA150 is not set
 # CONFIG_INPUT_E3X0_BUTTON is not set
+# CONFIG_INPUT_MSM_VIBRATOR is not set
 # CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_GP2A is not set
 # CONFIG_INPUT_GPIO_BEEPER is not set
@ -1961,12 +1955,14 @@ CONFIG_SPI_BCM2835AUX=m
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_ROCKCHIP is not set
 # CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
@ -2029,12 +2025,14 @@ CONFIG_GPIO_BCM_VIRT=y
 # CONFIG_GPIO_PL061 is not set
 # CONFIG_GPIO_XILINX is not set
 # CONFIG_GPIO_ZEVIO is not set
+# CONFIG_GPIO_AMD_FCH is not set

 #
 # I2C GPIO expanders
 #
 # CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_GW_PLD is not set
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
@ -2419,6 +2417,8 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_TQMX86 is not set
+# CONFIG_MFD_LOCHNAGAR is not set
 CONFIG_MFD_ARIZONA=y
 CONFIG_MFD_ARIZONA_I2C=m
 CONFIG_MFD_ARIZONA_SPI=m
@ -2433,6 +2433,7 @@ CONFIG_MFD_WM5102=y
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_STPMIC1 is not set
 # CONFIG_RAVE_SP_CORE is not set
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
@ -2723,10 +2724,6 @@ CONFIG_VIDEO_CX25840=m
 # Miscellaneous helper chips
 #

-#
-# Sensors used on soc_camera driver
-#
-
 #
 # Media SPI Adapters
 #
@ -2922,8 +2919,13 @@ CONFIG_DRM_KMS_CMA_HELPER=y
 # CONFIG_DRM_I2C_SIL164 is not set
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+
+#
+# ARM devices
+#
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_MALI_DISPLAY is not set
+# CONFIG_DRM_KOMEDA is not set

 #
 # ACP (Audio CoProcessor) Configuration
@ -2954,6 +2956,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
@ -2968,7 +2971,9 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
@ -2996,6 +3001,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_V3D is not set
 CONFIG_DRM_VC4=m
 # CONFIG_DRM_VC4_HDMI_CEC is not set
+# CONFIG_DRM_ETNAVIV is not set
 # CONFIG_DRM_ARCPGU is not set
 # CONFIG_DRM_MXSFB is not set
 # CONFIG_DRM_TINYDRM is not set
@ -3173,14 +3179,18 @@ CONFIG_SND_RPI_WM8804_SOUNDCARD=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_ESAI is not set
+# CONFIG_SND_SOC_FSL_MICFIL is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_SOC_IMG is not set
+# CONFIG_SND_SOC_MTK_BTCVSD is not set

 #
 # STMicroelectronics STM32 SOC audio support
 #
 # CONFIG_SND_SOC_XILINX_I2S is not set
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 # CONFIG_ZX_TDM is not set
 CONFIG_SND_SOC_I2C_AND_SPI=m
@ -3214,6 +3224,7 @@ CONFIG_SND_SOC_AK4554=m
 # CONFIG_SND_SOC_CS35L33 is not set
 # CONFIG_SND_SOC_CS35L34 is not set
 # CONFIG_SND_SOC_CS35L35 is not set
+# CONFIG_SND_SOC_CS35L36 is not set
 # CONFIG_SND_SOC_CS42L42 is not set
 # CONFIG_SND_SOC_CS42L51_I2C is not set
 # CONFIG_SND_SOC_CS42L52 is not set
@ -3227,6 +3238,7 @@ CONFIG_SND_SOC_CS4271_I2C=m
 CONFIG_SND_SOC_CS42XX8=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 # CONFIG_SND_SOC_CS43130 is not set
+# CONFIG_SND_SOC_CS4341 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
 CONFIG_SND_SOC_DMIC=m
@ -3259,6 +3271,7 @@ CONFIG_SND_SOC_PCM5102A=m
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
 # CONFIG_SND_SOC_PCM512x_SPI is not set
+# CONFIG_SND_SOC_RK3328 is not set
 # CONFIG_SND_SOC_RT5616 is not set
 CONFIG_SND_SOC_PCM1794A=m
 # CONFIG_SND_SOC_RT5631 is not set
@ -3312,6 +3325,7 @@ CONFIG_SND_SOC_WM8804=m
 CONFIG_SND_SOC_WM8804_I2C=m
 # CONFIG_SND_SOC_WM8804_SPI is not set
 # CONFIG_SND_SOC_WM8903 is not set
+# CONFIG_SND_SOC_WM8904 is not set
 # CONFIG_SND_SOC_WM8960 is not set
 # CONFIG_SND_SOC_WM8962 is not set
 # CONFIG_SND_SOC_WM8974 is not set
@ -3320,6 +3334,7 @@ CONFIG_SND_SOC_WM8804_I2C=m
 # CONFIG_SND_SOC_ZX_AUD96P22 is not set
 # CONFIG_SND_SOC_MAX9759 is not set
 # CONFIG_SND_SOC_MT6351 is not set
+# CONFIG_SND_SOC_MT6358 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
@ -3328,9 +3343,7 @@ CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_I_SABRE_CODEC=m
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
-# CONFIG_SND_SIMPLE_SCU_CARD is not set
 CONFIG_SND_AUDIO_GRAPH_CARD=m
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set

 #
 # HID support
@ -3377,6 +3390,7 @@ CONFIG_HID_EZKEY=y
 CONFIG_HID_KYE=y
 # CONFIG_HID_UCLOGIC is not set
 # CONFIG_HID_WALTOP is not set
+# CONFIG_HID_VIEWSONIC is not set
 CONFIG_HID_GYRATION=y
 # CONFIG_HID_ICADE is not set
 # CONFIG_HID_ITE is not set
@ -3394,6 +3408,7 @@ CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWHEELS_FF=y
 # CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MALTRON is not set
 # CONFIG_HID_MAYFLASH is not set
 # CONFIG_HID_REDRAGON is not set
 CONFIG_HID_MICROSOFT=y
@ -3464,6 +3479,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
+CONFIG_USB_AUTOSUSPEND_DELAY=2
 CONFIG_USB_MON=m
 # CONFIG_USB_WUSB_CBAF is not set

@ -3761,6 +3777,7 @@ CONFIG_RTC_INTF_DEV=y
 # I2C RTC drivers
 #
 # CONFIG_RTC_DRV_ABB5ZES3 is not set
+# CONFIG_RTC_DRV_ABEOZ9 is not set
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_DS1307=m
 # CONFIG_RTC_DRV_DS1307_CENTURY is not set
@ -3788,6 +3805,7 @@ CONFIG_RTC_DRV_PCF8563=m
 # CONFIG_RTC_DRV_EM3027 is not set
 # CONFIG_RTC_DRV_RV3028 is not set
 # CONFIG_RTC_DRV_RV8803 is not set
+# CONFIG_RTC_DRV_SD3078 is not set

 #
 # SPI RTC drivers
@ -3842,6 +3860,7 @@ CONFIG_RTC_DRV_PCF2127=m
 #
 # CONFIG_RTC_DRV_PL030 is not set
 # CONFIG_RTC_DRV_PL031 is not set
+# CONFIG_RTC_DRV_CADENCE is not set
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_SNVS is not set
 # CONFIG_RTC_DRV_R7301 is not set
@ -3849,7 +3868,6 @@ CONFIG_RTC_DRV_PCF2127=m
 #
 # HID Sensor RTC drivers
 #
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set

@ -3864,6 +3882,7 @@ CONFIG_DMA_OF=y
 CONFIG_DMA_BCM2835=y
 # CONFIG_DW_AXI_DMAC is not set
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_QDMA is not set
 # CONFIG_INTEL_IDMA64 is not set
 # CONFIG_NBPFAXI_DMA is not set
 # CONFIG_PL330_DMA is not set
@ -3907,6 +3926,10 @@ CONFIG_VT6656=m
 # CONFIG_SPEAKUP is not set
 CONFIG_STAGING_MEDIA=y

+#
+# soc_camera sensor drivers
+#
+
 #
 # Android
 #
@ -3926,7 +3949,6 @@ CONFIG_BCM2835_VCHIQ=y
 CONFIG_SND_BCM2835=m
 # CONFIG_VIDEO_BCM2835 is not set
 # CONFIG_PI433 is not set
-# CONFIG_MTK_MMC is not set

 #
 # Gasket devices
@ -3955,6 +3977,7 @@ CONFIG_COMMON_CLK=y
 # CONFIG_CLK_QORIQ is not set
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_VC5 is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
 # CONFIG_HWSPINLOCK is not set

 #
@ -3997,6 +4020,7 @@ CONFIG_BCM2835_MBOX=y
 #
 # Broadcom SoC drivers
 #
+CONFIG_BCM2835_POWER=y
 CONFIG_RASPBERRYPI_POWER=y
 # CONFIG_SOC_BRCMSTB is not set

@ -4026,6 +4050,7 @@ CONFIG_EXTCON=m
 CONFIG_EXTCON_ARIZONA=m
 # CONFIG_EXTCON_GPIO is not set
 # CONFIG_EXTCON_MAX3355 is not set
+# CONFIG_EXTCON_PTN5150 is not set
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
 # CONFIG_EXTCON_USB_GPIO is not set
@ -4053,6 +4078,7 @@ CONFIG_RESET_CONTROLLER=y
 # CONFIG_GENERIC_PHY is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_DP is not set
+# CONFIG_PHY_CADENCE_DPHY is not set
 # CONFIG_PHY_CADENCE_SIERRA is not set
 # CONFIG_PHY_FSL_IMX8MQ_USB is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
@ -4085,11 +4111,13 @@ CONFIG_NVMEM=y
 # CONFIG_FSI is not set
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
+# CONFIG_INTERCONNECT is not set

 #
 # File systems
 #
 CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
 CONFIG_FS_IOMAP=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
@ -4097,7 +4125,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_ENCRYPTION is not set
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
@ -4262,6 +4289,7 @@ CONFIG_SUNRPC_GSS=y
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 # CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=y
@ -4344,7 +4372,7 @@ CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 # CONFIG_FORTIFY_SOURCE is not set
 # CONFIG_STATIC_USERMODEHELPER is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
+CONFIG_LSM="yama,loadpin,safesetid,integrity"
 CONFIG_XOR_BLOCKS=m
 CONFIG_CRYPTO=y

@ -4559,8 +4587,22 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_DMA_DECLARE_COHERENT=y
+CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
+CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_DMA_REMAP=y
+CONFIG_DMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=5
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+# CONFIG_DMA_API_DEBUG is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_DQL=y
 CONFIG_GLOB=y
@ -4589,6 +4631,7 @@ CONFIG_SBITMAP=y
 # printk and dmesg options
 #
 CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
@ -4604,7 +4647,6 @@ CONFIG_FRAME_WARN=1024
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_PAGE_OWNER is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
@ -4622,6 +4664,7 @@ CONFIG_DEBUG_KERNEL=y
 #
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_OBJECTS is not set
@ -4742,7 +4785,6 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
 CONFIG_TRACING_EVENTS_GPIO=y
-# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
@ -4750,12 +4792,12 @@ CONFIG_TRACING_EVENTS_GPIO=y
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 # CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 # CONFIG_STRICT_DEVMEM is not set
 # CONFIG_ARM_PTDUMP_DEBUGFS is not set
 # CONFIG_DEBUG_WX is not set
 CONFIG_UNWINDER_FRAME_POINTER=y
-# CONFIG_UNWINDER_ARM is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_LL is not set
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
--- a/projects/RPi/devices/RPi2/linux/linux.arm.conf
+++ b/projects/RPi/devices/RPi2/linux/linux.arm.conf
@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 5.0.8 Kernel Configuration
+# Linux/arm 5.1.0-rc7 Kernel Configuration
 #

 #
@ -10,6 +10,7 @@ CONFIG_CC_IS_GCC=y
 CONFIG_GCC_VERSION=70200
 CONFIG_CLANG_VERSION=0
 CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_EXTABLE_SORT=y

@ -171,6 +172,7 @@ CONFIG_TIMERFD=y
 CONFIG_EVENTFD=y
 CONFIG_SHMEM=y
 CONFIG_AIO=y
+CONFIG_IO_URING=y
 CONFIG_ADVISE_SYSCALLS=y
 CONFIG_MEMBARRIER=y
 CONFIG_KALLSYMS=y
@ -296,6 +298,7 @@ CONFIG_ARCH_BCM2835=y
 # CONFIG_ARCH_KEYSTONE is not set
 # CONFIG_ARCH_MEDIATEK is not set
 # CONFIG_ARCH_MESON is not set
+# CONFIG_ARCH_MILBEAUT is not set
 # CONFIG_ARCH_MMP is not set
 # CONFIG_ARCH_MVEBU is not set
 # CONFIG_ARCH_NPCM is not set
@ -489,6 +492,7 @@ CONFIG_ARM_BCM2835_CPUFREQ=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_CPU_IDLE_GOV_TEO is not set

 #
 # ARM CPU Idle Drivers
@ -532,7 +536,6 @@ CONFIG_ARCH_HIBERNATION_POSSIBLE=y
 # CONFIG_FIRMWARE_MEMMAP is not set
 CONFIG_RASPBERRYPI_FIRMWARE=y
 # CONFIG_FW_CFG_SYSFS is not set
-# CONFIG_INTEL_STRATIX10_SERVICE is not set
 CONFIG_HAVE_ARM_SMCCC=y
 # CONFIG_GOOGLE_FIRMWARE is not set

@ -578,6 +581,7 @@ CONFIG_GENERIC_IDLE_POLL_SETUP=y
 CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
 CONFIG_ARCH_HAS_SET_MEMORY=y
 CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_32BIT_OFF_T=y
 CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
 CONFIG_HAVE_RSEQ=y
 CONFIG_HAVE_CLK=y
@ -603,6 +607,7 @@ CONFIG_ARCH_MMAP_RND_BITS=8
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OLD_SIGACTION=y
+CONFIG_COMPAT_32BIT_TIME=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
 CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
@ -737,6 +742,7 @@ CONFIG_SKB_EXTENSIONS=y
 CONFIG_PACKET=y
 # CONFIG_PACKET_DIAG is not set
 CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
 # CONFIG_UNIX_DIAG is not set
 # CONFIG_TLS is not set
 # CONFIG_XFRM_USER is not set
@ -859,6 +865,7 @@ CONFIG_NF_NAT_NEEDED=y
 CONFIG_NF_NAT_FTP=m
 CONFIG_NF_NAT_IRC=m
 CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_MASQUERADE=y
 # CONFIG_NF_TABLES is not set
 CONFIG_NETFILTER_XTABLES=m

@ -952,8 +959,6 @@ CONFIG_NF_DEFRAG_IPV4=m
 # CONFIG_NF_LOG_ARP is not set
 # CONFIG_NF_LOG_IPV4 is not set
 CONFIG_NF_REJECT_IPV4=m
-CONFIG_NF_NAT_IPV4=m
-CONFIG_NF_NAT_MASQUERADE_IPV4=y
 CONFIG_IP_NF_IPTABLES=m
 # CONFIG_IP_NF_MATCH_AH is not set
 # CONFIG_IP_NF_MATCH_ECN is not set
@ -981,7 +986,6 @@ CONFIG_IP_NF_MANGLE=m
 # CONFIG_NF_DUP_IPV6 is not set
 CONFIG_NF_REJECT_IPV6=m
 # CONFIG_NF_LOG_IPV6 is not set
-CONFIG_NF_NAT_IPV6=m
 CONFIG_IP6_NF_IPTABLES=m
 # CONFIG_IP6_NF_MATCH_AH is not set
 # CONFIG_IP6_NF_MATCH_EUI64 is not set
@ -1199,7 +1203,6 @@ CONFIG_RFKILL_INPUT=y
 CONFIG_DST_CACHE=y
 CONFIG_GRO_CELLS=y
 # CONFIG_NET_DEVLINK is not set
-CONFIG_MAY_USE_DEVLINK=y
 # CONFIG_FAILOVER is not set
 CONFIG_HAVE_EBPF_JIT=y

@ -1239,17 +1242,6 @@ CONFIG_REGMAP_MMIO=y
 CONFIG_REGMAP_IRQ=y
 CONFIG_DMA_SHARED_BUFFER=y
 # CONFIG_DMA_FENCE_TRACE is not set
-CONFIG_DMA_CMA=y
-
-#
-# Default contiguous memory area size:
-#
-CONFIG_CMA_SIZE_MBYTES=5
-CONFIG_CMA_SIZE_SEL_MBYTES=y
-# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
-# CONFIG_CMA_SIZE_SEL_MIN is not set
-# CONFIG_CMA_SIZE_SEL_MAX is not set
-CONFIG_CMA_ALIGNMENT=8
 CONFIG_GENERIC_ARCH_TOPOLOGY=y

 #
@ -1357,6 +1349,7 @@ CONFIG_EEPROM_93CX6=m
 #
 # VOP Bus Driver
 #
+# CONFIG_VOP_BUS is not set

 #
 # Intel MIC Host Driver
@ -1418,7 +1411,6 @@ CONFIG_ISCSI_BOOT_SYSFS=y
 # CONFIG_SCSI_UFSHCD is not set
 # CONFIG_SCSI_DEBUG is not set
 # CONFIG_SCSI_DH is not set
-# CONFIG_SCSI_OSD_INITIATOR is not set
 # CONFIG_ATA is not set
 # CONFIG_MD is not set
 # CONFIG_TARGET_CORE is not set
@ -1459,6 +1451,7 @@ CONFIG_MDIO_BUS=y
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
 # CONFIG_MDIO_MSCC_MIIM is not set
 CONFIG_PHYLIB=y
@ -1858,6 +1851,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INPUT_ATMEL_CAPTOUCH is not set
 # CONFIG_INPUT_BMA150 is not set
 # CONFIG_INPUT_E3X0_BUTTON is not set
+# CONFIG_INPUT_MSM_VIBRATOR is not set
 # CONFIG_INPUT_MMA8450 is not set
 # CONFIG_INPUT_GP2A is not set
 # CONFIG_INPUT_GPIO_BEEPER is not set
@ -2074,12 +2068,14 @@ CONFIG_SPI_BCM2835AUX=m
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_SPI_CADENCE is not set
 # CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
 # CONFIG_SPI_GPIO is not set
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_OC_TINY is not set
 # CONFIG_SPI_PL022 is not set
 # CONFIG_SPI_ROCKCHIP is not set
 # CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
 # CONFIG_SPI_MXIC is not set
 # CONFIG_SPI_XCOMM is not set
 # CONFIG_SPI_XILINX is not set
@ -2144,12 +2140,14 @@ CONFIG_GPIO_BCM_VIRT=y
 # CONFIG_GPIO_SYSCON is not set
 # CONFIG_GPIO_XILINX is not set
 # CONFIG_GPIO_ZEVIO is not set
+# CONFIG_GPIO_AMD_FCH is not set

 #
 # I2C GPIO expanders
 #
 # CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_ADNP is not set
+# CONFIG_GPIO_GW_PLD is not set
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
@ -2537,6 +2535,8 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_T7L66XB is not set
 # CONFIG_MFD_TC6387XB is not set
 # CONFIG_MFD_TC6393XB is not set
+# CONFIG_MFD_TQMX86 is not set
+# CONFIG_MFD_LOCHNAGAR is not set
 CONFIG_MFD_ARIZONA=y
 CONFIG_MFD_ARIZONA_I2C=m
 CONFIG_MFD_ARIZONA_SPI=m
@ -2551,6 +2551,7 @@ CONFIG_MFD_WM5102=y
 # CONFIG_MFD_WM8350_I2C is not set
 # CONFIG_MFD_WM8994 is not set
 # CONFIG_MFD_ROHM_BD718XX is not set
+# CONFIG_MFD_STPMIC1 is not set
 # CONFIG_RAVE_SP_CORE is not set
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
@ -2842,10 +2843,6 @@ CONFIG_VIDEO_CX25840=m
 # Miscellaneous helper chips
 #

-#
-# Sensors used on soc_camera driver
-#
-
 #
 # Media SPI Adapters
 #
@ -3041,8 +3038,13 @@ CONFIG_DRM_KMS_CMA_HELPER=y
 # CONFIG_DRM_I2C_SIL164 is not set
 # CONFIG_DRM_I2C_NXP_TDA998X is not set
 # CONFIG_DRM_I2C_NXP_TDA9950 is not set
+
+#
+# ARM devices
+#
 # CONFIG_DRM_HDLCD is not set
 # CONFIG_DRM_MALI_DISPLAY is not set
+# CONFIG_DRM_KOMEDA is not set

 #
 # ACP (Audio CoProcessor) Configuration
@ -3074,6 +3076,7 @@ CONFIG_DRM_PANEL=y
 # CONFIG_DRM_PANEL_ILITEK_ILI9881C is not set
 # CONFIG_DRM_PANEL_INNOLUX_P079ZCA is not set
 # CONFIG_DRM_PANEL_JDI_LT070ME05000 is not set
+# CONFIG_DRM_PANEL_KINGDISPLAY_KD097D04 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_OLIMEX_LCD_OLINUXINO is not set
@ -3088,7 +3091,9 @@ CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS043T1LE01 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7701 is not set
 # CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
+# CONFIG_DRM_PANEL_TPO_TPG110 is not set
 # CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA is not set
 CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_PANEL_BRIDGE=y
@ -3116,6 +3121,7 @@ CONFIG_DRM_PANEL_BRIDGE=y
 # CONFIG_DRM_V3D is not set
 CONFIG_DRM_VC4=m
 # CONFIG_DRM_VC4_HDMI_CEC is not set
+# CONFIG_DRM_ETNAVIV is not set
 # CONFIG_DRM_ARCPGU is not set
 # CONFIG_DRM_MXSFB is not set
 # CONFIG_DRM_TINYDRM is not set
@ -3293,14 +3299,18 @@ CONFIG_SND_RPI_WM8804_SOUNDCARD=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_ESAI is not set
+# CONFIG_SND_SOC_FSL_MICFIL is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_I2S_HI6210_I2S is not set
 # CONFIG_SND_SOC_IMG is not set
+# CONFIG_SND_SOC_MTK_BTCVSD is not set

 #
 # STMicroelectronics STM32 SOC audio support
 #
 # CONFIG_SND_SOC_XILINX_I2S is not set
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
 # CONFIG_ZX_TDM is not set
 CONFIG_SND_SOC_I2C_AND_SPI=m
@ -3334,6 +3344,7 @@ CONFIG_SND_SOC_AK4554=m
 # CONFIG_SND_SOC_CS35L33 is not set
 # CONFIG_SND_SOC_CS35L34 is not set
 # CONFIG_SND_SOC_CS35L35 is not set
+# CONFIG_SND_SOC_CS35L36 is not set
 # CONFIG_SND_SOC_CS42L42 is not set
 # CONFIG_SND_SOC_CS42L51_I2C is not set
 # CONFIG_SND_SOC_CS42L52 is not set
@ -3347,6 +3358,7 @@ CONFIG_SND_SOC_CS4271_I2C=m
 CONFIG_SND_SOC_CS42XX8=m
 CONFIG_SND_SOC_CS42XX8_I2C=m
 # CONFIG_SND_SOC_CS43130 is not set
+# CONFIG_SND_SOC_CS4341 is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
 CONFIG_SND_SOC_DMIC=m
@ -3379,6 +3391,7 @@ CONFIG_SND_SOC_PCM5102A=m
 CONFIG_SND_SOC_PCM512x=m
 CONFIG_SND_SOC_PCM512x_I2C=m
 # CONFIG_SND_SOC_PCM512x_SPI is not set
+# CONFIG_SND_SOC_RK3328 is not set
 # CONFIG_SND_SOC_RT5616 is not set
 CONFIG_SND_SOC_PCM1794A=m
 # CONFIG_SND_SOC_RT5631 is not set
@ -3432,6 +3445,7 @@ CONFIG_SND_SOC_WM8804=m
 CONFIG_SND_SOC_WM8804_I2C=m
 # CONFIG_SND_SOC_WM8804_SPI is not set
 # CONFIG_SND_SOC_WM8903 is not set
+# CONFIG_SND_SOC_WM8904 is not set
 # CONFIG_SND_SOC_WM8960 is not set
 # CONFIG_SND_SOC_WM8962 is not set
 # CONFIG_SND_SOC_WM8974 is not set
@ -3440,6 +3454,7 @@ CONFIG_SND_SOC_WM8804_I2C=m
 # CONFIG_SND_SOC_ZX_AUD96P22 is not set
 # CONFIG_SND_SOC_MAX9759 is not set
 # CONFIG_SND_SOC_MT6351 is not set
+# CONFIG_SND_SOC_MT6358 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
 # CONFIG_SND_SOC_NAU8822 is not set
@ -3448,9 +3463,7 @@ CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_I_SABRE_CODEC=m
 CONFIG_SND_SIMPLE_CARD_UTILS=m
 CONFIG_SND_SIMPLE_CARD=m
-# CONFIG_SND_SIMPLE_SCU_CARD is not set
 CONFIG_SND_AUDIO_GRAPH_CARD=m
-# CONFIG_SND_AUDIO_GRAPH_SCU_CARD is not set

 #
 # HID support
@ -3497,6 +3510,7 @@ CONFIG_HID_EZKEY=y
 CONFIG_HID_KYE=y
 # CONFIG_HID_UCLOGIC is not set
 # CONFIG_HID_WALTOP is not set
+# CONFIG_HID_VIEWSONIC is not set
 CONFIG_HID_GYRATION=y
 # CONFIG_HID_ICADE is not set
 # CONFIG_HID_ITE is not set
@ -3514,6 +3528,7 @@ CONFIG_LOGIRUMBLEPAD2_FF=y
 CONFIG_LOGIG940_FF=y
 CONFIG_LOGIWHEELS_FF=y
 # CONFIG_HID_MAGICMOUSE is not set
+# CONFIG_HID_MALTRON is not set
 # CONFIG_HID_MAYFLASH is not set
 # CONFIG_HID_REDRAGON is not set
 CONFIG_HID_MICROSOFT=y
@ -3584,6 +3599,7 @@ CONFIG_USB_DEFAULT_PERSIST=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 # CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
+CONFIG_USB_AUTOSUSPEND_DELAY=2
 CONFIG_USB_MON=m
 # CONFIG_USB_WUSB_CBAF is not set

@ -3882,6 +3898,7 @@ CONFIG_RTC_INTF_DEV=y
 # I2C RTC drivers
 #
 # CONFIG_RTC_DRV_ABB5ZES3 is not set
+# CONFIG_RTC_DRV_ABEOZ9 is not set
 CONFIG_RTC_DRV_ABX80X=m
 CONFIG_RTC_DRV_DS1307=m
 # CONFIG_RTC_DRV_DS1307_CENTURY is not set
@ -3909,6 +3926,7 @@ CONFIG_RTC_DRV_PCF8563=m
 # CONFIG_RTC_DRV_EM3027 is not set
 # CONFIG_RTC_DRV_RV3028 is not set
 # CONFIG_RTC_DRV_RV8803 is not set
+# CONFIG_RTC_DRV_SD3078 is not set

 #
 # SPI RTC drivers
@ -3963,6 +3981,7 @@ CONFIG_RTC_DRV_PCF2127=m
 #
 # CONFIG_RTC_DRV_PL030 is not set
 # CONFIG_RTC_DRV_PL031 is not set
+# CONFIG_RTC_DRV_CADENCE is not set
 # CONFIG_RTC_DRV_FTRTC010 is not set
 # CONFIG_RTC_DRV_SNVS is not set
 # CONFIG_RTC_DRV_R7301 is not set
@ -3970,7 +3989,6 @@ CONFIG_RTC_DRV_PCF2127=m
 #
 # HID Sensor RTC drivers
 #
-# CONFIG_RTC_DRV_HID_SENSOR_TIME is not set
 CONFIG_DMADEVICES=y
 # CONFIG_DMADEVICES_DEBUG is not set

@ -3985,6 +4003,7 @@ CONFIG_DMA_OF=y
 CONFIG_DMA_BCM2835=y
 # CONFIG_DW_AXI_DMAC is not set
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_QDMA is not set
 # CONFIG_INTEL_IDMA64 is not set
 # CONFIG_NBPFAXI_DMA is not set
 # CONFIG_PL330_DMA is not set
@ -4028,6 +4047,10 @@ CONFIG_VT6656=m
 # CONFIG_SPEAKUP is not set
 CONFIG_STAGING_MEDIA=y

+#
+# soc_camera sensor drivers
+#
+
 #
 # Android
 #
@ -4047,7 +4070,6 @@ CONFIG_BCM2835_VCHIQ=y
 CONFIG_SND_BCM2835=m
 # CONFIG_VIDEO_BCM2835 is not set
 # CONFIG_PI433 is not set
-# CONFIG_MTK_MMC is not set

 #
 # Gasket devices
@ -4076,6 +4098,7 @@ CONFIG_COMMON_CLK=y
 # CONFIG_CLK_QORIQ is not set
 # CONFIG_COMMON_CLK_PWM is not set
 # CONFIG_COMMON_CLK_VC5 is not set
+# CONFIG_COMMON_CLK_FIXED_MMIO is not set
 # CONFIG_HWSPINLOCK is not set

 #
@ -4120,6 +4143,7 @@ CONFIG_BCM2835_MBOX=y
 #
 # Broadcom SoC drivers
 #
+CONFIG_BCM2835_POWER=y
 CONFIG_RASPBERRYPI_POWER=y
 # CONFIG_SOC_BRCMSTB is not set

@ -4149,6 +4173,7 @@ CONFIG_EXTCON=m
 CONFIG_EXTCON_ARIZONA=m
 # CONFIG_EXTCON_GPIO is not set
 # CONFIG_EXTCON_MAX3355 is not set
+# CONFIG_EXTCON_PTN5150 is not set
 # CONFIG_EXTCON_RT8973A is not set
 # CONFIG_EXTCON_SM5502 is not set
 # CONFIG_EXTCON_USB_GPIO is not set
@ -4176,6 +4201,7 @@ CONFIG_RESET_CONTROLLER=y
 # CONFIG_GENERIC_PHY is not set
 # CONFIG_BCM_KONA_USB2_PHY is not set
 # CONFIG_PHY_CADENCE_DP is not set
+# CONFIG_PHY_CADENCE_DPHY is not set
 # CONFIG_PHY_CADENCE_SIERRA is not set
 # CONFIG_PHY_FSL_IMX8MQ_USB is not set
 # CONFIG_PHY_PXA_28NM_HSIC is not set
@ -4211,11 +4237,13 @@ CONFIG_NVMEM=y
 # CONFIG_TEE is not set
 # CONFIG_SIOX is not set
 # CONFIG_SLIMBUS is not set
+# CONFIG_INTERCONNECT is not set

 #
 # File systems
 #
 CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
 CONFIG_FS_IOMAP=y
 # CONFIG_EXT2_FS is not set
 # CONFIG_EXT3_FS is not set
@ -4223,7 +4251,6 @@ CONFIG_EXT4_FS=y
 CONFIG_EXT4_USE_FOR_EXT2=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_ENCRYPTION is not set
 # CONFIG_EXT4_DEBUG is not set
 CONFIG_JBD2=y
 # CONFIG_JBD2_DEBUG is not set
@ -4388,6 +4415,7 @@ CONFIG_SUNRPC_GSS=y
 CONFIG_SUNRPC_BACKCHANNEL=y
 CONFIG_SUNRPC_SWAP=y
 CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
 # CONFIG_SUNRPC_DEBUG is not set
 # CONFIG_CEPH_FS is not set
 CONFIG_CIFS=y
@ -4470,7 +4498,7 @@ CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
 # CONFIG_FORTIFY_SOURCE is not set
 # CONFIG_STATIC_USERMODEHELPER is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
-CONFIG_DEFAULT_SECURITY=""
+CONFIG_LSM="yama,loadpin,safesetid,integrity"
 CONFIG_XOR_BLOCKS=m
 CONFIG_CRYPTO=y

@ -4688,8 +4716,22 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HAS_DMA=y
 CONFIG_NEED_DMA_MAP_STATE=y
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
+CONFIG_DMA_DECLARE_COHERENT=y
+CONFIG_ARCH_HAS_SETUP_DMA_OPS=y
+CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_DMA_REMAP=y
+CONFIG_DMA_CMA=y
+
+#
+# Default contiguous memory area size:
+#
+CONFIG_CMA_SIZE_MBYTES=5
+CONFIG_CMA_SIZE_SEL_MBYTES=y
+# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set
+# CONFIG_CMA_SIZE_SEL_MIN is not set
+# CONFIG_CMA_SIZE_SEL_MAX is not set
+CONFIG_CMA_ALIGNMENT=8
+# CONFIG_DMA_API_DEBUG is not set
 CONFIG_SGL_ALLOC=y
 CONFIG_CPU_RMAP=y
 CONFIG_DQL=y
@ -4719,6 +4761,7 @@ CONFIG_SBITMAP=y
 # printk and dmesg options
 #
 CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
@ -4734,7 +4777,6 @@ CONFIG_FRAME_WARN=1024
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_PAGE_OWNER is not set
 CONFIG_DEBUG_FS=y
 # CONFIG_HEADERS_CHECK is not set
 # CONFIG_DEBUG_SECTION_MISMATCH is not set
@ -4752,6 +4794,7 @@ CONFIG_DEBUG_KERNEL=y
 #
 # CONFIG_PAGE_EXTENSION is not set
 # CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_OWNER is not set
 # CONFIG_PAGE_POISONING is not set
 # CONFIG_DEBUG_PAGE_REF is not set
 # CONFIG_DEBUG_RODATA_TEST is not set
@ -4876,7 +4919,6 @@ CONFIG_FTRACE_MCOUNT_RECORD=y
 # CONFIG_PREEMPTIRQ_DELAY_TEST is not set
 # CONFIG_TRACE_EVAL_MAP_FILE is not set
 CONFIG_TRACING_EVENTS_GPIO=y
-# CONFIG_DMA_API_DEBUG is not set
 # CONFIG_RUNTIME_TESTING_MENU is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_BUG_ON_DATA_CORRUPTION is not set
@ -4884,12 +4926,12 @@ CONFIG_TRACING_EVENTS_GPIO=y
 CONFIG_HAVE_ARCH_KGDB=y
 # CONFIG_KGDB is not set
 # CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
 CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
 # CONFIG_STRICT_DEVMEM is not set
 # CONFIG_ARM_PTDUMP_DEBUGFS is not set
 # CONFIG_DEBUG_WX is not set
 CONFIG_UNWINDER_FRAME_POINTER=y
-# CONFIG_UNWINDER_ARM is not set
 # CONFIG_DEBUG_USER is not set
 # CONFIG_DEBUG_LL is not set
 CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
--- a/projects/RPi/options
+++ b/projects/RPi/options
@ -136,7 +136,7 @@
  # driver addons to install:
  # for a list of additional drivers see packages/linux-driver-addons
  # Space separated list is supported,
-    DRIVER_ADDONS="crazycat dvb-latest"
+#    DRIVER_ADDONS="crazycat dvb-latest"

  # debug tty path
    DEBUG_TTY="/dev/console"