diff --git a/core/linux-armv5/PKGBUILD b/core/linux-armv5/PKGBUILD
index 71be8794a..d7a0f146f 100644
--- a/core/linux-armv5/PKGBUILD
+++ b/core/linux-armv5/PKGBUILD
@@ -4,10 +4,10 @@
 buildarch=2
 
 pkgbase=linux-armv5
-_srcname=linux-4.11
+_srcname=linux-4.12
 _kernelname=${pkgbase#linux}
 _desc="ARMv5 multi-platform"
-pkgver=4.11.8
+pkgver=4.12.0
 pkgrel=1
 arch=('arm')
 url="http://www.kernel.org/"
@@ -15,23 +15,22 @@ license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git')
 options=('!strip')
 source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
-        "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
+        #"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
         '0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
         '0002-at91-ariag25-updates.patch'
         '0003-at91-arietta-g25-support.patch'
         'config')
-md5sums=('251a5deee0fa6daf3f356b1bbda9eab8'
-         'fca793663570ab8849ac3930b909ba0a'
+md5sums=('fc454157e2d024d401a60905d6481c6b'
          '8effa2a3ad3f2f4383dbc66a19f6f364'
          'cb5aa24e94ee13ae9ac7d2f05431fae6'
          'd735d353b37df63ae975bc262ec39ace'
-         'a1f6c2092ef4f01c4c34416dbeb4799b')
+         'a4f7c97349f197221c23ccdda6ab0f00')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
 
   # add upstream patch
-  git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
+  #git apply --whitespace=nowarn "${srcdir}/patch-${pkgver}"
 
   # ALARM patches
   git apply ../0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
diff --git a/core/linux-armv5/config b/core/linux-armv5/config
index 4a91168a4..308797acd 100644
--- a/core/linux-armv5/config
+++ b/core/linux-armv5/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.11.3-2 Kernel Configuration
+# Linux/arm 4.12.0-rc4-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -100,8 +100,10 @@ CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_TINY_RCU=y
 # CONFIG_RCU_EXPERT is not set
 CONFIG_SRCU=y
+CONFIG_TINY_SRCU=y
 # CONFIG_TASKS_RCU is not set
 # CONFIG_RCU_STALL_COMMON is not set
+CONFIG_RCU_NEED_SEGCBLIST=y
 # CONFIG_TREE_RCU_TRACE is not set
 CONFIG_BUILD_BIN2C=y
 CONFIG_IKCONFIG=y
@@ -150,7 +152,6 @@ CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
 CONFIG_RD_LZ4=y
-CONFIG_INITRAMFS_COMPRESSION=".gz"
 CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
@@ -204,6 +205,7 @@ CONFIG_SLUB=y
 CONFIG_SLAB_FREELIST_RANDOM=y
 # CONFIG_SYSTEM_DATA_VERIFICATION is not set
 # CONFIG_PROFILING is not set
+CONFIG_CRASH_CORE=y
 CONFIG_KEXEC_CORE=y
 CONFIG_HAVE_OPROFILE=y
 # CONFIG_KPROBES is not set
@@ -290,6 +292,7 @@ CONFIG_BLK_DEV_BSGLIB=y
 CONFIG_BLK_DEV_INTEGRITY=y
 CONFIG_BLK_DEV_ZONED=y
 CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
 CONFIG_BLK_CMDLINE_PARSER=y
 CONFIG_BLK_WBT=y
 CONFIG_BLK_WBT_SQ=y
@@ -334,6 +337,9 @@ CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_NOOP=y
 CONFIG_DEFAULT_IOSCHED="noop"
 CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
 CONFIG_ASN1=m
 CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
 CONFIG_INLINE_READ_UNLOCK=y
@@ -348,7 +354,6 @@ CONFIG_FREEZER=y
 #
 CONFIG_MMU=y
 CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_GEMINI is not set
 # CONFIG_ARCH_EBSA110 is not set
 # CONFIG_ARCH_EP93XX is not set
 # CONFIG_ARCH_FOOTBRIDGE is not set
@@ -449,6 +454,11 @@ CONFIG_MULTI_IRQ_HANDLER=y
 #
 # DesignWare PCI Core Support
 #
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
 # CONFIG_PCCARD is not set
 
 #
@@ -560,6 +570,7 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
 #
 CONFIG_CPUFREQ_DT=y
 CONFIG_CPUFREQ_DT_PLATDEV=y
+# CONFIG_ARM_DB8500_CPUFREQ is not set
 # CONFIG_ARM_KIRKWOOD_CPUFREQ is not set
 # CONFIG_QORIQ_CPUFREQ is not set
 
@@ -1173,6 +1184,7 @@ CONFIG_CAN_GW=m
 # CAN Device Drivers
 #
 # CONFIG_CAN_VCAN is not set
+# CONFIG_CAN_VXCAN is not set
 # CONFIG_CAN_SLCAN is not set
 CONFIG_CAN_DEV=m
 CONFIG_CAN_CALC_BITTIMING=y
@@ -1193,6 +1205,7 @@ CONFIG_CAN_AT91=m
 #
 # CAN SPI interfaces
 #
+# CONFIG_CAN_HI311X is not set
 # CONFIG_CAN_MCP251X is not set
 
 #
@@ -1204,6 +1217,7 @@ CONFIG_CAN_AT91=m
 # CONFIG_CAN_KVASER_USB is not set
 # CONFIG_CAN_PEAK_USB is not set
 # CONFIG_CAN_8DEV_USB is not set
+# CONFIG_CAN_MCBA_USB is not set
 # CONFIG_CAN_DEBUG_DEVICES is not set
 CONFIG_IRDA=m
 
@@ -1418,6 +1432,7 @@ CONFIG_DEV_COREDUMP=y
 # CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
 # CONFIG_SYS_HYPERVISOR is not set
 # CONFIG_GENERIC_CPU_DEVICES is not set
+CONFIG_GENERIC_CPU_AUTOPROBE=y
 CONFIG_SOC_BUS=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
@@ -1521,7 +1536,6 @@ CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_DENALI_DT is not set
 # CONFIG_MTD_NAND_GPIO is not set
 # CONFIG_MTD_NAND_OMAP_BCH_BUILD is not set
-CONFIG_MTD_NAND_IDS=y
 # CONFIG_MTD_NAND_DISKONCHIP is not set
 # CONFIG_MTD_NAND_DOCG4 is not set
 CONFIG_MTD_NAND_ATMEL=y
@@ -1574,7 +1588,6 @@ CONFIG_BLK_DEV_RAM_COUNT=4
 CONFIG_BLK_DEV_RAM_SIZE=8192
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-# CONFIG_MG_DISK is not set
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_NVME_FC is not set
 # CONFIG_NVME_TARGET is not set
@@ -1740,6 +1753,7 @@ CONFIG_DM_VERITY=m
 # CONFIG_DM_VERITY_FEC is not set
 # CONFIG_DM_SWITCH is not set
 CONFIG_DM_LOG_WRITES=m
+# CONFIG_DM_INTEGRITY is not set
 CONFIG_TARGET_CORE=m
 CONFIG_TCM_IBLOCK=m
 CONFIG_TCM_FILEIO=m
@@ -1784,6 +1798,10 @@ CONFIG_NET_VRF=m
 # CONFIG_B53 is not set
 # CONFIG_NET_DSA_MV88E6XXX is not set
 # CONFIG_NET_DSA_QCA8K is not set
+# CONFIG_NET_DSA_LOOP is not set
+# CONFIG_NET_DSA_MT7530 is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_I2C is not set
+# CONFIG_NET_DSA_SMSC_LAN9303_MDIO is not set
 CONFIG_ETHERNET=y
 CONFIG_NET_VENDOR_ALACRITECH=y
 # CONFIG_ALTERA_TSE is not set
@@ -1845,18 +1863,17 @@ CONFIG_NET_VENDOR_VIA=y
 CONFIG_NET_VENDOR_WIZNET=y
 # CONFIG_WIZNET_W5100 is not set
 # CONFIG_WIZNET_W5300 is not set
-CONFIG_PHYLIB=y
-CONFIG_SWPHY=y
-CONFIG_LED_TRIGGER_PHY=y
-
-#
-# MDIO bus device drivers
-#
+CONFIG_NET_VENDOR_SYNOPSYS=y
+# CONFIG_DWC_XLGMAC is not set
+CONFIG_MDIO_DEVICE=y
 # CONFIG_MDIO_BCM_UNIMAC is not set
 # CONFIG_MDIO_BITBANG is not set
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_MDIO_HISI_FEMAC is not set
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
 
 #
 # MII PHY device drivers
@@ -2079,6 +2096,7 @@ CONFIG_IEEE802154_MRF24J40=m
 CONFIG_IEEE802154_CC2520=m
 CONFIG_IEEE802154_ATUSB=m
 # CONFIG_IEEE802154_ADF7242 is not set
+# CONFIG_IEEE802154_CA8210 is not set
 # CONFIG_ISDN is not set
 # CONFIG_NVM is not set
 
@@ -2140,12 +2158,14 @@ CONFIG_MOUSE_PS2_ALPS=y
 CONFIG_MOUSE_PS2_BYD=y
 CONFIG_MOUSE_PS2_LOGIPS2PP=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
 CONFIG_MOUSE_PS2_CYPRESS=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_MOUSE_PS2_SENTELIC=y
 CONFIG_MOUSE_PS2_TOUCHKIT=y
 CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_SMBUS=y
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m
@@ -2370,6 +2390,7 @@ CONFIG_I2C_MUX=y
 #
 # CONFIG_I2C_ARB_GPIO_CHALLENGE is not set
 # CONFIG_I2C_MUX_GPIO is not set
+# CONFIG_I2C_MUX_LTC4306 is not set
 # CONFIG_I2C_MUX_PCA9541 is not set
 # CONFIG_I2C_MUX_PCA954x is not set
 # CONFIG_I2C_MUX_PINCTRL is not set
@@ -2508,6 +2529,7 @@ CONFIG_GPIO_GENERIC=y
 # CONFIG_GPIO_74XX_MMIO is not set
 # CONFIG_GPIO_ALTERA is not set
 # CONFIG_GPIO_DWAPB is not set
+# CONFIG_GPIO_FTGPIO010 is not set
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_GRGPIO is not set
 # CONFIG_GPIO_MOCKUP is not set
@@ -2577,6 +2599,7 @@ CONFIG_W1_SLAVE_DS2423=m
 CONFIG_W1_SLAVE_DS2431=m
 CONFIG_W1_SLAVE_DS2433=m
 # CONFIG_W1_SLAVE_DS2433_CRC is not set
+# CONFIG_W1_SLAVE_DS2438 is not set
 CONFIG_W1_SLAVE_DS2760=m
 CONFIG_W1_SLAVE_DS2780=m
 CONFIG_W1_SLAVE_DS2781=m
@@ -2606,6 +2629,7 @@ CONFIG_POWER_SUPPLY=y
 # CONFIG_BATTERY_DS2780 is not set
 # CONFIG_BATTERY_DS2781 is not set
 # CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_LEGO_EV3 is not set
 # CONFIG_BATTERY_SBS is not set
 # CONFIG_CHARGER_SBS is not set
 # CONFIG_BATTERY_BQ27XXX is not set
@@ -2648,6 +2672,7 @@ CONFIG_HWMON=m
 # CONFIG_SENSORS_ADT7470 is not set
 # CONFIG_SENSORS_ADT7475 is not set
 # CONFIG_SENSORS_ASC7621 is not set
+# CONFIG_SENSORS_ASPEED is not set
 # CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS620 is not set
 # CONFIG_SENSORS_DS1621 is not set
@@ -2820,6 +2845,7 @@ CONFIG_MFD_CORE=y
 # CONFIG_MFD_AAT2870_CORE is not set
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
 CONFIG_MFD_ATMEL_HLCDC=y
+CONFIG_MFD_ATMEL_SMC=y
 # CONFIG_MFD_BCM590XX is not set
 # CONFIG_MFD_AXP20X_I2C is not set
 # CONFIG_MFD_CROS_EC is not set
@@ -2835,6 +2861,7 @@ CONFIG_MFD_DLN2=m
 CONFIG_MFD_MC13XXX=y
 CONFIG_MFD_MC13XXX_SPI=y
 # CONFIG_MFD_MC13XXX_I2C is not set
+# CONFIG_MFD_MXS_LRADC is not set
 # CONFIG_MFD_HI6421_PMIC is not set
 # CONFIG_HTC_PASIC3 is not set
 # CONFIG_HTC_I2CPLD is not set
@@ -2876,6 +2903,7 @@ CONFIG_MFD_SYSCON=y
 # CONFIG_MFD_TI_AM335X_TSCADC is not set
 # CONFIG_MFD_LP3943 is not set
 # CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_TI_LMU is not set
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_TPS6105X is not set
 # CONFIG_TPS65010 is not set
@@ -2943,7 +2971,9 @@ CONFIG_REGULATOR_MC13892=y
 # CONFIG_REGULATOR_TPS62360 is not set
 # CONFIG_REGULATOR_TPS65023 is not set
 # CONFIG_REGULATOR_TPS6507X is not set
+# CONFIG_REGULATOR_TPS65132 is not set
 # CONFIG_REGULATOR_TPS6524X is not set
+# CONFIG_REGULATOR_VCTRL is not set
 CONFIG_MEDIA_SUPPORT=m
 
 #
@@ -3009,6 +3039,7 @@ CONFIG_RC_LOOPBACK=m
 CONFIG_IR_GPIO_CIR=m
 CONFIG_IR_SERIAL=m
 CONFIG_IR_SERIAL_TRANSMITTER=y
+# CONFIG_IR_SIR is not set
 CONFIG_MEDIA_USB_SUPPORT=y
 
 #
@@ -3256,6 +3287,7 @@ CONFIG_VIDEO_CX25840=m
 #
 # Camera sensor devices
 #
+CONFIG_VIDEO_OV2640=m
 CONFIG_VIDEO_OV7640=m
 CONFIG_VIDEO_MT9V011=m
 
@@ -3451,6 +3483,7 @@ CONFIG_DRM=y
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_KMS_FB_HELPER=y
 CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
 # CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
 CONFIG_DRM_GEM_CMA_HELPER=y
 CONFIG_DRM_KMS_CMA_HELPER=y
@@ -3472,6 +3505,7 @@ CONFIG_DRM_KMS_CMA_HELPER=y
 CONFIG_DRM_UDL=m
 # CONFIG_DRM_ARMADA is not set
 CONFIG_DRM_ATMEL_HLCDC=y
+# CONFIG_DRM_RCAR_DW_HDMI is not set
 # CONFIG_DRM_OMAP is not set
 # CONFIG_DRM_TILCDC is not set
 # CONFIG_DRM_FSL_DCU is not set
@@ -3480,10 +3514,12 @@ CONFIG_DRM_PANEL=y
 #
 # Display Panels
 #
+# CONFIG_DRM_PANEL_LVDS is not set
 # CONFIG_DRM_PANEL_SIMPLE is not set
 # CONFIG_DRM_PANEL_SAMSUNG_LD9040 is not set
 # CONFIG_DRM_PANEL_LG_LG4573 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
+# CONFIG_DRM_PANEL_SITRONIX_ST7789V is not set
 CONFIG_DRM_BRIDGE=y
 
 #
@@ -3491,6 +3527,8 @@ CONFIG_DRM_BRIDGE=y
 #
 # CONFIG_DRM_ANALOGIX_ANX78XX is not set
 # CONFIG_DRM_DUMB_VGA_DAC is not set
+# CONFIG_DRM_LVDS_ENCODER is not set
+# CONFIG_DRM_MEGACHIPS_STDPXXXX_GE_B850V3_FW is not set
 # CONFIG_DRM_NXP_PTN3460 is not set
 # CONFIG_DRM_PARADE_PS8622 is not set
 # CONFIG_DRM_SIL_SII8620 is not set
@@ -3565,6 +3603,7 @@ CONFIG_BACKLIGHT_ATMEL_LCDC=y
 # CONFIG_BACKLIGHT_GPIO is not set
 # CONFIG_BACKLIGHT_LV5207LP is not set
 # CONFIG_BACKLIGHT_BD6107 is not set
+# CONFIG_BACKLIGHT_ARCXCNN is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEOMODE_HELPERS=y
 CONFIG_HDMI=y
@@ -3670,10 +3709,12 @@ CONFIG_SND_AT91_SOC_SAM9X5_WM8731=y
 # CONFIG_SND_SOC_FSL_SPDIF is not set
 # CONFIG_SND_SOC_FSL_ESAI 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_MXS_SOC=y
 CONFIG_SND_SOC_MXS_SGTL5000=y
 # CONFIG_SND_SOC_XTFPGA_I2S is not set
+# CONFIG_ZX_TDM is not set
 CONFIG_SND_SOC_I2C_AND_SPI=y
 
 #
@@ -3681,6 +3722,8 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 #
 # CONFIG_SND_SOC_AC97_CODEC is not set
 # CONFIG_SND_SOC_ADAU1701 is not set
+# CONFIG_SND_SOC_ADAU1761_I2C is not set
+# CONFIG_SND_SOC_ADAU1761_SPI is not set
 # CONFIG_SND_SOC_ADAU7002 is not set
 # CONFIG_SND_SOC_AK4104 is not set
 # CONFIG_SND_SOC_AK4554 is not set
@@ -3692,6 +3735,7 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_CS35L32 is not set
 # CONFIG_SND_SOC_CS35L33 is not set
 # CONFIG_SND_SOC_CS35L34 is not set
+# CONFIG_SND_SOC_CS35L35 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
@@ -3704,11 +3748,14 @@ CONFIG_SND_SOC_I2C_AND_SPI=y
 # CONFIG_SND_SOC_CS42XX8_I2C is not set
 # CONFIG_SND_SOC_CS4349 is not set
 # CONFIG_SND_SOC_CS53L30 is not set
+# CONFIG_SND_SOC_DIO2125 is not set
+# CONFIG_SND_SOC_ES7134 is not set
 # CONFIG_SND_SOC_ES8328_I2C is not set
 # CONFIG_SND_SOC_ES8328_SPI is not set
 # CONFIG_SND_SOC_GTM601 is not set
 # CONFIG_SND_SOC_INNO_RK3036 is not set
 # CONFIG_SND_SOC_MAX98504 is not set
+# CONFIG_SND_SOC_MAX98927 is not set
 # CONFIG_SND_SOC_MAX9860 is not set
 # CONFIG_SND_SOC_MSM8916_WCD_DIGITAL is not set
 # CONFIG_SND_SOC_PCM1681 is not set
@@ -3763,10 +3810,10 @@ CONFIG_SND_SOC_WM8904=y
 # CONFIG_SND_SOC_WM8985 is not set
 # CONFIG_SND_SOC_NAU8540 is not set
 # CONFIG_SND_SOC_NAU8810 is not set
+# CONFIG_SND_SOC_NAU8824 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
 # CONFIG_SND_SIMPLE_CARD is not set
 # CONFIG_SND_SIMPLE_SCU_CARD is not set
-# CONFIG_SOUND_PRIME is not set
 
 #
 # HID support
@@ -3781,10 +3828,12 @@ CONFIG_HID_GENERIC=y
 # Special HID drivers
 #
 CONFIG_HID_A4TECH=m
+CONFIG_HID_ACCUTOUCH=m
 CONFIG_HID_ACRUX=m
 CONFIG_HID_ACRUX_FF=y
 CONFIG_HID_APPLE=m
 CONFIG_HID_APPLEIR=m
+# CONFIG_HID_ASUS is not set
 CONFIG_HID_AUREAL=m
 CONFIG_HID_BELKIN=m
 CONFIG_HID_BETOP_FF=m
@@ -3829,6 +3878,7 @@ CONFIG_HID_MAYFLASH=m
 CONFIG_HID_MICROSOFT=m
 CONFIG_HID_MONTEREY=m
 CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTI=m
 CONFIG_HID_NTRIG=m
 CONFIG_HID_ORTEK=m
 CONFIG_HID_PANTHERLORD=m
@@ -4173,6 +4223,10 @@ CONFIG_USB_G_ACM_MS=m
 # CONFIG_USB_G_HID is not set
 # CONFIG_USB_G_DBGP is not set
 # CONFIG_USB_G_WEBCAM is not set
+
+#
+# USB Power Delivery and Type-C drivers
+#
 CONFIG_USB_LED_TRIG=y
 # CONFIG_USB_ULPI_BUS is not set
 CONFIG_UWB=m
@@ -4207,6 +4261,7 @@ CONFIG_MMC_SPI=y
 # CONFIG_MMC_USHC is not set
 # CONFIG_MMC_USDHI6ROL0 is not set
 # CONFIG_MMC_MTK is not set
+# CONFIG_MMC_SDHCI_XENON is not set
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
@@ -4223,6 +4278,7 @@ CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_PCA9532 is not set
 CONFIG_LEDS_GPIO=y
 # CONFIG_LEDS_LP3944 is not set
+# CONFIG_LEDS_LP3952 is not set
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
 # CONFIG_LEDS_LP5562 is not set
@@ -4271,7 +4327,6 @@ CONFIG_LEDS_TRIGGER_PANIC=y
 # CONFIG_ACCESSIBILITY is not set
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
-# CONFIG_EDAC is not set
 CONFIG_RTC_LIB=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_HCTOSYS=y
@@ -4423,6 +4478,7 @@ CONFIG_SYNC_FILE=y
 #
 # Microsoft Hyper-V guest support
 #
+# CONFIG_HYPERV_TSCPAGE is not set
 CONFIG_STAGING=y
 CONFIG_PRISM2_USB=m
 # CONFIG_COMEDI is not set
@@ -4430,6 +4486,7 @@ CONFIG_RTLLIB=m
 CONFIG_RTLLIB_CRYPTO_CCMP=m
 CONFIG_RTLLIB_CRYPTO_TKIP=m
 CONFIG_RTLLIB_CRYPTO_WEP=m
+# CONFIG_RTL8723BS is not set
 CONFIG_R8712U=m
 CONFIG_R8188EU=m
 CONFIG_88EU_AP_MODE=y
@@ -4523,8 +4580,6 @@ CONFIG_AD2S1210=m
 CONFIG_STAGING_MEDIA=y
 CONFIG_I2C_BCM2048=m
 CONFIG_LIRC_STAGING=y
-CONFIG_LIRC_SASEM=m
-CONFIG_LIRC_SIR=m
 CONFIG_LIRC_ZILOG=m
 
 #
@@ -4554,6 +4609,7 @@ CONFIG_FB_TFT_PCD8544=m
 CONFIG_FB_TFT_RA8875=m
 CONFIG_FB_TFT_S6D02A1=m
 CONFIG_FB_TFT_S6D1121=m
+CONFIG_FB_TFT_SH1106=m
 CONFIG_FB_TFT_SSD1289=m
 CONFIG_FB_TFT_SSD1305=m
 CONFIG_FB_TFT_SSD1306=m
@@ -4577,6 +4633,12 @@ CONFIG_WILC1000_SPI=m
 # CONFIG_MOST is not set
 # CONFIG_KS7010 is not set
 # CONFIG_GREYBUS is not set
+# CONFIG_CRYPTO_DEV_CCREE is not set
+
+#
+# USB Power Delivery and Type-C drivers
+#
+# CONFIG_TYPEC_TCPM is not set
 # CONFIG_GOLDFISH is not set
 # CONFIG_CHROME_PLATFORMS is not set
 CONFIG_CLKDEV_LOOKUP=y
@@ -4631,11 +4693,16 @@ CONFIG_ATMEL_PIT=y
 #
 # SOC (System On Chip) specific Drivers
 #
+CONFIG_AT91_SOC_ID=y
 
 #
 # Broadcom SoC drivers
 #
 # CONFIG_SOC_BRCMSTB is not set
+
+#
+# i.MX SoC drivers
+#
 # CONFIG_SUNXI_SRAM is not set
 # CONFIG_SOC_TI is not set
 # CONFIG_SOC_ZTE is not set
@@ -4726,12 +4793,14 @@ CONFIG_HI8435=m
 CONFIG_HX711=m
 CONFIG_INA2XX_ADC=m
 CONFIG_LTC2485=m
+CONFIG_LTC2497=m
 CONFIG_MAX1027=m
 CONFIG_MAX11100=m
+CONFIG_MAX1118=m
 CONFIG_MAX1363=m
+CONFIG_MAX9611=m
 CONFIG_MCP320X=m
 CONFIG_MCP3422=m
-CONFIG_MXS_LRADC=m
 CONFIG_NAU7802=m
 CONFIG_TI_ADC081C=m
 CONFIG_TI_ADC0832=m
@@ -4789,6 +4858,7 @@ CONFIG_AD5592R=m
 CONFIG_AD5593R=m
 CONFIG_AD5504=m
 CONFIG_AD5624R_SPI=m
+CONFIG_LTC2632=m
 CONFIG_AD5686=m
 CONFIG_AD5755=m
 CONFIG_AD5761=m
@@ -4852,6 +4922,7 @@ CONFIG_ITG3200=m
 CONFIG_AFE4403=m
 CONFIG_AFE4404=m
 CONFIG_MAX30100=m
+CONFIG_MAX30102=m
 
 #
 # Humidity sensors
@@ -4859,6 +4930,7 @@ CONFIG_MAX30100=m
 CONFIG_AM2315=m
 CONFIG_DHT11=m
 CONFIG_HDC100X=m
+CONFIG_HID_SENSOR_HUMIDITY=m
 CONFIG_HTS221=m
 CONFIG_HTS221_I2C=m
 CONFIG_HTS221_SPI=m
@@ -4919,6 +4991,7 @@ CONFIG_TSL4531=m
 CONFIG_US5182D=m
 CONFIG_VCNL4000=m
 CONFIG_VEML6070=m
+CONFIG_VL6180=m
 
 #
 # Magnetometer sensors
@@ -5003,6 +5076,7 @@ CONFIG_AS3935=m
 # Proximity and distance sensors
 #
 CONFIG_LIDAR_LITE_V2=m
+CONFIG_SRF04=m
 CONFIG_SX9500=m
 CONFIG_SRF08=m
 
@@ -5010,6 +5084,7 @@ CONFIG_SRF08=m
 # Temperature sensors
 #
 CONFIG_MAXIM_THERMOCOUPLE=m
+CONFIG_HID_SENSOR_TEMP=m
 CONFIG_MLX90614=m
 CONFIG_TMP006=m
 CONFIG_TMP007=m
@@ -5031,6 +5106,7 @@ CONFIG_IRQ_MXS=y
 CONFIG_RESET_CONTROLLER=y
 # CONFIG_RESET_ATH79 is not set
 # CONFIG_RESET_BERLIN is not set
+# CONFIG_RESET_IMX7 is not set
 # CONFIG_RESET_LPC18XX is not set
 # CONFIG_RESET_MESON is not set
 # CONFIG_RESET_PISTACHIO is not set
@@ -5063,6 +5139,7 @@ CONFIG_ARM_PMU=y
 # Android
 #
 # CONFIG_ANDROID is not set
+CONFIG_DAX=m
 CONFIG_NVMEM=y
 CONFIG_NVMEM_MXS_OCOTP=m
 # CONFIG_STM is not set
@@ -5083,6 +5160,7 @@ CONFIG_NVMEM_MXS_OCOTP=m
 #
 # CONFIG_FIRMWARE_MEMMAP is not set
 # CONFIG_FW_CFG_SYSFS is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
 
 #
 # Tegra firmware driver
@@ -5215,6 +5293,7 @@ CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
 # CONFIG_UBIFS_ATIME_SUPPORT is not set
 # CONFIG_UBIFS_FS_ENCRYPTION is not set
+CONFIG_UBIFS_FS_SECURITY=y
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=y
 CONFIG_SQUASHFS_FILE_CACHE=y
@@ -5519,7 +5598,6 @@ CONFIG_ENCRYPTED_KEYS=y
 # CONFIG_SECURITY is not set
 # CONFIG_SECURITYFS is not set
 CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
-CONFIG_HAVE_ARCH_HARDENED_USERCOPY=y
 # CONFIG_HARDENED_USERCOPY is not set
 # CONFIG_STATIC_USERMODEHELPER is not set
 CONFIG_DEFAULT_SECURITY_DAC=y
@@ -5675,6 +5753,7 @@ CONFIG_CRYPTO_DEV_MXS_DCP=y
 #
 # Certificates for signature checking
 #
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
 CONFIG_ARM_CRYPTO=y
 CONFIG_CRYPTO_SHA1_ARM=y
 CONFIG_CRYPTO_SHA256_ARM=y