* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 43556e68bd6ccbf65d2c3ffd60f702bd01e8d9af
@ 2016-10-18 20:50 git
0 siblings, 0 replies; only message in thread
From: git @ 2016-10-18 20:50 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 101245 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via 43556e68bd6ccbf65d2c3ffd60f702bd01e8d9af (commit)
via 6cb87b052cfd69148cd4b55b86cd32e99434e5f7 (commit)
via 72471688997a6353243927bfc5d92b3e539e751a (commit)
via 453fba0bb33eb000ec283999672113418a96eca7 (commit)
via 3fae0d50c77548592aea4c6ea06e78686a6a02a4 (commit)
from 55586be216691ee0972da690db8229d7e6cddb96 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 43556e68bd6ccbf65d2c3ffd60f702bd01e8d9af
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Tue Oct 18 18:59:34 2016 +0000
kernel: Update to 4.6.7
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 6cb87b052cfd69148cd4b55b86cd32e99434e5f7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Mon Oct 17 20:49:49 2016 +0000
kernel: Update to 4.5.7
Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 72471688997a6353243927bfc5d92b3e539e751a
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Tue Oct 18 21:45:08 2016 +0100
grub: Update to 2.02~beta3
This patch also builds an EFI version on appropriate architectures
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
commit 453fba0bb33eb000ec283999672113418a96eca7
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 16 18:37:38 2016 +0100
Revert "SDL: Remove package"
Actually needed by at least QEMU
This reverts commit 52e192db7770de6a941681cf4059f06184976e62.
commit 3fae0d50c77548592aea4c6ea06e78686a6a02a4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Oct 16 18:30:37 2016 +0100
gnu-efi: Drop package
Was only used by gummiboot which we dropped earlier
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
SDL/SDL.nm | 64 +++++
gnu-efi/gnu-efi.nm | 45 ---
.../patches/gnu-efi-3.0q-Add-.S-and-.E-rules.patch | 25 --
...ix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch | 66 -----
gnu-efi/patches/gnu-efi-3.0q-machine-types.patch | 66 -----
grub/grub.nm | 74 ++---
grub/patches/2.02_beta3-10_linux-UUID.patch | 27 ++
grub/patches/2.02_beta3-gcc6-ld-no-pie.patch | 57 ++++
grub/patches/grub-1.99-just-say-linux.patch | 45 ---
.../grub-2.00-ignore-gnulib-gets-stupidity.patch | 26 --
kernel/config-arm-generic | 55 +++-
kernel/config-arm32-generic | 256 +++++++++--------
kernel/config-arm64-generic | 56 +++-
kernel/config-generic | 320 +++++++++++++++------
kernel/config-x86-generic | 86 ++++--
kernel/kernel.nm | 4 +-
...linux-3.14.25-rt5592_no_special_txop_init.patch | 13 -
kernel/scripts/configure | 2 +-
18 files changed, 710 insertions(+), 577 deletions(-)
create mode 100644 SDL/SDL.nm
delete mode 100644 gnu-efi/gnu-efi.nm
delete mode 100644 gnu-efi/patches/gnu-efi-3.0q-Add-.S-and-.E-rules.patch
delete mode 100644 gnu-efi/patches/gnu-efi-3.0q-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
delete mode 100644 gnu-efi/patches/gnu-efi-3.0q-machine-types.patch
create mode 100644 grub/patches/2.02_beta3-10_linux-UUID.patch
create mode 100644 grub/patches/2.02_beta3-gcc6-ld-no-pie.patch
delete mode 100644 grub/patches/grub-1.99-just-say-linux.patch
delete mode 100644 grub/patches/grub-2.00-ignore-gnulib-gets-stupidity.patch
delete mode 100644 kernel/patches/linux-3.14.25-rt5592_no_special_txop_init.patch
Difference in files:
diff --git a/SDL/SDL.nm b/SDL/SDL.nm
new file mode 100644
index 0000000..21fd515
--- /dev/null
+++ b/SDL/SDL.nm
@@ -0,0 +1,64 @@
+###############################################################################
+# IPFire.org - An Open Source Firewall Solution #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
+###############################################################################
+
+name = SDL
+version = 1.2.15
+release = 1
+
+groups = System/Libraries
+url = http://www.libsdl.org/
+license = LGPLv2+
+summary = A cross-platform multimedia library.
+
+description
+ Simple DirectMedia Layer (SDL) is a cross-platform multimedia library
+ designed to provide fast access to the graphics frame buffer and audio
+ device.
+end
+
+source_dl = http://www.libsdl.org/release/
+
+build
+ requires
+ libusb-compat-devel
+ libX11-devel
+ libXext-devel
+ libXrandr-devel
+ libXrender-devel
+ mesa-devel
+ end
+
+ if "%{DISTRO_PLATFORM}" == "x86"
+ requires += nasm
+ end
+
+ configure_options += \
+ --disable-video-svga \
+ --disable-video-ggi \
+ --disable-video-aalib \
+ --disable-video-ps3 \
+ --enable-sdl-dlopen
+end
+
+packages
+ package %{name}
+
+ package %{name}-devel
+ template DEVEL
+
+ requires
+ libX11-devel
+ libXext-devel
+ libXrandr-devel
+ libXrender-devel
+ mesa-devel
+ SDL = %{thisver}
+ end
+ end
+
+ package %{name}-debuginfo
+ template DEBUGINFO
+ end
+end
diff --git a/gnu-efi/gnu-efi.nm b/gnu-efi/gnu-efi.nm
deleted file mode 100644
index 6a29a44..0000000
--- a/gnu-efi/gnu-efi.nm
+++ /dev/null
@@ -1,45 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = gnu-efi
-version = 3.0q
-release = 1
-sup_arches = x86_64 i686
-
-groups = Development/System
-url = ftp://ftp.hpl.hp.com/pub/linux-ia64
-license = BSD
-summary = Development Libraries and headers for EFI
-
-description
- This package contains development headers and libraries for developing
- applications that run under EFI (Extensible Firmware Interface).
-end
-
-source_dl = %{url}
-
-build
- # Disable hardening.
- CFLAGS += -fno-stack-protector
-
- make_build_targets += CFLAGS="%{CFLAGS}"
-
- install
- make PREFIX=%{prefix} INSTALLROOT=%{BUILDROOT} \
- LIBDIR=%{libdir} CFLAGS="%{CFLAGS}" install
-
- mkdir -pv %{BUILDROOT}%{libdir}/gnuefi
- mv -v %{BUILDROOT}%{libdir}/*.{lds,o} %{BUILDROOT}%{libdir}/gnuefi
- end
-
- keep_libraries
- %{libdir}/libefi.a
- %{libdir}/libgnuefi.a
- end
-end
-
-packages
- package %{name}
-end
diff --git a/gnu-efi/patches/gnu-efi-3.0q-Add-.S-and-.E-rules.patch b/gnu-efi/patches/gnu-efi-3.0q-Add-.S-and-.E-rules.patch
deleted file mode 100644
index b6fdfaf..0000000
--- a/gnu-efi/patches/gnu-efi-3.0q-Add-.S-and-.E-rules.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bb12d86aceb7d9ea6748f45a17f719a8e18c81c8 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones(a)redhat.com>
-Date: Tue, 9 Aug 2011 12:30:49 -0400
-Subject: [PATCH 7/7] Add %.S and %.E rules to make debugging easier.
-
----
- Make.rules | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/Make.rules b/Make.rules
-index eab12d7..65fb612 100644
---- a/Make.rules
-+++ b/Make.rules
-@@ -44,3 +44,8 @@
- %.o: %.c
- $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
-
-+%.S: %.c
-+ $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -S $< -o $@
-+
-+%.E: %.c
-+ $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -E $< -o $@
---
-1.7.10.4
-
diff --git a/gnu-efi/patches/gnu-efi-3.0q-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch b/gnu-efi/patches/gnu-efi-3.0q-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
deleted file mode 100644
index ecb5c56..0000000
--- a/gnu-efi/patches/gnu-efi-3.0q-Fix-usage-of-INSTALLROOT-PREFIX-and-LIBDIR.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 3f40a425e763edfde77a9a6e05ed09b0676d8fa9 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones(a)cutlet.install.bos.redhat.com>
-Date: Fri, 3 Oct 2008 14:40:56 -0400
-Subject: [PATCH 1/7] Fix usage of INSTALLROOT, PREFIX, and LIBDIR.
-
-I screwed it up last time.
----
- Make.defaults | 6 +++---
- inc/Makefile | 16 ++++++++--------
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/Make.defaults b/Make.defaults
-index bf162c5..6278fa7 100644
---- a/Make.defaults
-+++ b/Make.defaults
-@@ -38,8 +38,9 @@
- # Where to install the package. GNU-EFI will create and access
- # lib and include under the root
- #
--INSTALLROOT=/usr/local
--LIBDIR=lib
-+INSTALLROOT:= /
-+PREFIX := /usr/local
-+LIBDIR := ${PREFIX}/lib
-
- TOPDIR := $(shell if [ "$$PWD" != "" ]; then echo $$PWD; else pwd; fi)
-
-@@ -73,7 +74,6 @@ endif
-
- ifeq ($(ARCH), x86_64)
- CFLAGS += -mno-red-zone
-- LIBDIR = lib
- ifeq ($(HOSTARCH), ia32)
- ARCH3264 = -m64
- endif
-diff --git a/inc/Makefile b/inc/Makefile
-index 9683be5..71fded5 100644
---- a/inc/Makefile
-+++ b/inc/Makefile
-@@ -13,15 +13,15 @@ all:
- clean:
-
- install:
-- mkdir -p $(INSTALLROOT)/include/efi
-- mkdir -p $(INSTALLROOT)/include/efi/protocol
-- mkdir -p $(INSTALLROOT)/include/efi/$(ARCH)
-- $(INSTALL) -m 644 *.h $(INSTALLROOT)/include/efi
-- $(INSTALL) -m 644 protocol/*.h $(INSTALLROOT)/include/efi/protocol
-- $(INSTALL) -m 644 $(ARCH)/*.h $(INSTALLROOT)/include/efi/$(ARCH)
-+ mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi
-+ mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol
-+ mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
-+ $(INSTALL) -m 644 *.h $(INSTALLROOT)$(PREFIX)/include/efi
-+ $(INSTALL) -m 644 protocol/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol
-+ $(INSTALL) -m 644 $(ARCH)/*.h $(INSTALLROOT)$(PREFIX)/include/efi/$(ARCH)
- ifeq ($(ARCH),ia64)
-- mkdir -p $(INSTALLROOT)/include/efi/protocol/ia64
-- $(INSTALL) -m 644 protocol/ia64/*.h $(INSTALLROOT)/include/efi/protocol/ia64
-+ mkdir -p $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
-+ $(INSTALL) -m 644 protocol/ia64/*.h $(INSTALLROOT)$(PREFIX)/include/efi/protocol/ia64
- endif
-
- include $(SRCDIR)/../Make.rules
---
-1.7.10.4
-
diff --git a/gnu-efi/patches/gnu-efi-3.0q-machine-types.patch b/gnu-efi/patches/gnu-efi-3.0q-machine-types.patch
deleted file mode 100644
index 8c0aa72..0000000
--- a/gnu-efi/patches/gnu-efi-3.0q-machine-types.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 9ab3fefd9b86c567ba6b0ea1429ce932572040c1 Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones(a)redhat.com>
-Date: Tue, 26 Apr 2011 13:25:26 -0400
-Subject: [PATCH 5/7] Add more machine type defines.
-
-Add machine type defines for i386, arm/thumb, ia64, ebc, and x86_64.
----
- inc/ia32/pe.h | 4 ++++
- inc/ia64/pe.h | 4 ++++
- inc/x86_64/pe.h | 4 ++++
- 3 files changed, 12 insertions(+)
-
-diff --git a/inc/ia32/pe.h b/inc/ia32/pe.h
-index 16e40ef..979b936 100644
---- a/inc/ia32/pe.h
-+++ b/inc/ia32/pe.h
-@@ -98,8 +98,12 @@ typedef struct _IMAGE_FILE_HEADER {
- #define IMAGE_FILE_MACHINE_R3000 0x162 // MIPS little-endian, 0540 big-endian
- #define IMAGE_FILE_MACHINE_R4000 0x166 // MIPS little-endian
- #define IMAGE_FILE_MACHINE_ALPHA 0x184 // Alpha_AXP
-+#define IMAGE_FILE_MACHINE_ARMTHUMB_MIXED 0x1c2 // Arm/Thumb
- #define IMAGE_FILE_MACHINE_POWERPC 0x1F0 // IBM PowerPC Little-Endian
-+#define IMAGE_FILE_MACHINE_IA64 0x200 // IA-64
- #define IMAGE_FILE_MACHINE_TAHOE 0x7cc // Intel EM machine
-+#define IMAGE_FILE_MACHINE_EBC 0xebc // EFI Byte Code
-+#define IMAGE_FILE_MACHINE_X64 0x8664 // x86_64
- //
- // Directory format.
- //
-diff --git a/inc/ia64/pe.h b/inc/ia64/pe.h
-index f67128d..b1cade2 100644
---- a/inc/ia64/pe.h
-+++ b/inc/ia64/pe.h
-@@ -113,8 +113,12 @@ typedef struct _IMAGE_FILE_HEADER {
- #define IMAGE_FILE_MACHINE_R3000 0x162 // MIPS little-endian, 0540 big-endian
- #define IMAGE_FILE_MACHINE_R4000 0x166 // MIPS little-endian
- #define IMAGE_FILE_MACHINE_ALPHA 0x184 // Alpha_AXP
-+#define IMAGE_FILE_MACHINE_ARMTHUMB_MIXED 0x1c2 // Arm/Thumb
- #define IMAGE_FILE_MACHINE_POWERPC 0x1F0 // IBM PowerPC Little-Endian
-+#define IMAGE_FILE_MACHINE_IA64 0x200 // IA-64
- #define IMAGE_FILE_MACHINE_TAHOE 0x7cc // Intel EM machine
-+#define IMAGE_FILE_MACHINE_EBC 0xebc // EFI Byte Code
-+#define IMAGE_FILE_MACHINE_X64 0x8664 // x86_64
- //
- // Directory format.
- //
-diff --git a/inc/x86_64/pe.h b/inc/x86_64/pe.h
-index 16e40ef..979b936 100644
---- a/inc/x86_64/pe.h
-+++ b/inc/x86_64/pe.h
-@@ -98,8 +98,12 @@ typedef struct _IMAGE_FILE_HEADER {
- #define IMAGE_FILE_MACHINE_R3000 0x162 // MIPS little-endian, 0540 big-endian
- #define IMAGE_FILE_MACHINE_R4000 0x166 // MIPS little-endian
- #define IMAGE_FILE_MACHINE_ALPHA 0x184 // Alpha_AXP
-+#define IMAGE_FILE_MACHINE_ARMTHUMB_MIXED 0x1c2 // Arm/Thumb
- #define IMAGE_FILE_MACHINE_POWERPC 0x1F0 // IBM PowerPC Little-Endian
-+#define IMAGE_FILE_MACHINE_IA64 0x200 // IA-64
- #define IMAGE_FILE_MACHINE_TAHOE 0x7cc // Intel EM machine
-+#define IMAGE_FILE_MACHINE_EBC 0xebc // EFI Byte Code
-+#define IMAGE_FILE_MACHINE_X64 0x8664 // x86_64
- //
- // Directory format.
- //
---
-1.7.10.4
-
diff --git a/grub/grub.nm b/grub/grub.nm
index cd39743..d7b36bb 100644
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -4,9 +4,11 @@
###############################################################################
name = grub
-version = 2.00
-release = 5.1
+version = 2.02
+beta = beta3
+release = 0.%{beta}.1
sup_arches = x86_64 i686
+thisapp = %{name}-%{version}~%{beta}
groups = System/Boot
url = http://www.gnu.org/software/grub/
@@ -39,38 +41,54 @@ build
gettext
libdevmapper-devel
ncurses-devel
- paxctl
zlib-devel
%{unifont}
end
+ # Don't leak our CFLAGS to boot code
+ export HOST_CFLAGS = %{CFLAGS}
+ export HOST_LDFLAGS = %{LDFLAGS}
+
+ platforms = efi
+
+ if "%{DISTRO_PLATFORM}" == "x86"
+ platforms += pc
+ end
+
prepare_cmds
cp -vf %{unifont} unifont.pcf.gz
./autogen.sh
+
+ for platform in %{platforms}; do
+ cp -r %{DIR_APP} %{DIR_APP}-${platform}
+ done
end
# As the modules contain always 32 bit code, they
# should be living in /usr/lib.
libdir = %{prefix}/lib
- configure_options += \
- --target="i386" \
- --with-platform=pc \
- --program-transform-name=s,grub,grub, \
- --disable-werror \
- CFLAGS="$(echo %{CFLAGS} | sed \
- -e 's/-Wp,-D_FORTIFY_SOURCE=2//g' \
- -e 's/-fstack-protector-strong//g' \
- -e 's/-fstack-protector-all//g' \
- -e 's/-fstack-protector//g' \
- -e 's/-fPIC//g' \
- -e 's/--param=ssp-buffer-size=4//g' \
- -e 's/-mregparm=3/-mregparm=4/g' \
- -e 's/-fexceptions//g' \
- -e 's/-m64//g' \
- -e 's/-fasynchronous-unwind-tables//g' )"
-
- install_cmds
+ build
+ for platform in %{platforms}; do
+ pushd %{DIR_APP}-${platform}
+ ./configure \
+ %{configure_options} \
+ --with-platform=${platform} \
+ --disable-werror \
+ CFLAGS= LDFLAGS=
+
+ make %{PARALLELISMFLAGS}
+ popd
+ done
+ end
+
+ install
+ for platform in %{platforms}; do
+ pushd %{DIR_APP}-${platform}
+ make install DESTDIR=%{BUILDROOT}
+ popd
+ done
+
# Install empty configuration file.
mkdir -pv %{BUILDROOT}/boot/grub
touch %{BUILDROOT}/boot/grub/grub.cfg
@@ -93,25 +111,11 @@ build
%{BUILDROOT}%{bindir}/grub-mkfont -o DejaVuSans-Bold-14.pf2 \
-s 14 %{datadir}/fonts/dejavu/DejaVuSans-Bold.ttf
popd
-
- # Disable hardening.
- paxctl -mpes \
- %{BUILDROOT}%{sbindir}/grub-bios-setup \
- %{BUILDROOT}%{sbindir}/grub-probe
-
- paxctl -mpex \
- %{BUILDROOT}%{bindir}/grub-script-check
end
debuginfo_strict_build_id = false
end
-quality-agent
- whitelist_nx
- %{bindir}/*|%{sbindir}/*
- end
-end
-
packages
package %{name}
requires
diff --git a/grub/patches/2.02_beta3-10_linux-UUID.patch b/grub/patches/2.02_beta3-10_linux-UUID.patch
new file mode 100644
index 0000000..1dcf3b5
--- /dev/null
+++ b/grub/patches/2.02_beta3-10_linux-UUID.patch
@@ -0,0 +1,27 @@
+From ea8de5d2ee58178381e5809e4d5fe79861e61b04 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym(a)gentoo.org>
+Date: Sat, 5 Mar 2016 17:21:15 -0500
+Subject: [PATCH] [2.02] 10_linux: Fix grouping of tests for GRUB_DEVICE
+
+Commit 7290bb562 causes GRUB_DISABLE_LINUX_UUID to be ignored due to
+mixing of || and && operators. Add some parens to help with that.
+---
+ util/grub.d/10_linux.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 5a78513..de9044c 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -47,7 +47,7 @@ esac
+ # and mounting btrfs requires user space scanning, so force UUID in this case.
+ if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
+ || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
+- || test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm; then
++ || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
+ LINUX_ROOT_DEVICE=${GRUB_DEVICE}
+ else
+ LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
+--
+2.7.2
+
diff --git a/grub/patches/2.02_beta3-gcc6-ld-no-pie.patch b/grub/patches/2.02_beta3-gcc6-ld-no-pie.patch
new file mode 100644
index 0000000..0d81415
--- /dev/null
+++ b/grub/patches/2.02_beta3-gcc6-ld-no-pie.patch
@@ -0,0 +1,57 @@
+2016-05-21 Magnus Granberg <zorry(a)gentoo.org>
+
+ #583042 sys-boot/grub-2.02_beta3-r1: building w/gcc-6[pie]: error:
+ x86_64-pc-linux-gnu/bin/ld: -r and -shared may not be used together
+
+ * acinclude.m4: Add -no-pie check.
+ * configure.ac: Add -no-pie to TARGET_LDFLAGS if needed.
+
+--- a/acinclude.m4 2015-11-11 20:56:52.000000000 +0100
++++ b/acinclude.m4 2016-05-17 00:08:22.000000000 +0200
+@@ -390,6 +390,24 @@ else
+ [fi]
+ ])
+
++dnl Check if the Linker supports `-no-pie'.
++AC_DEFUN([grub_CHECK_NO_PIE],
++[AC_MSG_CHECKING([whether linker accepts -no-pie])
++AC_CACHE_VAL(grub_cv_cc_ld_nopie,
++[save_LDFLAGS="$LDFLAGS"
++LDFLAGS="$LDFLAGS -no-pie"
++AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
++ [grub_cv_cc_ld_no_pie=yes],
++ [grub_cv_cc_ld_no_pie=no])
++LDFLAGS="$save_LDFLAGS"
++])
++AC_MSG_RESULT([$grub_cv_cc_ld_no_pie])
++nopie_possible=no
++if test "x$grub_cv_cc_ld_no_pie" = xyes ; then
++ nopie_possible=yes
++fi
++])
++
+ dnl Check if the C compiler supports `-fPIC'.
+ AC_DEFUN([grub_CHECK_PIC],[
+ [# Position independent executable.
+--- a/configure.ac 2016-02-27 13:40:56.000000000 +0100
++++ b/configure.ac 2016-05-17 00:57:29.471000000 +0200
+@@ -1184,13 +1184,18 @@ CFLAGS="$TARGET_CFLAGS"
+
+ # Position independent executable.
+ grub_CHECK_PIE
++grub_CHECK_NO_PIE
+ [# Need that, because some distributions ship compilers that include
+-# `-fPIE' in the default specs.
++# `-fPIE' and '-pie' in the default specs.
+ if [ x"$pie_possible" = xyes ]; then
+ TARGET_CFLAGS="$TARGET_CFLAGS -fno-PIE"
++fi
++if [ x"$nopie_possible" = xyes ] && [ x"$pie_possible" = xyes ]; then
++ TARGET_LDFLAGS="$TARGET_LDFLAGS -no-pie"
+ fi]
+
+ CFLAGS="$TARGET_CFLAGS"
++LDFLAGS="$TARGET_LDFLAGS"
+
+ # Position independent executable.
+ grub_CHECK_PIC
diff --git a/grub/patches/grub-1.99-just-say-linux.patch b/grub/patches/grub-1.99-just-say-linux.patch
deleted file mode 100644
index 62a6b32..0000000
--- a/grub/patches/grub-1.99-just-say-linux.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From d4bd41f972c6e22b86c773cbba2a1e14f400a8be Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones(a)redhat.com>
-Date: Mon, 14 Mar 2011 14:27:42 -0400
-Subject: [PATCH] Don't say "GNU/Linux" in generated menus.
-
----
- util/grub.d/10_linux.in | 4 ++--
- util/grub.d/20_linux_xen.in | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index a09c3e6..0b0df78 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -29,9 +29,9 @@ export TEXTDOMAINDIR=@localedir@
- CLASS="--class gnu-linux --class gnu --class os"
-
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-- OS=GNU/Linux
-+ OS="$(sed 's, release .*$,,g' /etc/system-release)"
- else
-- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+ OS="${GRUB_DISTRIBUTOR}"
- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
- fi
-
-diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index ee49cd9..10422b0 100644
---- a/util/grub.d/20_linux_xen.in
-+++ b/util/grub.d/20_linux_xen.in
-@@ -29,9 +29,9 @@ export TEXTDOMAINDIR=@localedir@
- CLASS="--class gnu-linux --class gnu --class os --class xen"
-
- if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-- OS=GNU/Linux
-+ OS="$(sed 's, release .*$,,g' /etc/system-release)"
- else
-- OS="${GRUB_DISTRIBUTOR} GNU/Linux"
-+ OS="${GRUB_DISTRIBUTOR}"
- CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1) ${CLASS}"
- fi
-
---
-1.7.4
-
diff --git a/grub/patches/grub-2.00-ignore-gnulib-gets-stupidity.patch b/grub/patches/grub-2.00-ignore-gnulib-gets-stupidity.patch
deleted file mode 100644
index 345c19d..0000000
--- a/grub/patches/grub-2.00-ignore-gnulib-gets-stupidity.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f66d54b934710f54999debb72e8b7c620edece1d Mon Sep 17 00:00:00 2001
-From: Peter Jones <pjones(a)redhat.com>
-Date: Fri, 25 May 2012 15:28:19 -0400
-Subject: [PATCH] gnulib accused in build breaking shocker.
-
----
- grub-core/gnulib/stdio.in.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/grub-core/gnulib/stdio.in.h b/grub-core/gnulib/stdio.in.h
-index 80b9dbf..69932d9 100644
---- a/grub-core/gnulib/stdio.in.h
-+++ b/grub-core/gnulib/stdio.in.h
-@@ -141,7 +141,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not always POSIX compliant - "
- so any use of gets warrants an unconditional warning. Assume it is
- always declared, since it is required by C89. */
- #undef gets
-+#if 0
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
-
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@
---
-1.7.10.1
-
diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 973441e..bbff192 100644
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -15,6 +15,7 @@ CONFIG_ARCH_HAS_TICK_BROADCAST=y
CONFIG_RCU_NOCB_CPU_NONE=y
# CONFIG_RCU_NOCB_CPU_ALL is not set
CONFIG_GENERIC_SCHED_CLOCK=y
+# CONFIG_KALLSYMS_ABSOLUTE_PERCPU is not set
CONFIG_PERF_USE_VMALLOC=y
#
@@ -26,6 +27,11 @@ CONFIG_CLONE_BACKWARDS=y
#
# Platform selection
#
+# CONFIG_ARCH_ALPINE is not set
+CONFIG_ARCH_MESON=y
+# CONFIG_ARCH_MVEBU is not set
+# CONFIG_ARCH_RENESAS is not set
+# CONFIG_ARCH_UNIPHIER is not set
CONFIG_ARCH_VEXPRESS=y
#
@@ -33,6 +39,10 @@ CONFIG_ARCH_VEXPRESS=y
#
CONFIG_PCI_DOMAINS_GENERIC=y
CONFIG_PCI_SYSCALL=y
+# CONFIG_PCIE_ECRC is not set
+# CONFIG_PCIEAER_INJECT is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
# CONFIG_PCI_MSI is not set
# CONFIG_PCI_STUB is not set
# CONFIG_PCI_IOV is not set
@@ -42,12 +52,8 @@ CONFIG_PCI_SYSCALL=y
#
# PCI host controller drivers
#
-CONFIG_PCIE_DW=y
+CONFIG_PCI_HOST_COMMON=y
CONFIG_PCI_HOST_GENERIC=y
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCIEAER_INJECT is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
#
# ARM errata workarounds via the alternatives framework
@@ -56,6 +62,8 @@ CONFIG_PCIEASPM_DEFAULT=y
CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y
CONFIG_HW_PERF_EVENTS=y
CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
+# CONFIG_PARAVIRT is not set
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
#
# Boot options
@@ -97,7 +105,6 @@ CONFIG_ARM_SCPI_CPUFREQ=m
# Device Drivers
#
CONFIG_ARM_AMBA=y
-CONFIG_TEGRA_AHB=y
#
# Generic Driver Options
@@ -121,7 +128,7 @@ CONFIG_ARM_CCI=y
CONFIG_ARM_CCI_PMU=y
CONFIG_ARM_CCI400_COMMON=y
CONFIG_ARM_CCI400_PMU=y
-CONFIG_ARM_CCI500_PMU=y
+CONFIG_ARM_CCI5xx_PMU=y
# CONFIG_ARM_CCN is not set
CONFIG_VEXPRESS_CONFIG=y
CONFIG_DTC=y
@@ -240,7 +247,7 @@ CONFIG_INPUT_MAX77693_HAPTIC=m
# Serial drivers
#
CONFIG_SERIAL_8250_FSL=y
-CONFIG_SERIAL_8250_INGENIC=y
+CONFIG_SERIAL_OF_PLATFORM=y
#
# Non-8250 serial port support
@@ -248,8 +255,8 @@ CONFIG_SERIAL_8250_INGENIC=y
CONFIG_SERIAL_AMBA_PL010=m
CONFIG_SERIAL_AMBA_PL011=m
CONFIG_SERIAL_EARLYCON_ARM_SEMIHOST=y
+CONFIG_SERIAL_MESON=m
# CONFIG_SERIAL_JSM is not set
-CONFIG_SERIAL_OF_PLATFORM=y
# CONFIG_SERIAL_SCCNXP is not set
# CONFIG_SERIAL_XILINX_PS_UART is not set
# CONFIG_SERIAL_ARC is not set
@@ -272,6 +279,7 @@ CONFIG_I2C_SIS630=m
#
# I2C system bus drivers (mostly embedded / system-on-chip)
#
+CONFIG_I2C_MESON=m
CONFIG_I2C_VERSATILE=m
#
@@ -318,6 +326,7 @@ CONFIG_SENSORS_VEXPRESS=m
# Watchdog Device Drivers
#
CONFIG_ARM_SP805_WATCHDOG=m
+CONFIG_MESON_WATCHDOG=m
#
# PCI-based Watchdog Cards
@@ -348,6 +357,11 @@ CONFIG_REGULATOR_VEXPRESS=m
# CONFIG_TTPCI_EEPROM is not set
#
+# Media drivers
+#
+# CONFIG_IR_MESON is not set
+
+#
# Digital TV USB devices
#
CONFIG_DVB_TTUSB_BUDGET=y
@@ -399,9 +413,18 @@ CONFIG_DVB_STV0297=y
CONFIG_DVB_LNBP21=y
#
+# Graphics support
+#
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+
+#
# I2C encoder or helper chips
#
# CONFIG_DRM_I2C_NXP_TDA998X is not set
+CONFIG_DRM_ARM=y
+CONFIG_DRM_HDLCD=m
+# CONFIG_DRM_HDLCD_SHOW_UNDERRUN is not set
#
# Frame buffer hardware drivers
@@ -427,6 +450,7 @@ CONFIG_SND_DMAENGINE_PCM=m
CONFIG_SND_SOC=m
CONFIG_SND_SOC_AC97_BUS=y
CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_AMD_ACP=m
CONFIG_SND_ATMEL_SOC=m
CONFIG_SND_DESIGNWARE_I2S=m
@@ -439,11 +463,13 @@ CONFIG_SND_SOC_FSL_SSI=m
CONFIG_SND_SOC_FSL_SPDIF=m
CONFIG_SND_SOC_FSL_ESAI=m
CONFIG_SND_SOC_IMX_AUDMUX=m
+# CONFIG_SND_SOC_IMG is not set
#
# Allwinner SoC Audio support
#
CONFIG_SND_SUN4I_CODEC=m
+CONFIG_SND_SUN4I_SPDIF=m
CONFIG_SND_SOC_I2C_AND_SPI=m
#
@@ -471,9 +497,16 @@ CONFIG_SND_SOC_CS42XX8_I2C=m
CONFIG_SND_SOC_CS4349=m
CONFIG_SND_SOC_ES8328=m
CONFIG_SND_SOC_GTM601=m
+CONFIG_SND_SOC_INNO_RK3036=m
CONFIG_SND_SOC_PCM1681=m
+CONFIG_SND_SOC_PCM179X=m
+CONFIG_SND_SOC_PCM179X_I2C=m
+CONFIG_SND_SOC_PCM3168A=m
+CONFIG_SND_SOC_PCM3168A_I2C=m
CONFIG_SND_SOC_PCM512x=m
CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RT5616=m
CONFIG_SND_SOC_RT5631=m
# CONFIG_SND_SOC_RT5677_SPI is not set
CONFIG_SND_SOC_SGTL5000=m
@@ -511,6 +544,7 @@ CONFIG_SND_SOC_WM8804=m
CONFIG_SND_SOC_WM8804_I2C=m
CONFIG_SND_SOC_WM8903=m
CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8974=m
CONFIG_SND_SOC_WM8978=m
CONFIG_SND_SOC_TPA6130A2=m
CONFIG_SND_SIMPLE_CARD=m
@@ -588,6 +622,9 @@ CONFIG_ARM_MHU=m
CONFIG_IOMMU_IO_PGTABLE=y
CONFIG_IOMMU_IO_PGTABLE_LPAE=y
# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
+CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
+# CONFIG_IOMMU_IO_PGTABLE_ARMV7S_SELFTEST is not set
+CONFIG_IOMMU_DMA=y
#
# Extcon Device Drivers
diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic
index ca3f8ba..d84721f 100644
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -31,6 +31,9 @@ CONFIG_CONTEXT_TRACKING_FORCE=y
CONFIG_ARCH_USE_BUILTIN_BSWAP=y
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y
CONFIG_MODULES_USE_ELF_REL=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_BITS_MAX=16
+CONFIG_ARCH_MMAP_RND_BITS=16
CONFIG_OLD_SIGACTION=y
#
@@ -42,8 +45,6 @@ CONFIG_LBDAF=y
# System Type
#
CONFIG_ARCH_MULTIPLATFORM=y
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_VERSATILE is not set
# CONFIG_ARCH_CLPS711X is not set
# CONFIG_ARCH_GEMINI is not set
# CONFIG_ARCH_EBSA110 is not set
@@ -55,9 +56,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
# CONFIG_ARCH_IOP33X is not set
# CONFIG_ARCH_IXP4XX is not set
# CONFIG_ARCH_DOVE is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_MMP is not set
# CONFIG_ARCH_KS8695 is not set
# CONFIG_ARCH_W90X900 is not set
# CONFIG_ARCH_LPC32XX is not set
@@ -65,7 +63,6 @@ CONFIG_ARCH_MULTIPLATFORM=y
# CONFIG_ARCH_RPC is not set
# CONFIG_ARCH_SA1100 is not set
# CONFIG_ARCH_S3C24XX is not set
-# CONFIG_ARCH_S3C64XX is not set
# CONFIG_ARCH_DAVINCI is not set
# CONFIG_ARCH_OMAP1 is not set
@@ -77,8 +74,7 @@ CONFIG_ARCH_MULTI_V7=y
CONFIG_ARCH_MULTI_V6_V7=y
# CONFIG_ARCH_MULTI_CPU_AUTO is not set
CONFIG_ARCH_VIRT=y
-# CONFIG_ARCH_MVEBU is not set
-# CONFIG_ARCH_ALPINE is not set
+# CONFIG_ARCH_ARTPEC is not set
# CONFIG_ARCH_AT91 is not set
CONFIG_ARCH_BCM=y
@@ -99,6 +95,7 @@ CONFIG_ARCH_BCM_5301X=y
#
# Other Architectures
#
+# CONFIG_ARCH_BCM2835 is not set
CONFIG_ARCH_BCM_63XX=y
CONFIG_ARCH_BRCMSTB=y
CONFIG_ARCH_BERLIN=y
@@ -117,7 +114,6 @@ CONFIG_ARCH_HI3xxx=y
CONFIG_ARCH_HIP04=y
CONFIG_ARCH_HIX5HD2=y
CONFIG_ARCH_KEYSTONE=y
-CONFIG_ARCH_MESON=y
CONFIG_MACH_MESON6=y
CONFIG_MACH_MESON8=y
CONFIG_MACH_MESON8B=y
@@ -146,6 +142,7 @@ CONFIG_VF_USE_ARM_GLOBAL_TIMER=y
CONFIG_ARCH_MEDIATEK=y
CONFIG_MACH_MT6589=y
CONFIG_MACH_MT6592=y
+CONFIG_MACH_MT7623=y
CONFIG_MACH_MT8127=y
CONFIG_MACH_MT8135=y
CONFIG_ARCH_OMAP=y
@@ -194,10 +191,12 @@ CONFIG_MACH_OMAP3517EVM=y
CONFIG_MACH_OMAP3_PANDORA=y
CONFIG_MACH_NOKIA_RX51=y
# CONFIG_OMAP3_SDRC_AC_TIMING is not set
+# CONFIG_ARCH_MMP is not set
CONFIG_ARCH_QCOM=y
# CONFIG_ARCH_MSM8X60 is not set
# CONFIG_ARCH_MSM8960 is not set
# CONFIG_ARCH_MSM8974 is not set
+# CONFIG_ARCH_REALVIEW is not set
CONFIG_ARCH_ROCKCHIP=y
# CONFIG_ARCH_SOCFPGA is not set
# CONFIG_PLAT_SPEAR is not set
@@ -230,28 +229,14 @@ CONFIG_EXYNOS_CPU_SUSPEND=y
CONFIG_PLAT_SAMSUNG=y
#
+# Boot options
+#
+# CONFIG_SAMSUNG_ATAGS is not set
+
+#
# Power management
#
# CONFIG_SAMSUNG_PM_CHECK is not set
-CONFIG_ARCH_SHMOBILE=y
-CONFIG_PM_RCAR=y
-CONFIG_ARCH_RCAR_GEN1=y
-CONFIG_ARCH_SHMOBILE_MULTI=y
-# CONFIG_ARCH_EMEV2 is not set
-# CONFIG_ARCH_R7S72100 is not set
-# CONFIG_ARCH_R8A73A4 is not set
-# CONFIG_ARCH_R8A7740 is not set
-# CONFIG_ARCH_R8A7778 is not set
-CONFIG_ARCH_R8A7779=y
-# CONFIG_ARCH_R8A7790 is not set
-# CONFIG_ARCH_R8A7791 is not set
-# CONFIG_ARCH_R8A7793 is not set
-# CONFIG_ARCH_R8A7794 is not set
-# CONFIG_ARCH_SH73A0 is not set
-
-#
-# Renesas ARM SoCs System Configuration
-#
CONFIG_ARCH_SUNXI=y
CONFIG_MACH_SUN4I=y
CONFIG_MACH_SUN5I=y
@@ -268,12 +253,8 @@ CONFIG_ARCH_ATLAS6=y
CONFIG_ARCH_ATLAS7=y
CONFIG_ARCH_PRIMA2=y
CONFIG_SIRF_IRQ=y
+# CONFIG_ARCH_TANGO is not set
CONFIG_ARCH_TEGRA=y
-CONFIG_ARCH_TEGRA_2x_SOC=y
-CONFIG_ARCH_TEGRA_3x_SOC=y
-CONFIG_ARCH_TEGRA_114_SOC=y
-CONFIG_ARCH_TEGRA_124_SOC=y
-# CONFIG_ARCH_UNIPHIER is not set
CONFIG_ARCH_U8500=y
CONFIG_UX500_SOC_DB8500=y
CONFIG_MACH_MOP500=y
@@ -340,7 +321,7 @@ CONFIG_ARM_L1_CACHE_SHIFT=6
CONFIG_ARM_DMA_MEM_BUFFERABLE=y
CONFIG_ARM_HEAVY_MB=y
CONFIG_ARCH_SUPPORTS_BIG_ENDIAN=y
-CONFIG_ARM_KERNMEM_PERMS=y
+CONFIG_DEBUG_ALIGN_RODATA=y
CONFIG_MULTI_IRQ_HANDLER=y
# CONFIG_ARM_ERRATA_430973 is not set
CONFIG_ARM_ERRATA_643719=y
@@ -359,15 +340,14 @@ CONFIG_ICST=y
CONFIG_PCI_EXYNOS=y
CONFIG_PCI_IMX6=y
CONFIG_PCI_TEGRA=y
-CONFIG_PCI_RCAR_GEN2=y
-CONFIG_PCI_RCAR_GEN2_PCIE=y
CONFIG_PCI_KEYSTONE=y
CONFIG_PCIE_XILINX=y
CONFIG_PCI_LAYERSCAPE=y
-CONFIG_PCIE_IPROC=y
+CONFIG_PCIE_IPROC=m
CONFIG_PCIE_IPROC_PLATFORM=m
# CONFIG_PCIE_IPROC_BCMA is not set
CONFIG_PCIE_ALTERA=y
+CONFIG_PCIE_QCOM=y
# CONFIG_PCCARD is not set
#
@@ -392,12 +372,14 @@ CONFIG_HZ=200
CONFIG_THUMB2_KERNEL=y
CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
CONFIG_ARM_ASM_UNIFIED=y
+CONFIG_ARM_PATCH_IDIV=y
CONFIG_AEABI=y
# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
CONFIG_HIGHMEM=y
# CONFIG_HIGHPTE is not set
CONFIG_CPU_SW_DOMAIN_PAN=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
# CONFIG_ARM_MODULE_PLTS is not set
CONFIG_FLATMEM=y
CONFIG_FLAT_NODE_MEM_MAP=y
@@ -422,6 +404,7 @@ CONFIG_CMDLINE_FROM_BOOTLOADER=y
# CONFIG_KEXEC is not set
CONFIG_CRASH_DUMP=y
CONFIG_AUTO_ZRELADDR=y
+# CONFIG_EFI is not set
#
# CPU frequency scaling drivers
@@ -433,6 +416,7 @@ CONFIG_ARM_HIGHBANK_CPUFREQ=m
CONFIG_ARM_HISI_ACPU_CPUFREQ=m
CONFIG_ARM_IMX6Q_CPUFREQ=m
CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
+CONFIG_ARM_STI_CPUFREQ=m
CONFIG_ARM_TEGRA20_CPUFREQ=y
CONFIG_ARM_TEGRA124_CPUFREQ=m
CONFIG_QORIQ_CPUFREQ=m
@@ -459,13 +443,15 @@ CONFIG_NEON=y
#
# CONFIG_HIBERNATION is not set
CONFIG_APM_EMULATION=y
-CONFIG_PM_GENERIC_DOMAINS=y
-CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
-CONFIG_PM_GENERIC_DOMAINS_OF=y
CONFIG_ARM_CPU_SUSPEND=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
#
+# Device Drivers
+#
+CONFIG_TEGRA_AHB=y
+
+#
# Generic Driver Options
#
CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
@@ -479,8 +465,8 @@ CONFIG_BRCMSTB_GISB_ARB=y
# CONFIG_IMX_WEIM is not set
CONFIG_OMAP_INTERCONNECT=y
# CONFIG_OMAP_OCP2SCP is not set
-CONFIG_SIMPLE_PM_BUS=y
CONFIG_SUNXI_RSB=m
+CONFIG_OF_DYNAMIC=y
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
# CONFIG_MG_DISK is not set
@@ -491,7 +477,7 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
# CONFIG_ARM_CHARLCD is not set
#
-# Intel MIC Coprocessor State Management (COSM) Drivers
+# VOP Driver
#
# CONFIG_IDE is not set
@@ -514,7 +500,6 @@ CONFIG_AHCI_TEGRA=m
# SATA SFF controllers with BMDMA
#
CONFIG_SATA_HIGHBANK=m
-CONFIG_SATA_RCAR=m
#
# PATA SFF controllers with BMDMA
@@ -543,10 +528,10 @@ CONFIG_FSL_PQ_MDIO=m
CONFIG_FSL_XGMAC_MDIO=m
CONFIG_GIANFAR=m
CONFIG_PXA168_ETH=m
+CONFIG_NET_VENDOR_MEDIATEK=y
+CONFIG_NET_MEDIATEK_SOC=m
CONFIG_AX88796=m
CONFIG_AX88796_93CX6=y
-CONFIG_SH_ETH=m
-CONFIG_RAVB=m
CONFIG_SMC911X=m
CONFIG_TI_DAVINCI_EMAC=m
CONFIG_TI_DAVINCI_MDIO=m
@@ -583,7 +568,6 @@ CONFIG_KEYBOARD_TEGRA=m
CONFIG_KEYBOARD_PMIC8XXX=m
CONFIG_KEYBOARD_SAMSUNG=y
# CONFIG_KEYBOARD_ST_KEYSCAN is not set
-CONFIG_KEYBOARD_SH_KEYSC=m
CONFIG_KEYBOARD_SUN4I_LRADC=m
# CONFIG_INPUT_AB8500_PONKEY is not set
CONFIG_INPUT_PM8941_PWRKEY=m
@@ -606,21 +590,18 @@ CONFIG_SERIAL_8250_MT6577=y
#
# Non-8250 serial port support
#
-CONFIG_SERIAL_MESON=m
CONFIG_SERIAL_SAMSUNG=m
CONFIG_SERIAL_SAMSUNG_UARTS_4=y
CONFIG_SERIAL_SAMSUNG_UARTS=4
CONFIG_SERIAL_SIRFSOC=m
CONFIG_SERIAL_IMX=m
-CONFIG_SERIAL_SH_SCI=m
-CONFIG_SERIAL_SH_SCI_NR_UARTS=2
-CONFIG_SERIAL_SH_SCI_DMA=y
# CONFIG_SERIAL_MSM is not set
# CONFIG_SERIAL_VT8500 is not set
CONFIG_SERIAL_OMAP=m
CONFIG_SERIAL_BCM63XX=m
CONFIG_SERIAL_ST_ASC=m
CONFIG_SERIAL_STM32=m
+CONFIG_SERIAL_MCTRL_GPIO=m
# CONFIG_HVC_DCC is not set
CONFIG_HW_RANDOM_IPROC_RNG200=m
CONFIG_HW_RANDOM_OMAP=y
@@ -634,6 +615,7 @@ CONFIG_NVRAM=y
# Multiplexer I2C Chip support
#
CONFIG_I2C_MUX_PINCTRL=m
+CONFIG_I2C_DEMUX_PINCTRL=m
#
# PC SMBus host controller drivers
@@ -649,27 +631,21 @@ CONFIG_I2C_BCM_IPROC=m
CONFIG_I2C_DAVINCI=m
CONFIG_I2C_EXYNOS5=m
CONFIG_I2C_IMX=m
-CONFIG_I2C_MESON=m
CONFIG_I2C_MT65XX=m
CONFIG_I2C_MV64XXX=m
CONFIG_I2C_NOMADIK=y
CONFIG_I2C_OMAP=y
CONFIG_I2C_QUP=m
-CONFIG_I2C_RIIC=m
CONFIG_I2C_S3C2410=m
-CONFIG_I2C_SH_MOBILE=m
CONFIG_I2C_SIRF=m
CONFIG_I2C_ST=m
CONFIG_I2C_SUN6I_P2WI=m
CONFIG_I2C_TEGRA=m
CONFIG_I2C_WMT=m
-CONFIG_I2C_RCAR=m
#
# Other I2C/SMBus bus drivers
#
-CONFIG_I2C_SLAVE=y
-# CONFIG_I2C_SLAVE_EEPROM is not set
CONFIG_SPMI_MSM_PMIC_ARB=m
#
@@ -708,14 +684,9 @@ CONFIG_PINCTRL_ROCKCHIP=y
CONFIG_PINCTRL_SINGLE=y
CONFIG_PINCTRL_SIRF=y
CONFIG_PINCTRL_ST=y
-CONFIG_PINCTRL_TEGRA=y
-CONFIG_PINCTRL_TEGRA20=y
-CONFIG_PINCTRL_TEGRA30=y
-CONFIG_PINCTRL_TEGRA114=y
-CONFIG_PINCTRL_TEGRA124=y
-CONFIG_PINCTRL_TEGRA_XUSB=y
# CONFIG_PINCTRL_PALMAS is not set
CONFIG_PINCTRL_ZYNQ=y
+CONFIG_PINCTRL_IPROC_GPIO=y
CONFIG_PINCTRL_BERLIN=y
# CONFIG_PINCTRL_BERLIN_BG2 is not set
# CONFIG_PINCTRL_BERLIN_BG2CD is not set
@@ -737,20 +708,19 @@ CONFIG_PINCTRL_DB8540=y
CONFIG_PINCTRL_MSM=y
CONFIG_PINCTRL_APQ8064=y
CONFIG_PINCTRL_APQ8084=y
+CONFIG_PINCTRL_IPQ4019=y
CONFIG_PINCTRL_IPQ8064=y
CONFIG_PINCTRL_MSM8660=m
CONFIG_PINCTRL_MSM8960=m
CONFIG_PINCTRL_MSM8X74=m
CONFIG_PINCTRL_MSM8916=m
+CONFIG_PINCTRL_MSM8996=m
CONFIG_PINCTRL_QCOM_SPMI_PMIC=m
CONFIG_PINCTRL_QCOM_SSBI_PMIC=m
CONFIG_PINCTRL_SAMSUNG=y
CONFIG_PINCTRL_EXYNOS=y
CONFIG_PINCTRL_EXYNOS5440=y
-CONFIG_PINCTRL_SH_PFC=y
-CONFIG_GPIO_SH_PFC=y
-CONFIG_PINCTRL_PFC_R8A7779=y
-CONFIG_PINCTRL_SUNXI_COMMON=y
+CONFIG_PINCTRL_SUNXI=y
CONFIG_PINCTRL_SUN4I_A10=y
CONFIG_PINCTRL_SUN5I_A10S=y
CONFIG_PINCTRL_SUN5I_A13=y
@@ -762,9 +732,20 @@ CONFIG_PINCTRL_SUN8I_A23=y
CONFIG_PINCTRL_SUN8I_A33=y
CONFIG_PINCTRL_SUN8I_A83T=y
CONFIG_PINCTRL_SUN8I_A23_R=y
+CONFIG_PINCTRL_SUN8I_H3=y
+CONFIG_PINCTRL_SUN8I_H3_R=y
CONFIG_PINCTRL_SUN9I_A80=y
+CONFIG_PINCTRL_SUN9I_A80_R=y
+CONFIG_PINCTRL_TEGRA=y
+CONFIG_PINCTRL_TEGRA20=y
+CONFIG_PINCTRL_TEGRA30=y
+CONFIG_PINCTRL_TEGRA114=y
+CONFIG_PINCTRL_TEGRA124=y
+CONFIG_PINCTRL_TEGRA_XUSB=y
# CONFIG_PINCTRL_WM8850 is not set
-CONFIG_PINCTRL_MTK_COMMON=y
+CONFIG_PINCTRL_MTK=y
+# CONFIG_PINCTRL_MT2701 is not set
+CONFIG_PINCTRL_MT7623=y
CONFIG_PINCTRL_MT8135=y
CONFIG_PINCTRL_MT8127=y
CONFIG_PINCTRL_MT6397=y
@@ -777,9 +758,9 @@ CONFIG_GPIO_BRCMSTB=m
# CONFIG_GPIO_DAVINCI is not set
# CONFIG_GPIO_DWAPB is not set
# CONFIG_GPIO_EM is not set
+# CONFIG_GPIO_MPC8XXX is not set
CONFIG_GPIO_MXC=y
CONFIG_GPIO_OMAP=y
-# CONFIG_GPIO_RCAR is not set
CONFIG_GPIO_VF610=y
# CONFIG_GPIO_XILINX is not set
# CONFIG_GPIO_ZEVIO is not set
@@ -804,10 +785,10 @@ CONFIG_POWER_RESET_KEYSTONE=y
#
# CONFIG_HISI_THERMAL is not set
CONFIG_ROCKCHIP_THERMAL=m
-CONFIG_RCAR_THERMAL=y
CONFIG_DB8500_THERMAL=y
CONFIG_TEGRA_SOCTHERM=m
CONFIG_DB8500_CPUFREQ_COOLING=y
+CONFIG_MTK_THERMAL=m
#
# Texas Instruments thermal drivers
@@ -839,14 +820,21 @@ CONFIG_SIRFSOC_WATCHDOG=y
CONFIG_ST_LPC_WATCHDOG=m
CONFIG_TEGRA_WATCHDOG=m
CONFIG_QCOM_WDT=m
-CONFIG_MESON_WATCHDOG=m
CONFIG_MEDIATEK_WATCHDOG=m
+CONFIG_ATLAS7_WATCHDOG=m
CONFIG_BCM47XX_WDT=m
+CONFIG_BCM7038_WDT=m
+
+#
+# Sonics Silicon Backplane
+#
+CONFIG_SSB_HOST_SOC=y
#
# Multifunction device drivers
#
CONFIG_MFD_ATMEL_HLCDC=m
+CONFIG_MFD_AXP20X_RSB=m
# CONFIG_MFD_CROS_EC is not set
# CONFIG_MFD_ASIC3 is not set
# CONFIG_HTC_EGPIO is not set
@@ -884,32 +872,24 @@ CONFIG_REGULATOR_TWL4030=y
#
# Media drivers
#
-# CONFIG_IR_MESON is not set
# CONFIG_RC_ST is not set
CONFIG_IR_SUNXI=m
#
# Media digital TV PCI Adapters
#
-# CONFIG_VIDEO_OMAP2_VOUT is not set
-# CONFIG_VIDEO_SH_VOU is not set
CONFIG_VIDEO_OMAP3=m
# CONFIG_VIDEO_OMAP3_DEBUG is not set
-CONFIG_VIDEO_MX3=m
-# CONFIG_VIDEO_RCAR_VIN is not set
-# CONFIG_VIDEO_SH_MOBILE_CSI2 is not set
-# CONFIG_VIDEO_SH_MOBILE_CEU is not set
# CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set
# CONFIG_VIDEO_SAMSUNG_S5P_TV is not set
# CONFIG_VIDEO_AM437X_VPFE is not set
+# CONFIG_VIDEO_TI_CAL is not set
# CONFIG_VIDEO_CODA is not set
CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
CONFIG_VIDEO_STI_BDISP=m
-# CONFIG_VIDEO_RENESAS_JPU is not set
-CONFIG_VIDEO_RENESAS_VSP1=m
# CONFIG_VIDEO_TI_VPE is not set
CONFIG_DVB_C8SECTPFE=m
@@ -924,11 +904,9 @@ CONFIG_DVB_STV0367=m
CONFIG_TEGRA_HOST1X=y
CONFIG_TEGRA_HOST1X_FIREWALL=y
CONFIG_IMX_IPUV3_CORE=m
-CONFIG_DRM_GEM_CMA_HELPER=y
-CONFIG_DRM_KMS_CMA_HELPER=y
#
-# I2C encoder or helper chips
+# ACP (Audio CoProcessor) Configuration
#
CONFIG_NOUVEAU_PLATFORM_DRIVER=y
CONFIG_DRM_EXYNOS=m
@@ -952,17 +930,44 @@ CONFIG_DRM_EXYNOS_MIC=y
#
# Sub-drivers
#
-CONFIG_DRM_EXYNOS_G2D=y
CONFIG_DRM_EXYNOS_IPP=y
# CONFIG_DRM_EXYNOS_FIMC is not set
# CONFIG_DRM_EXYNOS_ROTATOR is not set
+CONFIG_DRM_EXYNOS_GSC=y
CONFIG_DRM_ROCKCHIP=m
CONFIG_ROCKCHIP_DW_HDMI=m
+CONFIG_ROCKCHIP_DW_MIPI_DSI=m
+CONFIG_ROCKCHIP_INNO_HDMI=m
CONFIG_DRM_ARMADA=m
CONFIG_DRM_ATMEL_HLCDC=m
-CONFIG_DRM_RCAR_DU=m
-# CONFIG_DRM_RCAR_HDMI is not set
-CONFIG_DRM_SHMOBILE=m
+CONFIG_DRM_OMAP=m
+CONFIG_DRM_OMAP_NUM_CRTCS=1
+CONFIG_OMAP2_DSS_INIT=y
+CONFIG_OMAP2_DSS=m
+# CONFIG_OMAP2_DSS_DEBUG is not set
+# CONFIG_OMAP2_DSS_DEBUGFS is not set
+CONFIG_OMAP2_DSS_DPI=y
+CONFIG_OMAP2_DSS_VENC=y
+CONFIG_OMAP2_DSS_HDMI_COMMON=y
+CONFIG_OMAP4_DSS_HDMI=y
+CONFIG_OMAP5_DSS_HDMI=y
+CONFIG_OMAP2_DSS_SDI=y
+CONFIG_OMAP2_DSS_DSI=y
+CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0
+CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y
+
+#
+# OMAPDRM External Display Device Drivers
+#
+# CONFIG_DISPLAY_ENCODER_OPA362 is not set
+# CONFIG_DISPLAY_ENCODER_TFP410 is not set
+# CONFIG_DISPLAY_ENCODER_TPD12S015 is not set
+# CONFIG_DISPLAY_CONNECTOR_DVI is not set
+# CONFIG_DISPLAY_CONNECTOR_HDMI is not set
+# CONFIG_DISPLAY_CONNECTOR_ANALOG_TV is not set
+# CONFIG_DISPLAY_PANEL_DPI is not set
+# CONFIG_DISPLAY_PANEL_DSI_CM is not set
+# CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01 is not set
# CONFIG_DRM_TILCDC is not set
CONFIG_DRM_MSM=m
# CONFIG_DRM_MSM_REGISTER_LOGGING is not set
@@ -970,9 +975,9 @@ CONFIG_DRM_MSM_DSI=y
CONFIG_DRM_MSM_DSI_PLL=y
CONFIG_DRM_MSM_DSI_28NM_PHY=y
CONFIG_DRM_MSM_DSI_20NM_PHY=y
+CONFIG_DRM_MSM_DSI_28NM_8960_PHY=y
CONFIG_DRM_FSL_DCU=m
CONFIG_DRM_TEGRA=m
-CONFIG_DRM_TEGRA_FBDEV=y
# CONFIG_DRM_TEGRA_DEBUG is not set
#
@@ -982,6 +987,8 @@ CONFIG_DRM_DW_HDMI=m
CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
# CONFIG_DRM_STI is not set
# CONFIG_DRM_IMX is not set
+CONFIG_DRM_ETNAVIV=m
+# CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
#
# Frame buffer hardware drivers
@@ -989,16 +996,13 @@ CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
# CONFIG_FB_IMX is not set
# CONFIG_FB_VT8500 is not set
# CONFIG_FB_WM8505 is not set
-# CONFIG_FB_SH_MOBILE_LCDC is not set
# CONFIG_FB_S3C is not set
# CONFIG_FB_XILINX is not set
# CONFIG_FB_DA8XX is not set
# CONFIG_FB_MX3 is not set
# CONFIG_FB_MXS is not set
-# CONFIG_OMAP2_DSS is not set
CONFIG_EXYNOS_VIDEO=y
# CONFIG_EXYNOS_MIPI_DSI is not set
-# CONFIG_FB_SH_MOBILE_MERAM is not set
#
# Console display driver support
@@ -1013,10 +1017,6 @@ CONFIG_SND_HDA_TEGRA=m
CONFIG_SND_ARM=y
CONFIG_SND_ARMAACI=m
# CONFIG_SND_SOC_ADI is not set
-CONFIG_SND_EDMA_SOC=m
-CONFIG_SND_DAVINCI_SOC_MCASP=m
-CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=m
-CONFIG_SND_AM33XX_SOC_EVM=m
#
# Common SoC Audio options for Freescale CPUs:
@@ -1037,6 +1037,8 @@ CONFIG_SND_SOC_IMX_SPDIF=m
CONFIG_SND_SOC_FSL_ASOC_CARD=m
CONFIG_SND_SOC_MEDIATEK=m
CONFIG_SND_SOC_MT8173_MAX98090=m
+CONFIG_SND_SOC_MT8173_RT5650=m
+CONFIG_SND_SOC_MT8173_RT5650_RT5514=m
CONFIG_SND_SOC_MT8173_RT5650_RT5676=m
CONFIG_SND_SOC_QCOM=m
CONFIG_SND_SOC_LPASS_CPU=m
@@ -1060,13 +1062,6 @@ CONFIG_SND_SOC_SMDK_WM8994_PCM=m
CONFIG_SND_SOC_SNOW=m
CONFIG_SND_SOC_ODROIDX2=m
CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
-
-#
-# SoC Audio support for SuperH
-#
-CONFIG_SND_SOC_SH4_FSI=m
-CONFIG_SND_SOC_RCAR=m
-CONFIG_SND_SOC_RSRC_CARD=m
CONFIG_SND_SOC_SIRF=m
CONFIG_SND_SOC_SIRF_AUDIO=m
CONFIG_SND_SOC_SIRF_AUDIO_PORT=m
@@ -1088,7 +1083,7 @@ CONFIG_SND_SOC_ES8328_I2C=m
CONFIG_SND_SOC_MAX98090=m
CONFIG_SND_SOC_MAX98095=m
CONFIG_SND_SOC_MAX98357A=m
-CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RT5514=m
CONFIG_SND_SOC_RT5645=m
CONFIG_SND_SOC_RT5677=m
CONFIG_SND_SOC_WM8994=m
@@ -1096,7 +1091,7 @@ CONFIG_SND_SOC_WM8994=m
#
# USB Host Controller Drivers
#
-CONFIG_USB_XHCI_RCAR=m
+CONFIG_USB_XHCI_MTK=m
CONFIG_USB_EHCI_MXC=y
CONFIG_USB_EHCI_HCD_OMAP=y
CONFIG_USB_EHCI_HCD_STI=m
@@ -1135,7 +1130,6 @@ CONFIG_USB_DWC3_OMAP=m
CONFIG_USB_DWC3_EXYNOS=m
CONFIG_USB_DWC3_KEYSTONE=m
CONFIG_USB_DWC3_ST=m
-CONFIG_USB_DWC3_QCOM=m
#
# USB Physical Layer drivers
@@ -1147,7 +1141,6 @@ CONFIG_AM335X_PHY_USB=m
CONFIG_USB_MSM_OTG=m
CONFIG_USB_QCOM_8X16_PHY=m
CONFIG_USB_MXS_PHY=m
-CONFIG_USB_RCAR_PHY=m
#
# MMC/SD/SDIO Host Controller Drivers
@@ -1165,10 +1158,7 @@ CONFIG_MMC_OMAP=m
CONFIG_MMC_OMAP_HS=m
CONFIG_MMC_SDHCI_MSM=m
CONFIG_MMC_MXC=m
-CONFIG_MMC_TMIO_CORE=m
-CONFIG_MMC_SDHI=m
CONFIG_MMC_DW_ROCKCHIP=m
-CONFIG_MMC_SH_MMCIF=m
CONFIG_MMC_WMT=y
CONFIG_MMC_SUNXI=m
@@ -1218,20 +1208,13 @@ CONFIG_DMA_SUN6I=m
CONFIG_MX3_IPU=y
CONFIG_MX3_IPU_IRQS=4
CONFIG_NBPFAXI_DMA=m
-# CONFIG_QCOM_BAM_DMA is not set
# CONFIG_SIRF_DMA is not set
# CONFIG_STE_DMA40 is not set
# CONFIG_TEGRA20_APB_DMA is not set
# CONFIG_TI_CPPI41 is not set
# CONFIG_TI_EDMA is not set
CONFIG_XILINX_VDMA=m
-CONFIG_RENESAS_DMA=y
-CONFIG_SH_DMAE_BASE=y
-# CONFIG_SH_DMAE is not set
-CONFIG_RCAR_DMAC=m
-# CONFIG_RCAR_HPB_DMAE is not set
-CONFIG_RENESAS_USB_DMAC=m
-# CONFIG_SUDMAC is not set
+# CONFIG_QCOM_BAM_DMA is not set
#
# Microsoft Hyper-V guest support
@@ -1243,6 +1226,7 @@ CONFIG_CHROME_PLATFORMS=y
#
# CONFIG_COMMON_CLK_AXI_CLKGEN is not set
CONFIG_COMMON_CLK_KEYSTONE=y
+CONFIG_CLK_BCM_63XX=y
CONFIG_COMMON_CLK_IPROC=y
CONFIG_COMMON_CLK_HI6220=y
CONFIG_STUB_CLK_HI6220=y
@@ -1250,6 +1234,7 @@ CONFIG_QCOM_GDSC=y
CONFIG_COMMON_CLK_QCOM=m
CONFIG_APQ_GCC_8084=m
CONFIG_APQ_MMCC_8084=m
+CONFIG_IPQ_GCC_4019=m
CONFIG_IPQ_GCC_806X=m
CONFIG_IPQ_LCC_806X=m
CONFIG_MSM_GCC_8660=m
@@ -1259,8 +1244,11 @@ CONFIG_MSM_LCC_8960=m
CONFIG_MSM_MMCC_8960=m
CONFIG_MSM_GCC_8974=m
CONFIG_MSM_MMCC_8974=m
+CONFIG_MSM_GCC_8996=m
+CONFIG_MSM_MMCC_8996=m
CONFIG_COMMON_CLK_SAMSUNG=y
CONFIG_TEGRA_CLK_EMC=y
+CONFIG_COMMON_CLK_TI_ADPLL=m
CONFIG_HWSPINLOCK=m
#
@@ -1292,14 +1280,16 @@ CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
CONFIG_CLKSRC_EXYNOS_MCT=y
CONFIG_CLKSRC_SAMSUNG_PWM=y
CONFIG_MTK_TIMER=y
-CONFIG_SYS_SUPPORTS_SH_TMU=y
-CONFIG_SH_TIMER_TMU=y
CONFIG_CLKSRC_VERSATILE=y
CONFIG_CLKSRC_IMX_GPT=y
+CONFIG_CLKSRC_ST_LPC=y
CONFIG_PL320_MBOX=y
CONFIG_OMAP2PLUS_MBOX=m
CONFIG_OMAP_MBOX_KFIFO_SIZE=256
+CONFIG_ROCKCHIP_MBOX=y
CONFIG_STI_MBOX=m
+CONFIG_TI_MESSAGE_MANAGER=m
+CONFIG_HI6220_MBOX=m
#
# Generic IOMMU Pagetable Support
@@ -1310,8 +1300,8 @@ CONFIG_ROCKCHIP_IOMMU=y
# CONFIG_TEGRA_IOMMU_GART is not set
# CONFIG_TEGRA_IOMMU_SMMU is not set
# CONFIG_EXYNOS_IOMMU is not set
-# CONFIG_SHMOBILE_IOMMU is not set
CONFIG_ARM_SMMU=y
+CONFIG_MTK_IOMMU=y
#
# Remoteproc drivers
@@ -1319,6 +1309,7 @@ CONFIG_ARM_SMMU=y
CONFIG_REMOTEPROC=m
CONFIG_OMAP_REMOTEPROC=m
CONFIG_WKUP_M3_RPROC=m
+CONFIG_ST_REMOTEPROC=m
#
# Rpmsg drivers
@@ -1337,10 +1328,20 @@ CONFIG_QCOM_PM=y
CONFIG_QCOM_SMEM=m
CONFIG_QCOM_SMD=m
CONFIG_QCOM_SMD_RPM=m
+# CONFIG_QCOM_SMP2P is not set
+# CONFIG_QCOM_SMSM is not set
+# CONFIG_QCOM_WCNSS_CTRL is not set
CONFIG_ROCKCHIP_PM_DOMAINS=y
+CONFIG_SOC_SAMSUNG=y
+CONFIG_EXYNOS_PMU=y
CONFIG_SUNXI_SRAM=y
+CONFIG_ARCH_TEGRA_2x_SOC=y
+CONFIG_ARCH_TEGRA_3x_SOC=y
+CONFIG_ARCH_TEGRA_114_SOC=y
+CONFIG_ARCH_TEGRA_124_SOC=y
# CONFIG_KEYSTONE_NAVIGATOR_QMSS is not set
CONFIG_KEYSTONE_NAVIGATOR_DMA=m
+CONFIG_WKUP_M3_IPC=m
#
# DEVFREQ Drivers
@@ -1357,6 +1358,7 @@ CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
CONFIG_OMAP_GPMC=y
# CONFIG_OMAP_GPMC_DEBUG is not set
CONFIG_TEGRA20_MC=y
+CONFIG_MTK_SMI=y
CONFIG_TEGRA_MC=y
CONFIG_TEGRA124_EMC=y
@@ -1365,6 +1367,7 @@ CONFIG_TEGRA124_EMC=y
#
# CONFIG_BERLIN2_ADC is not set
# CONFIG_EXYNOS_ADC is not set
+CONFIG_IMX7D_ADC=m
CONFIG_ROCKCHIP_SARADC=m
# CONFIG_XILINX_XADC is not set
@@ -1377,8 +1380,7 @@ CONFIG_PWM_BERLIN=m
CONFIG_PWM_BRCMSTB=m
# CONFIG_PWM_IMX is not set
# CONFIG_PWM_MTK_DISP is not set
-# CONFIG_PWM_RCAR is not set
-# CONFIG_PWM_RENESAS_TPU is not set
+CONFIG_PWM_OMAP_DMTIMER=m
CONFIG_PWM_ROCKCHIP=m
# CONFIG_PWM_SAMSUNG is not set
CONFIG_PWM_STI=m
@@ -1392,7 +1394,6 @@ CONFIG_BCM7120_L2_IRQ=y
CONFIG_BRCMSTB_L2_IRQ=y
CONFIG_DW_APB_ICTL=y
CONFIG_OMAP_IRQCHIP=y
-CONFIG_RENESAS_INTC_IRQPIN=y
CONFIG_ST_IRQCHIP=y
CONFIG_IRQ_CROSSBAR=y
# CONFIG_KEYSTONE_IRQ is not set
@@ -1401,6 +1402,7 @@ CONFIG_STI_RESET_SYSCFG=y
CONFIG_STIH415_RESET=y
CONFIG_STIH416_RESET=y
CONFIG_STIH407_RESET=y
+CONFIG_COMMON_RESET_HI6220=m
#
# PHY Subsystem
@@ -1411,7 +1413,6 @@ CONFIG_PHY_DM816X_USB=m
CONFIG_PHY_EXYNOS_MIPI_VIDEO=y
CONFIG_PHY_MIPHY28LP=m
CONFIG_PHY_MIPHY365X=m
-CONFIG_PHY_RCAR_GEN2=m
CONFIG_OMAP_CONTROL_PHY=m
CONFIG_TWL4030_USB=m
CONFIG_PHY_EXYNOS_DP_VIDEO=y
@@ -1427,6 +1428,8 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
CONFIG_PHY_QCOM_APQ8064_SATA=m
CONFIG_PHY_QCOM_IPQ806X_SATA=m
CONFIG_PHY_ROCKCHIP_USB=m
+CONFIG_PHY_ROCKCHIP_EMMC=m
+CONFIG_PHY_ROCKCHIP_DP=m
CONFIG_PHY_STIH407_USB=m
CONFIG_PHY_STIH41X_USB=m
CONFIG_PHY_QCOM_UFS=m
@@ -1436,6 +1439,7 @@ CONFIG_PHY_BRCMSTB_SATA=m
# Android
#
CONFIG_NVMEM_IMX_OCOTP=m
+CONFIG_MTK_EFUSE=m
CONFIG_QCOM_QFPROM=m
CONFIG_ROCKCHIP_EFUSE=m
CONFIG_NVMEM_SUNXI_SID=m
@@ -1477,6 +1481,11 @@ CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ENGINE=m
+
+#
# Random Number Generation
#
CONFIG_CRYPTO_DEV_HIFN_795X=m
@@ -1502,6 +1511,7 @@ CONFIG_CRYPTO_DEV_S5P=m
CONFIG_CRYPTO_DEV_MXS_DCP=m
CONFIG_CRYPTO_DEV_QCE=m
CONFIG_CRYPTO_DEV_SUN4I_SS=m
+CONFIG_CRYPTO_DEV_ROCKCHIP=m
#
# Certificates for signature checking
diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic
index a4010e7..d133512 100644
--- a/kernel/config-arm64-generic
+++ b/kernel/config-arm64-generic
@@ -1,6 +1,10 @@
CONFIG_ARM64=y
CONFIG_64BIT=y
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=14
+CONFIG_ARCH_MMAP_RND_BITS_MAX=27
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=7
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
CONFIG_GENERIC_CSUM=y
@@ -24,6 +28,8 @@ CONFIG_SYSCTL_EXCEPTION_TRACE=y
#
CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_ARCH_MMAP_RND_BITS=27
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
CONFIG_COMPAT_OLD_SIGACTION=y
#
@@ -39,9 +45,10 @@ CONFIG_PREEMPT_NOTIFIERS=y
#
# Platform selection
#
+# CONFIG_ARCH_SUNXI is not set
# CONFIG_ARCH_BCM_IPROC is not set
# CONFIG_ARCH_BERLIN is not set
-# CONFIG_ARCH_EXYNOS7 is not set
+# CONFIG_ARCH_EXYNOS is not set
# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_HISI is not set
# CONFIG_ARCH_MEDIATEK is not set
@@ -52,6 +59,7 @@ CONFIG_ARCH_SEATTLE=y
# CONFIG_ARCH_TEGRA is not set
# CONFIG_ARCH_SPRD is not set
# CONFIG_ARCH_THUNDER is not set
+# CONFIG_ARCH_VULCAN is not set
CONFIG_ARCH_XGENE=y
# CONFIG_ARCH_ZYNQMP is not set
@@ -60,19 +68,16 @@ CONFIG_ARCH_XGENE=y
#
CONFIG_PCI_BUS_ADDR_T_64BIT=y
CONFIG_PCI_LABEL=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=y
#
# PCI host controller drivers
#
CONFIG_PCI_XGENE=y
-# CONFIG_PCIE_IPROC is not set
CONFIG_PCI_HISI=y
-CONFIG_HOTPLUG_PCI_PCIE=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=y
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_SHPC=m
+CONFIG_PCI_HOST_THUNDER_PEM=y
+CONFIG_PCI_HOST_THUNDER_ECAM=y
#
# ARM errata workarounds via the alternatives framework
@@ -87,6 +92,7 @@ CONFIG_ARM64_ERRATUM_845719=y
CONFIG_ARM64_ERRATUM_843419=y
CONFIG_CAVIUM_ERRATUM_22375=y
CONFIG_CAVIUM_ERRATUM_23154=y
+CONFIG_CAVIUM_ERRATUM_27456=y
# CONFIG_ARM64_4K_PAGES is not set
# CONFIG_ARM64_16K_PAGES is not set
CONFIG_ARM64_64K_PAGES=y
@@ -99,6 +105,7 @@ CONFIG_NR_CPUS=64
CONFIG_HZ_300=y
# CONFIG_HZ_1000 is not set
CONFIG_HZ=300
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SPARSEMEM_DEFAULT=y
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -112,7 +119,6 @@ CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
CONFIG_SPARSEMEM_VMEMMAP=y
CONFIG_PHYS_ADDR_T_64BIT=y
# CONFIG_TRANSPARENT_HUGEPAGE is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ARMV8_DEPRECATED=y
CONFIG_SWP_EMULATION=y
@@ -125,10 +131,22 @@ CONFIG_SETEND_EMULATION=y
CONFIG_ARM64_HW_AFDBM=y
CONFIG_ARM64_PAN=y
CONFIG_ARM64_LSE_ATOMICS=y
+CONFIG_ARM64_VHE=y
+
+#
+# ARMv8.2 architectural features
+#
+CONFIG_ARM64_UAO=y
+CONFIG_ARM64_MODULE_CMODEL_LARGE=y
+CONFIG_ARM64_MODULE_PLTS=y
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
#
# Boot options
#
+CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
CONFIG_CMDLINE=""
CONFIG_EFI_STUB=y
CONFIG_EFI=y
@@ -172,13 +190,14 @@ CONFIG_PNPACPI=y
CONFIG_BLK_DEV_SKD=m
#
-# Intel MIC Coprocessor State Management (COSM) Drivers
+# VOP Driver
#
# CONFIG_GENWQE is not set
#
# SCSI Transports
#
+CONFIG_SCSI_HISI_SAS=m
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
CONFIG_ATA_ACPI=y
CONFIG_SATA_ZPODD=y
@@ -187,6 +206,7 @@ CONFIG_SATA_ZPODD=y
# Controllers with non-SFF native interface
#
CONFIG_AHCI_XGENE=m
+CONFIG_SATA_AHCI_SEATTLE=m
#
# Generic fallback / legacy drivers
@@ -209,7 +229,9 @@ CONFIG_NET_SB1000=m
#
# MII PHY device drivers
#
+CONFIG_MDIO_CAVIUM=m
CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_THUNDER=m
#
# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -263,7 +285,6 @@ CONFIG_I2C_NOMADIK=m
# Other I2C/SMBus bus drivers
#
CONFIG_I2C_XGENE_SLIMPRO=m
-# CONFIG_I2C_SLAVE is not set
#
# PPS support
@@ -300,6 +321,11 @@ CONFIG_POWER_RESET_XGENE=y
CONFIG_SENSORS_ACPI_POWER=m
#
+# Watchdog Device Drivers
+#
+CONFIG_ARM_SBSA_WATCHDOG=m
+
+#
# Multifunction device drivers
#
# CONFIG_MFD_ATMEL_HLCDC is not set
@@ -394,15 +420,13 @@ CONFIG_COMMON_CLK_XGENE=y
# Clock Source drivers
#
CONFIG_CLKSRC_ACPI=y
-# CONFIG_SH_TIMER_TMU is not set
# CONFIG_PL320_MBOX is not set
CONFIG_PCC=y
+CONFIG_XGENE_SLIMPRO_MBOX=m
#
# Generic IOMMU Pagetable Support
#
-CONFIG_IOMMU_IOVA=y
-CONFIG_IOMMU_DMA=y
# CONFIG_ARM_SMMU is not set
CONFIG_ARM_SMMU_V3=y
@@ -439,6 +463,8 @@ CONFIG_BTT=y
#
CONFIG_DMIID=y
CONFIG_DMI_SYSFS=y
+CONFIG_FW_CFG_SYSFS=m
+# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
#
# EFI (Extensible Firmware Interface) Support
@@ -490,6 +516,7 @@ CONFIG_KVM_COMPAT=y
CONFIG_KVM_ARM_VGIC_V3=y
CONFIG_KVM=y
CONFIG_KVM_ARM_HOST=y
+CONFIG_KVM_ARM_PMU=y
#
# Compile-time checks and compiler options
@@ -505,6 +532,7 @@ CONFIG_FUNCTION_GRAPH_TRACER=y
#
# Runtime Testing
#
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
# CONFIG_ARM64_PTDUMP is not set
# CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set
diff --git a/kernel/config-generic b/kernel/config-generic
index 8b2c287..a184b75 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -10,8 +10,8 @@ CONFIG_GENERIC_HWEIGHT=y
CONFIG_RWSEM_XCHGADD_ALGORITHM=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
-CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_DEBUG_RODATA=y
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -97,21 +97,21 @@ CONFIG_RCU_NOCB_CPU=y
CONFIG_LOG_BUF_SHIFT=18
CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_PIDS=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
# CONFIG_MEMCG is not set
-CONFIG_CGROUP_PERF=y
+CONFIG_BLK_CGROUP=y
+# CONFIG_DEBUG_BLK_CGROUP is not set
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
# CONFIG_CFS_BANDWIDTH is not set
CONFIG_RT_GROUP_SCHED=y
-CONFIG_BLK_CGROUP=y
-# CONFIG_DEBUG_BLK_CGROUP is not set
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+# CONFIG_CGROUP_DEBUG is not set
# CONFIG_CHECKPOINT_RESTORE is not set
CONFIG_NAMESPACES=y
CONFIG_UTS_NS=y
@@ -143,6 +143,7 @@ CONFIG_SYSFS_SYSCALL=y
# CONFIG_SYSCTL_SYSCALL is not set
CONFIG_KALLSYMS=y
CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
CONFIG_PRINTK=y
CONFIG_BUG=y
CONFIG_ELF_CORE=y
@@ -183,7 +184,6 @@ CONFIG_JUMP_LABEL=y
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set
CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
CONFIG_HAVE_DMA_CONTIGUOUS=y
CONFIG_GENERIC_SMP_IDLE_THREAD=y
CONFIG_HAVE_CLK=y
@@ -201,7 +201,9 @@ CONFIG_CC_STACKPROTECTOR=y
CONFIG_CC_STACKPROTECTOR_STRONG=y
CONFIG_HAVE_CONTEXT_TRACKING=y
CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
CONFIG_OLD_SIGSUSPEND3=y
#
@@ -281,6 +283,7 @@ CONFIG_FREEZER=y
#
CONFIG_ZONE_DMA=y
CONFIG_SMP=y
+# CONFIG_GOLDFISH is not set
# CONFIG_XEN is not set
CONFIG_NO_BOOTMEM=y
CONFIG_SWIOTLB=y
@@ -311,6 +314,7 @@ CONFIG_CMA_AREAS=7
CONFIG_ZPOOL=m
# CONFIG_ZBUD is not set
# CONFIG_ZSMALLOC is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
CONFIG_IDLE_PAGE_TRACKING=y
CONFIG_FRAME_VECTOR=y
CONFIG_SECCOMP=y
@@ -331,7 +335,10 @@ CONFIG_PM=y
# CONFIG_PM_DEBUG is not set
CONFIG_PM_OPP=y
CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+CONFIG_PM_GENERIC_DOMAINS_OF=y
#
# CPU Frequency scaling
@@ -375,6 +382,7 @@ CONFIG_CPU_IDLE_GOV_MENU=y
CONFIG_PCI=y
CONFIG_PCI_DOMAINS=y
CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
CONFIG_PCIEAER=y
CONFIG_PCIEASPM=y
# CONFIG_PCIEASPM_DEBUG is not set
@@ -382,10 +390,15 @@ CONFIG_PCIEASPM=y
CONFIG_PCIE_PME=y
# CONFIG_PCI_DEBUG is not set
# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+CONFIG_HOTPLUG_PCI=y
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+CONFIG_HOTPLUG_PCI_SHPC=m
#
# PCI host controller drivers
#
+CONFIG_PCIE_DW_PLAT=y
+CONFIG_PCIE_DW=y
#
# PC-card bridges
@@ -402,6 +415,7 @@ CONFIG_BINFMT_MISC=y
CONFIG_COREDUMP=y
CONFIG_NET=y
CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
#
# Networking options
@@ -450,10 +464,10 @@ CONFIG_INET_TUNNEL=m
CONFIG_INET_XFRM_MODE_TRANSPORT=m
CONFIG_INET_XFRM_MODE_TUNNEL=m
CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
CONFIG_INET_DIAG=m
CONFIG_INET_TCP_DIAG=m
CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
CONFIG_TCP_CONG_ADVANCED=y
CONFIG_TCP_CONG_BIC=m
CONFIG_TCP_CONG_CUBIC=y
@@ -573,6 +587,9 @@ CONFIG_NFT_QUEUE=m
CONFIG_NFT_REJECT=m
CONFIG_NFT_REJECT_INET=m
# CONFIG_NFT_COMPAT is not set
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
CONFIG_NETFILTER_XTABLES=y
#
@@ -899,11 +916,15 @@ CONFIG_NET_ACT_SKBEDIT=m
CONFIG_NET_ACT_CSUM=m
CONFIG_NET_ACT_VLAN=m
CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
CONFIG_NET_CLS_IND=y
CONFIG_NET_SCH_FIFO=y
# CONFIG_DCB is not set
CONFIG_DNS_RESOLVER=y
CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_BATMAN_V is not set
CONFIG_BATMAN_ADV_BLA=y
CONFIG_BATMAN_ADV_DAT=y
CONFIG_BATMAN_ADV_NC=y
@@ -911,7 +932,6 @@ CONFIG_BATMAN_ADV_MCAST=y
# CONFIG_BATMAN_ADV_DEBUG is not set
# CONFIG_OPENVSWITCH is not set
CONFIG_VSOCKETS=m
-CONFIG_NETLINK_MMAP=y
CONFIG_NETLINK_DIAG=m
CONFIG_MPLS=y
CONFIG_NET_MPLS_GSO=m
@@ -923,6 +943,7 @@ CONFIG_NET_L3_MASTER_DEV=y
CONFIG_RPS=y
CONFIG_RFS_ACCEL=y
CONFIG_XPS=y
+CONFIG_SOCK_CGROUP_DATA=y
CONFIG_CGROUP_NET_PRIO=y
CONFIG_CGROUP_NET_CLASSID=y
CONFIG_NET_RX_BUSY_POLL=y
@@ -949,6 +970,7 @@ CONFIG_BT_CMTP=m
CONFIG_BT_HIDP=m
CONFIG_BT_HS=y
CONFIG_BT_LE=y
+CONFIG_BT_LEDS=y
# CONFIG_BT_SELFTEST is not set
# CONFIG_BT_DEBUGFS is not set
@@ -971,6 +993,7 @@ CONFIG_BT_HCIUART_3WIRE=y
CONFIG_BT_HCIUART_INTEL=y
CONFIG_BT_HCIUART_BCM=y
CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
CONFIG_BT_HCIBCM203X=m
CONFIG_BT_HCIBPA10X=m
CONFIG_BT_HCIBFUSB=m
@@ -979,6 +1002,7 @@ CONFIG_BT_MRVL=m
CONFIG_BT_ATH3K=m
CONFIG_BT_WILINK=m
# CONFIG_AF_RXRPC is not set
+# CONFIG_AF_KCM is not set
CONFIG_FIB_RULES=y
CONFIG_WIRELESS=y
CONFIG_WIRELESS_EXT=y
@@ -989,7 +1013,6 @@ CONFIG_WEXT_PRIV=y
CONFIG_CFG80211=m
# CONFIG_NL80211_TESTMODE is not set
# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
CONFIG_CFG80211_DEFAULT_PS=y
# CONFIG_CFG80211_DEBUGFS is not set
@@ -1024,6 +1047,9 @@ CONFIG_RFKILL_INPUT=y
# CONFIG_CEPH_LIB is not set
# CONFIG_NFC is not set
CONFIG_LWTUNNEL=y
+CONFIG_DST_CACHE=y
+CONFIG_NET_DEVLINK=y
+CONFIG_MAY_USE_DEVLINK=y
CONFIG_HAVE_BPF_JIT=y
#
@@ -1147,6 +1173,10 @@ CONFIG_ALTERA_STAPL=m
#
#
+# VOP Bus Driver
+#
+
+#
# Intel MIC Host Driver
#
@@ -1161,6 +1191,10 @@ CONFIG_ALTERA_STAPL=m
#
# Intel MIC Coprocessor State Management (COSM) Drivers
#
+
+#
+# VOP Driver
+#
# CONFIG_ECHO is not set
# CONFIG_CXL_BASE is not set
# CONFIG_CXL_KERNEL_API is not set
@@ -1396,14 +1430,13 @@ CONFIG_BLK_DEV_DM=y
# CONFIG_DM_MQ_DEFAULT is not set
# CONFIG_DM_DEBUG is not set
CONFIG_DM_BUFIO=y
+# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
CONFIG_DM_BIO_PRISON=m
CONFIG_DM_PERSISTENT_DATA=m
-# CONFIG_DM_DEBUG_BLOCK_STACK_TRACING is not set
CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=y
CONFIG_DM_THIN_PROVISIONING=m
CONFIG_DM_CACHE=m
-CONFIG_DM_CACHE_MQ=m
CONFIG_DM_CACHE_SMQ=m
CONFIG_DM_CACHE_CLEANER=m
CONFIG_DM_ERA=m
@@ -1418,6 +1451,7 @@ CONFIG_DM_MULTIPATH_ST=m
CONFIG_DM_UEVENT=y
# CONFIG_DM_FLAKEY is not set
CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_FEC=y
CONFIG_DM_SWITCH=m
# CONFIG_DM_LOG_WRITES is not set
# CONFIG_TARGET_CORE is not set
@@ -1441,6 +1475,7 @@ CONFIG_MACVTAP=m
CONFIG_IPVLAN=m
CONFIG_VXLAN=m
# CONFIG_GENEVE is not set
+# CONFIG_MACSEC is not set
CONFIG_NETCONSOLE=m
CONFIG_NETCONSOLE_DYNAMIC=y
CONFIG_NETPOLL=y
@@ -1474,7 +1509,7 @@ CONFIG_NET_DSA_MV88E6XXX=y
CONFIG_NET_DSA_MV88E6060=y
CONFIG_NET_DSA_MV88E6XXX_NEED_PPU=y
CONFIG_NET_DSA_MV88E6131=y
-CONFIG_NET_DSA_MV88E6123_61_65=y
+CONFIG_NET_DSA_MV88E6123=m
CONFIG_NET_DSA_MV88E6171=m
CONFIG_NET_DSA_MV88E6352=m
CONFIG_NET_DSA_BCM_SF2=m
@@ -1525,6 +1560,7 @@ CONFIG_NET_VENDOR_CHELSIO=y
CONFIG_CHELSIO_T1=m
CONFIG_CHELSIO_T3=m
CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_UWIRE=y
CONFIG_CHELSIO_T4VF=m
CONFIG_NET_VENDOR_CISCO=y
CONFIG_ENIC=m
@@ -1568,6 +1604,7 @@ CONFIG_NET_VENDOR_I825XX=y
CONFIG_JME=m
CONFIG_NET_VENDOR_MARVELL=y
CONFIG_MVMDIO=m
+# CONFIG_MVNETA_BM is not set
CONFIG_SKGE=m
# CONFIG_SKGE_DEBUG is not set
CONFIG_SKY2=m
@@ -1579,6 +1616,7 @@ CONFIG_MLX4_CORE=m
# CONFIG_MLX4_DEBUG is not set
# CONFIG_MLX5_CORE is not set
CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_CORE_HWMON=y
CONFIG_MLXSW_PCI=m
CONFIG_MLXSW_SWITCHX2=m
CONFIG_MLXSW_SPECTRUM=m
@@ -1592,6 +1630,7 @@ CONFIG_FEALNX=m
CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NATSEMI=m
CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETRONOME=y
CONFIG_NET_VENDOR_8390=y
CONFIG_NE2K_PCI=m
CONFIG_NET_VENDOR_NVIDIA=y
@@ -1746,6 +1785,7 @@ CONFIG_USB_NET_NET1080=m
CONFIG_USB_NET_PLUSB=m
CONFIG_USB_NET_MCS7830=m
CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
CONFIG_USB_NET_CDC_SUBSET=m
CONFIG_USB_ALI_M5632=y
CONFIG_USB_AN2720=y
@@ -1764,23 +1804,10 @@ CONFIG_USB_SIERRA_NET=m
CONFIG_USB_VL600=m
CONFIG_USB_NET_CH9200=m
CONFIG_WLAN=y
-CONFIG_LIBERTAS_THINFIRM=m
-# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_AT76C50X_USB=m
-# CONFIG_PRISM54 is not set
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_WLAN_VENDOR_ADMTEK=y
CONFIG_ADM8211=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_MAC80211_HWSIM=m
-CONFIG_MWL8K=m
CONFIG_ATH_COMMON=m
-CONFIG_ATH_CARDS=m
+CONFIG_WLAN_VENDOR_ATH=y
# CONFIG_ATH_DEBUG is not set
CONFIG_ATH5K=m
# CONFIG_ATH5K_DEBUG is not set
@@ -1800,6 +1827,7 @@ CONFIG_ATH9K_CHANNEL_CONTEXT=y
CONFIG_ATH9K_PCOEM=y
CONFIG_ATH9K_HTC=m
# CONFIG_ATH9K_HTC_DEBUGFS is not set
+CONFIG_ATH9K_HWRNG=y
CONFIG_CARL9170=m
CONFIG_CARL9170_LEDS=y
CONFIG_CARL9170_WPC=y
@@ -1810,11 +1838,17 @@ CONFIG_WIL6210=m
CONFIG_WIL6210_ISR_COR=y
CONFIG_ATH10K=m
CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_AHB=y
# CONFIG_ATH10K_DEBUG is not set
# CONFIG_ATH10K_DEBUGFS is not set
# CONFIG_ATH10K_TRACING is not set
CONFIG_WCN36XX=m
# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
CONFIG_B43=m
CONFIG_B43_BCMA=y
CONFIG_B43_SSB=y
@@ -1849,18 +1883,14 @@ CONFIG_BRCMSMAC=m
# CONFIG_BRCMFMAC is not set
# CONFIG_BRCM_TRACING is not set
# CONFIG_BRCMDBG is not set
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_WLAN_VENDOR_INTEL=y
CONFIG_IPW2100=m
# CONFIG_IPW2100_DEBUG is not set
CONFIG_IPW2200=m
# CONFIG_IPW2200_DEBUG is not set
CONFIG_LIBIPW=m
# CONFIG_LIBIPW_DEBUG is not set
-# CONFIG_IWLWIFI is not set
CONFIG_IWLEGACY=m
CONFIG_IWL4965=m
CONFIG_IWL3945=m
@@ -1869,11 +1899,13 @@ CONFIG_IWL3945=m
# iwl3945 / iwl4965 Debugging Options
#
# CONFIG_IWLEGACY_DEBUG is not set
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_MESH=y
+# CONFIG_IWLWIFI is not set
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
CONFIG_HERMES=m
# CONFIG_HERMES_PRISM is not set
CONFIG_HERMES_CACHE_FW_ON_INIT=y
@@ -1885,6 +1917,24 @@ CONFIG_P54_COMMON=m
CONFIG_P54_USB=m
CONFIG_P54_PCI=m
CONFIG_P54_LEDS=y
+# CONFIG_PRISM54 is not set
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_SDIO=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+CONFIG_WLAN_VENDOR_RALINK=y
CONFIG_RT2X00=m
CONFIG_RT2400PCI=m
CONFIG_RT2500PCI=m
@@ -1913,8 +1963,10 @@ CONFIG_RT2X00_LIB_FIRMWARE=y
CONFIG_RT2X00_LIB_CRYPTO=y
CONFIG_RT2X00_LIB_LEDS=y
# CONFIG_RT2X00_DEBUG is not set
-CONFIG_WL_MEDIATEK=y
-CONFIG_MT7601U=m
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
CONFIG_RTL_CARDS=m
CONFIG_RTL8192CE=m
CONFIG_RTL8192SE=m
@@ -1934,7 +1986,15 @@ CONFIG_RTL8723_COMMON=m
CONFIG_RTLBTCOEXIST=m
CONFIG_RTL8XXXU=m
# CONFIG_RTL8XXXU_UNTESTED is not set
-CONFIG_WL_TI=y
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+# CONFIG_RSI_DEBUGFS is not set
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+CONFIG_WLAN_VENDOR_ST=y
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_WLAN_VENDOR_TI=y
CONFIG_WL1251=m
CONFIG_WL1251_SDIO=m
CONFIG_WL12XX=m
@@ -1942,18 +2002,12 @@ CONFIG_WL18XX=m
CONFIG_WLCORE=m
CONFIG_WLCORE_SDIO=m
CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
CONFIG_ZD1211RW=m
# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_MWIFIEX=m
-CONFIG_MWIFIEX_SDIO=m
-CONFIG_MWIFIEX_PCIE=m
-CONFIG_MWIFIEX_USB=m
-CONFIG_CW1200=m
-CONFIG_CW1200_WLAN_SDIO=m
-CONFIG_RSI_91X=m
-# CONFIG_RSI_DEBUGFS is not set
-CONFIG_RSI_SDIO=m
-CONFIG_RSI_USB=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_USB_NET_RNDIS_WLAN=m
#
# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -2027,10 +2081,6 @@ CONFIG_HISAX_ST5481=m
CONFIG_HISAX_HFCUSB=m
CONFIG_HISAX_HFC4S8S=m
# CONFIG_HISAX_FRITZ_PCIPNP is not set
-
-#
-# Active cards
-#
CONFIG_ISDN_CAPI=m
CONFIG_CAPI_TRACE=y
CONFIG_ISDN_CAPI_CAPI20=m
@@ -2108,6 +2158,7 @@ CONFIG_KEYBOARD_BCM=m
CONFIG_INPUT_MOUSE=y
CONFIG_MOUSE_PS2=m
CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
CONFIG_MOUSE_PS2_LOGIPS2PP=y
CONFIG_MOUSE_PS2_SYNAPTICS=y
CONFIG_MOUSE_PS2_CYPRESS=y
@@ -2166,6 +2217,12 @@ CONFIG_INPUT_SOC_BUTTON_ARRAY=m
CONFIG_INPUT_DRV260X_HAPTICS=m
CONFIG_INPUT_DRV2665_HAPTICS=m
CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_RMI4_CORE=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
#
# Hardware I/O ports
@@ -2224,6 +2281,7 @@ CONFIG_SERIAL_8250_RSA=y
CONFIG_SERIAL_8250_DW=m
CONFIG_SERIAL_8250_RT288X=y
CONFIG_SERIAL_8250_MID=m
+CONFIG_SERIAL_8250_MOXA=m
#
# Non-8250 serial port support
@@ -2238,6 +2296,8 @@ CONFIG_SERIAL_SC16IS7XX_I2C=y
# CONFIG_SERIAL_ALTERA_UART is not set
CONFIG_SERIAL_FSL_LPUART=m
CONFIG_SERIAL_CONEXANT_DIGICOLOR=m
+CONFIG_SERIAL_MVEBU_UART=y
+CONFIG_SERIAL_MVEBU_CONSOLE=y
# CONFIG_TTY_PRINTK is not set
CONFIG_HVC_DRIVER=y
CONFIG_VIRTIO_CONSOLE=m
@@ -2333,6 +2393,8 @@ CONFIG_I2C_VIPERBOARD=m
# Other I2C/SMBus bus drivers
#
CONFIG_I2C_STUB=m
+CONFIG_I2C_SLAVE=y
+# CONFIG_I2C_SLAVE_EEPROM is not set
# CONFIG_I2C_DEBUG_CORE is not set
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
@@ -2410,6 +2472,7 @@ CONFIG_GPIO_ADNP=m
# CONFIG_GPIO_PCA953X is not set
# CONFIG_GPIO_PCF857X is not set
# CONFIG_GPIO_SX150X is not set
+CONFIG_GPIO_TPIC2810=m
#
# MFD GPIO expanders
@@ -2423,6 +2486,8 @@ CONFIG_GPIO_CRYSTAL_COVE=m
# CONFIG_GPIO_PALMAS is not set
# CONFIG_GPIO_RC5T583 is not set
CONFIG_GPIO_STMPE=y
+CONFIG_GPIO_TPS65086=m
+CONFIG_GPIO_TPS65218=m
# CONFIG_GPIO_TPS6586X is not set
# CONFIG_GPIO_TPS65910 is not set
# CONFIG_GPIO_TPS65912 is not set
@@ -2455,6 +2520,7 @@ CONFIG_POWER_SUPPLY=y
# CONFIG_PDA_POWER is not set
CONFIG_GENERIC_ADC_BATTERY=m
# CONFIG_TEST_POWER is not set
+CONFIG_BATTERY_ACT8945A=m
# CONFIG_BATTERY_DS2780 is not set
# CONFIG_BATTERY_DS2781 is not set
# CONFIG_BATTERY_DS2782 is not set
@@ -2536,6 +2602,7 @@ CONFIG_SENSORS_IT87=m
CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_LINEAGE=m
CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2990=m
CONFIG_SENSORS_LTC4151=m
CONFIG_SENSORS_LTC4215=m
CONFIG_SENSORS_LTC4222=m
@@ -2551,7 +2618,6 @@ CONFIG_SENSORS_MAX6642=m
CONFIG_SENSORS_MAX6650=m
CONFIG_SENSORS_MAX6697=m
CONFIG_SENSORS_MAX31790=m
-CONFIG_SENSORS_HTU21=m
CONFIG_SENSORS_MCP3021=m
CONFIG_SENSORS_MENF21BMC_HWMON=m
CONFIG_SENSORS_LM63=m
@@ -2582,6 +2648,7 @@ CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_ADM1275=m
CONFIG_SENSORS_LM25066=m
# CONFIG_SENSORS_LTC2978 is not set
+CONFIG_SENSORS_LTC3815=m
CONFIG_SENSORS_MAX16064=m
CONFIG_SENSORS_MAX20751=m
CONFIG_SENSORS_MAX34440=m
@@ -2659,6 +2726,7 @@ CONFIG_QCOM_SPMI_TEMP_ALARM=m
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
CONFIG_WATCHDOG_NOWAYOUT=y
+CONFIG_WATCHDOG_SYSFS=y
#
# Watchdog Device Drivers
@@ -2673,6 +2741,7 @@ CONFIG_MENF21BMC_WATCHDOG=m
CONFIG_WM831X_WATCHDOG=m
CONFIG_WM8350_WATCHDOG=m
CONFIG_XILINX_WATCHDOG=m
+CONFIG_ZIIRAVE_WATCHDOG=m
CONFIG_CADENCE_WATCHDOG=m
CONFIG_DW_WATCHDOG=m
CONFIG_RN5T618_WATCHDOG=m
@@ -2682,7 +2751,6 @@ CONFIG_RETU_WATCHDOG=m
CONFIG_ALIM7101_WDT=m
CONFIG_I6300ESB_WDT=m
CONFIG_KEMPLD_WDT=m
-CONFIG_BCM7038_WDT=m
CONFIG_MEN_A21_WDT=m
#
@@ -2706,7 +2774,6 @@ CONFIG_SSB_PCIHOST=y
CONFIG_SSB_B43_PCI_BRIDGE=y
CONFIG_SSB_SDIOHOST_POSSIBLE=y
CONFIG_SSB_SDIOHOST=y
-CONFIG_SSB_HOST_SOC=y
# CONFIG_SSB_SILENT is not set
# CONFIG_SSB_DEBUG is not set
CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
@@ -2731,13 +2798,15 @@ CONFIG_BCMA_DRIVER_GMAC_CMN=y
# Multifunction device drivers
#
CONFIG_MFD_CORE=y
+CONFIG_MFD_ACT8945A=m
CONFIG_MFD_AS3711=y
CONFIG_MFD_AS3722=y
CONFIG_PMIC_ADP5520=y
CONFIG_MFD_AAT2870_CORE=y
CONFIG_MFD_ATMEL_FLEXCOM=m
CONFIG_MFD_BCM590XX=m
-CONFIG_MFD_AXP20X=y
+CONFIG_MFD_AXP20X=m
+CONFIG_MFD_AXP20X_I2C=m
CONFIG_PMIC_DA903X=y
CONFIG_PMIC_DA9052=y
CONFIG_MFD_DA9052_I2C=y
@@ -2797,6 +2866,7 @@ CONFIG_MFD_PALMAS=y
# CONFIG_TPS6105X is not set
# CONFIG_TPS65010 is not set
# CONFIG_TPS6507X is not set
+CONFIG_MFD_TPS65086=m
CONFIG_MFD_TPS65090=y
# CONFIG_MFD_TPS65217 is not set
CONFIG_MFD_TPS65218=m
@@ -2823,6 +2893,7 @@ CONFIG_REGULATOR=y
# CONFIG_REGULATOR_DEBUG is not set
CONFIG_REGULATOR_88PM800=m
CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_ACT8945A=m
CONFIG_REGULATOR_AD5398=m
CONFIG_REGULATOR_ANATOP=m
CONFIG_REGULATOR_AAT2870=m
@@ -2862,6 +2933,8 @@ CONFIG_REGULATOR_MT6311=m
CONFIG_REGULATOR_MT6397=m
CONFIG_REGULATOR_PALMAS=m
CONFIG_REGULATOR_PFUZE100=m
+CONFIG_REGULATOR_PV88060=m
+CONFIG_REGULATOR_PV88090=m
CONFIG_REGULATOR_QCOM_SPMI=m
CONFIG_REGULATOR_RC5T583=m
CONFIG_REGULATOR_RK808=m
@@ -2875,6 +2948,7 @@ CONFIG_REGULATOR_TPS51632=m
CONFIG_REGULATOR_TPS62360=m
CONFIG_REGULATOR_TPS65023=m
CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65086=m
CONFIG_REGULATOR_TPS65090=m
CONFIG_REGULATOR_TPS65218=m
CONFIG_REGULATOR_TPS6586X=m
@@ -2897,6 +2971,7 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_MEDIA_SDR_SUPPORT=y
CONFIG_MEDIA_RC_SUPPORT=y
CONFIG_MEDIA_CONTROLLER=y
+# CONFIG_MEDIA_CONTROLLER_DVB is not set
CONFIG_VIDEO_DEV=y
CONFIG_VIDEO_V4L2_SUBDEV_API=y
CONFIG_VIDEO_V4L2=y
@@ -3392,9 +3467,10 @@ CONFIG_VGA_ARB=y
CONFIG_VGA_ARB_MAX_GPUS=16
CONFIG_DRM=m
CONFIG_DRM_MIPI_DSI=y
+# CONFIG_DRM_DP_AUX_CHARDEV is not set
CONFIG_DRM_KMS_HELPER=m
CONFIG_DRM_KMS_FB_HELPER=y
-# CONFIG_DRM_FBDEV_EMULATION is not set
+CONFIG_DRM_FBDEV_EMULATION=y
# CONFIG_DRM_LOAD_EDID_FIRMWARE is not set
CONFIG_DRM_TTM=m
@@ -3408,10 +3484,15 @@ CONFIG_DRM_TDFX=m
CONFIG_DRM_R128=m
CONFIG_DRM_RADEON=m
# CONFIG_DRM_RADEON_USERPTR is not set
-# CONFIG_DRM_RADEON_UMS is not set
CONFIG_DRM_AMDGPU=m
CONFIG_DRM_AMDGPU_CIK=y
CONFIG_DRM_AMDGPU_USERPTR=y
+CONFIG_DRM_AMD_POWERPLAY=y
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+CONFIG_DRM_AMD_ACP=y
CONFIG_DRM_NOUVEAU=m
CONFIG_NOUVEAU_DEBUG=5
CONFIG_NOUVEAU_DEBUG_DEFAULT=3
@@ -3433,8 +3514,10 @@ CONFIG_DRM_PANEL=y
# Display Panels
#
CONFIG_DRM_PANEL_SIMPLE=m
+CONFIG_DRM_PANEL_PANASONIC_VVX10F034N00=m
CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
CONFIG_DRM_PANEL_SHARP_LQ101R1SX01=m
+CONFIG_DRM_PANEL_SHARP_LS043T1LE01=m
CONFIG_DRM_BRIDGE=y
#
@@ -3449,6 +3532,7 @@ CONFIG_DRM_PARADE_PS8622=m
CONFIG_FB=y
CONFIG_FIRMWARE_EDID=y
CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
# CONFIG_FB_DDC is not set
# CONFIG_FB_BOOT_VESA_SUPPORT is not set
CONFIG_FB_CFB_FILLRECT=m
@@ -3555,6 +3639,7 @@ CONFIG_SND_PCM=m
CONFIG_SND_HWDEP=m
CONFIG_SND_RAWMIDI=m
CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
CONFIG_SND_SEQUENCER=m
CONFIG_SND_SEQ_DUMMY=m
CONFIG_SND_OSSEMUL=y
@@ -3720,6 +3805,7 @@ CONFIG_HID_CHERRY=y
CONFIG_HID_CHICONY=y
CONFIG_HID_CORSAIR=m
# CONFIG_HID_PRODIKEYS is not set
+# CONFIG_HID_CMEDIA is not set
CONFIG_HID_CP2112=m
CONFIG_HID_CYPRESS=y
# CONFIG_HID_DRAGONRISE is not set
@@ -3904,6 +3990,7 @@ CONFIG_USB_DWC3_HOST=y
# Platform Glue Driver Support
#
CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_OF_SIMPLE=m
CONFIG_USB_DWC2=y
CONFIG_USB_DWC2_HOST=y
@@ -3917,7 +4004,6 @@ CONFIG_USB_CHIPIDEA=m
CONFIG_USB_CHIPIDEA_OF=m
CONFIG_USB_CHIPIDEA_PCI=m
# CONFIG_USB_CHIPIDEA_HOST is not set
-# CONFIG_USB_CHIPIDEA_DEBUG is not set
CONFIG_USB_ISP1760=m
CONFIG_USB_ISP1760_HCD=y
CONFIG_USB_ISP1760_HOST_ROLE=y
@@ -4113,6 +4199,7 @@ CONFIG_LEDS_MAX8997=m
CONFIG_LEDS_LM355x=m
CONFIG_LEDS_MENF21BMC=m
CONFIG_LEDS_KTD2692=m
+CONFIG_LEDS_IS31FL32XX=m
#
# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
@@ -4166,10 +4253,10 @@ CONFIG_RTC_DRV_ABB5ZES3=m
CONFIG_RTC_DRV_ABX80X=m
CONFIG_RTC_DRV_AS3722=m
CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1307_HWMON=y
CONFIG_RTC_DRV_DS1374=m
CONFIG_RTC_DRV_DS1374_WDT=y
CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_DS3232=m
CONFIG_RTC_DRV_HYM8563=m
CONFIG_RTC_DRV_LP8788=m
CONFIG_RTC_DRV_MAX6900=m
@@ -4179,38 +4266,45 @@ CONFIG_RTC_DRV_MAX8998=m
CONFIG_RTC_DRV_MAX8997=m
CONFIG_RTC_DRV_MAX77686=m
CONFIG_RTC_DRV_RK808=m
-CONFIG_RTC_DRV_MAX77802=m
CONFIG_RTC_DRV_RS5C372=m
CONFIG_RTC_DRV_ISL1208=m
CONFIG_RTC_DRV_ISL12022=m
CONFIG_RTC_DRV_ISL12057=m
CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PALMAS=m
-CONFIG_RTC_DRV_PCF2127=m
CONFIG_RTC_DRV_PCF8523=m
-CONFIG_RTC_DRV_PCF8563=m
CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF8563=m
CONFIG_RTC_DRV_PCF8583=m
CONFIG_RTC_DRV_M41T80=m
CONFIG_RTC_DRV_M41T80_WDT=y
CONFIG_RTC_DRV_BQ32K=m
CONFIG_RTC_DRV_TWL4030=m
+CONFIG_RTC_DRV_PALMAS=m
CONFIG_RTC_DRV_TPS6586X=m
CONFIG_RTC_DRV_TPS65910=m
CONFIG_RTC_DRV_TPS80031=m
CONFIG_RTC_DRV_RC5T583=m
CONFIG_RTC_DRV_S35390A=m
CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
CONFIG_RTC_DRV_RX8581=m
CONFIG_RTC_DRV_RX8025=m
CONFIG_RTC_DRV_EM3027=m
CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y
CONFIG_RTC_DRV_RV8803=m
CONFIG_RTC_DRV_S5M=m
#
# SPI RTC drivers
#
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_PCF2127=m
#
# Platform RTC drivers
@@ -4264,6 +4358,8 @@ CONFIG_DMA_VIRTUAL_CHANNELS=m
CONFIG_DMA_OF=y
CONFIG_FSL_EDMA=m
CONFIG_INTEL_IDMA64=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
CONFIG_HSU_DMA=m
#
@@ -4309,12 +4405,14 @@ CONFIG_COMMON_CLK_RK808=m
CONFIG_COMMON_CLK_SI5351=m
CONFIG_COMMON_CLK_SI514=m
CONFIG_COMMON_CLK_SI570=m
+CONFIG_COMMON_CLK_CDCE706=m
CONFIG_COMMON_CLK_CDCE925=m
+CONFIG_COMMON_CLK_CS2000_CP=m
CONFIG_COMMON_CLK_S2MPS11=m
CONFIG_CLK_TWL6040=m
+# CONFIG_COMMON_CLK_NXP is not set
CONFIG_COMMON_CLK_PALMAS=m
# CONFIG_COMMON_CLK_PXA is not set
-CONFIG_COMMON_CLK_CDCE706=m
#
# Hardware Spinlock drivers
@@ -4326,6 +4424,7 @@ CONFIG_COMMON_CLK_CDCE706=m
# CONFIG_ATMEL_PIT is not set
# CONFIG_SH_TIMER_CMT is not set
# CONFIG_SH_TIMER_MTU2 is not set
+# CONFIG_SH_TIMER_TMU is not set
# CONFIG_EM_TIMER_STI is not set
CONFIG_MAILBOX=y
CONFIG_ALTERA_MBOX=m
@@ -4336,6 +4435,7 @@ CONFIG_IOMMU_SUPPORT=y
#
# Generic IOMMU Pagetable Support
#
+CONFIG_IOMMU_IOVA=y
CONFIG_OF_IOMMU=y
#
@@ -4374,6 +4474,7 @@ CONFIG_EXTCON_ADC_JACK=m
CONFIG_EXTCON_AXP288=m
CONFIG_EXTCON_GPIO=m
CONFIG_EXTCON_MAX14577=m
+CONFIG_EXTCON_MAX3355=m
CONFIG_EXTCON_MAX77693=m
CONFIG_EXTCON_MAX77843=m
CONFIG_EXTCON_MAX8997=m
@@ -4387,8 +4488,10 @@ CONFIG_IIO_BUFFER=y
CONFIG_IIO_BUFFER_CB=m
CONFIG_IIO_KFIFO_BUF=m
CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_CONFIGFS=m
CONFIG_IIO_TRIGGER=y
CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+CONFIG_IIO_SW_TRIGGER=m
#
# Accelerometers
@@ -4398,10 +4501,12 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
# CONFIG_HID_SENSOR_ACCEL_3D is not set
# CONFIG_IIO_ST_ACCEL_3AXIS is not set
CONFIG_KXCJK1013=m
+# CONFIG_MMA7455_I2C is not set
# CONFIG_MMA8452 is not set
# CONFIG_MMA9551 is not set
# CONFIG_MMA9553 is not set
# CONFIG_MXC4005 is not set
+# CONFIG_MXC6255 is not set
# CONFIG_STK8312 is not set
# CONFIG_STK8BA50 is not set
@@ -4412,12 +4517,15 @@ CONFIG_KXCJK1013=m
# CONFIG_AD799X is not set
# CONFIG_AXP288_ADC is not set
# CONFIG_CC10001_ADC is not set
+CONFIG_INA2XX_ADC=m
# CONFIG_MAX1363 is not set
# CONFIG_MCP3422 is not set
# CONFIG_NAU7802 is not set
+CONFIG_PALMAS_GPADC=m
# CONFIG_QCOM_SPMI_IADC is not set
# CONFIG_QCOM_SPMI_VADC is not set
# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_ADS1015 is not set
CONFIG_TWL4030_MADC=m
CONFIG_VF610_ADC=m
# CONFIG_VIPERBOARD_ADC is not set
@@ -4429,6 +4537,8 @@ CONFIG_VF610_ADC=m
#
# Chemical Sensors
#
+# CONFIG_ATLAS_PH_SENSOR is not set
+# CONFIG_IAQCORE is not set
# CONFIG_VZ89X is not set
#
@@ -4453,6 +4563,12 @@ CONFIG_IIO_ST_SENSORS_CORE=m
# CONFIG_MAX517 is not set
CONFIG_MAX5821=m
# CONFIG_MCP4725 is not set
+# CONFIG_VF610_DAC is not set
+
+#
+# IIO dummy driver
+#
+# CONFIG_IIO_SIMPLE_DUMMY is not set
#
# Frequency Synthesizers DDS/PLL
@@ -4475,6 +4591,16 @@ CONFIG_MAX5821=m
# CONFIG_ITG3200 is not set
#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+# CONFIG_AFE4404 is not set
+# CONFIG_MAX30100 is not set
+
+#
# Humidity sensors
#
CONFIG_DHT11=m
@@ -4487,7 +4613,7 @@ CONFIG_DHT11=m
# Inertial measurement units
#
# CONFIG_KMX61 is not set
-# CONFIG_INV_MPU6050_IIO is not set
+# CONFIG_INV_MPU6050_I2C is not set
#
# Light sensors
@@ -4529,6 +4655,7 @@ CONFIG_CM32181=m
# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
# CONFIG_MMC35240 is not set
# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
#
# Inclinometer sensors
@@ -4539,6 +4666,7 @@ CONFIG_HID_SENSOR_INCLINOMETER_3D=m
#
# Triggers - standalone
#
+CONFIG_IIO_HRTIMER_TRIGGER=m
CONFIG_IIO_INTERRUPT_TRIGGER=m
# CONFIG_IIO_SYSFS_TRIGGER is not set
@@ -4546,13 +4674,14 @@ CONFIG_IIO_INTERRUPT_TRIGGER=m
# Digital potentiometers
#
# CONFIG_MCP4531 is not set
+# CONFIG_TPL0102 is not set
#
# Pressure sensors
#
# CONFIG_BMP280 is not set
# CONFIG_HID_SENSOR_PRESS is not set
-# CONFIG_MPL115 is not set
+# CONFIG_MPL115_I2C is not set
CONFIG_MPL3115=m
# CONFIG_MS5611 is not set
# CONFIG_MS5637 is not set
@@ -4580,6 +4709,7 @@ CONFIG_IIO_ST_PRESS_I2C=m
# CONFIG_NTB is not set
# CONFIG_VME_BUS is not set
CONFIG_IRQCHIP=y
+CONFIG_ARM_GIC_MAX_NR=1
# CONFIG_IPACK_BUS is not set
CONFIG_RESET_CONTROLLER=y
# CONFIG_FMC is not set
@@ -4607,13 +4737,10 @@ CONFIG_THUNDERBOLT=m
#
# CONFIG_ANDROID is not set
CONFIG_NVMEM=m
-CONFIG_STM=m
-CONFIG_STM_DUMMY=m
-CONFIG_STM_SOURCE_CONSOLE=m
+# CONFIG_STM is not set
CONFIG_INTEL_TH=m
CONFIG_INTEL_TH_PCI=m
CONFIG_INTEL_TH_GTH=m
-CONFIG_INTEL_TH_STH=m
CONFIG_INTEL_TH_MSU=m
CONFIG_INTEL_TH_PTI=m
# CONFIG_INTEL_TH_DEBUG is not set
@@ -4668,6 +4795,8 @@ CONFIG_BTRFS_FS_POSIX_ACL=y
CONFIG_FS_POSIX_ACL=y
CONFIG_EXPORTFS=y
CONFIG_FILE_LOCKING=y
+CONFIG_MANDATORY_FILE_LOCKING=y
+# CONFIG_FS_ENCRYPTION is not set
CONFIG_FSNOTIFY=y
CONFIG_DNOTIFY=y
CONFIG_INOTIFY_USER=y
@@ -4715,6 +4844,7 @@ CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
+CONFIG_FAT_DEFAULT_UTF8=y
# CONFIG_NTFS_FS is not set
#
@@ -4732,6 +4862,7 @@ CONFIG_TMPFS_XATTR=y
# CONFIG_HUGETLB_PAGE is not set
CONFIG_CONFIGFS_FS=m
CONFIG_MISC_FILESYSTEMS=y
+# CONFIG_ORANGEFS_FS is not set
# CONFIG_ADFS_FS is not set
# CONFIG_AFFS_FS is not set
# CONFIG_ECRYPT_FS is not set
@@ -4783,7 +4914,8 @@ CONFIG_NFSD_V2_ACL=y
CONFIG_NFSD_V3=y
CONFIG_NFSD_V3_ACL=y
CONFIG_NFSD_V4=y
-CONFIG_NFSD_PNFS=y
+# CONFIG_NFSD_BLOCKLAYOUT is not set
+# CONFIG_NFSD_SCSILAYOUT is not set
CONFIG_NFSD_V4_SECURITY_LABEL=y
# CONFIG_NFSD_FAULT_INJECTION is not set
CONFIG_GRACE_PERIOD=m
@@ -4905,6 +5037,10 @@ CONFIG_DEBUG_KERNEL=y
#
CONFIG_PAGE_EXTENSION=y
# CONFIG_DEBUG_PAGEALLOC is not set
+CONFIG_PAGE_POISONING=y
+CONFIG_PAGE_POISONING_NO_SANITY=y
+# CONFIG_PAGE_POISONING_ZERO is not set
+# CONFIG_DEBUG_PAGE_REF is not set
# CONFIG_DEBUG_OBJECTS is not set
# CONFIG_SLUB_STATS is not set
CONFIG_HAVE_DEBUG_KMEMLEAK=y
@@ -4922,6 +5058,7 @@ CONFIG_LOCKUP_DETECTOR=y
# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
# CONFIG_DETECT_HUNG_TASK is not set
+# CONFIG_WQ_WATCHDOG is not set
# CONFIG_PANIC_ON_OOPS is not set
CONFIG_PANIC_ON_OOPS_VALUE=0
CONFIG_PANIC_TIMEOUT=120
@@ -4963,9 +5100,12 @@ CONFIG_DEBUG_LIST=y
# CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_TRACE is not set
# CONFIG_RCU_EQS_DEBUG is not set
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
# CONFIG_NOTIFIER_ERROR_INJECTION is not set
# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
CONFIG_NOP_TRACER=y
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
@@ -5017,6 +5157,7 @@ CONFIG_ASYNC_RAID6_TEST=m
# CONFIG_TEST_STRING_HELPERS is not set
# CONFIG_TEST_KSTRTOX is not set
# CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_BITMAP is not set
# CONFIG_TEST_RHASHTABLE is not set
# CONFIG_BUILD_DOCSRC is not set
# CONFIG_DMA_API_DEBUG is not set
@@ -5030,8 +5171,10 @@ CONFIG_ASYNC_RAID6_TEST=m
# CONFIG_SAMPLES is not set
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
+# CONFIG_UBSAN is not set
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
CONFIG_STRICT_DEVMEM=y
-CONFIG_DEBUG_RODATA=y
+CONFIG_IO_STRICT_DEVMEM=y
# CONFIG_DEBUG_SET_MODULE_RONX is not set
#
@@ -5062,6 +5205,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
CONFIG_INTEGRITY=y
CONFIG_INTEGRITY_SIGNATURE=y
CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
+CONFIG_INTEGRITY_TRUSTED_KEYRING=y
CONFIG_INTEGRITY_AUDIT=y
# CONFIG_IMA is not set
# CONFIG_EVM is not set
@@ -5090,11 +5234,9 @@ CONFIG_CRYPTO_HASH2=y
CONFIG_CRYPTO_RNG=y
CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_RNG_DEFAULT=y
-CONFIG_CRYPTO_PCOMP=m
-CONFIG_CRYPTO_PCOMP2=y
CONFIG_CRYPTO_AKCIPHER2=y
-CONFIG_CRYPTO_AKCIPHER=m
-CONFIG_CRYPTO_RSA=m
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_RSA=y
CONFIG_CRYPTO_MANAGER=y
CONFIG_CRYPTO_MANAGER2=y
# CONFIG_CRYPTO_USER is not set
@@ -5183,7 +5325,6 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
# Compression
#
CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
CONFIG_CRYPTO_LZO=m
CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_LZ4=m
@@ -5208,7 +5349,6 @@ CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_HW=y
CONFIG_ASYMMETRIC_KEY_TYPE=y
CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
-CONFIG_PUBLIC_KEY_ALGO_RSA=y
CONFIG_X509_CERTIFICATE_PARSER=y
CONFIG_PKCS7_MESSAGE_PARSER=m
# CONFIG_PKCS7_TEST_KEY is not set
@@ -5218,6 +5358,7 @@ CONFIG_PKCS7_MESSAGE_PARSER=m
#
CONFIG_SYSTEM_TRUSTED_KEYRING=y
CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
CONFIG_VIRTUALIZATION=y
CONFIG_BINARY_PRINTF=y
@@ -5272,6 +5413,8 @@ CONFIG_DECOMPRESS_XZ=y
CONFIG_DECOMPRESS_LZO=y
CONFIG_DECOMPRESS_LZ4=y
CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_DEC8=y
CONFIG_TEXTSEARCH=y
CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_BM=m
@@ -5290,6 +5433,7 @@ CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y
CONFIG_CLZ_TAB=y
CONFIG_CORDIC=m
# CONFIG_DDR is not set
+CONFIG_IRQ_POLL=y
CONFIG_MPILIB=y
CONFIG_SIGNATURE=y
CONFIG_OID_REGISTRY=y
diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 42fde91..ac109ea 100644
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -5,6 +5,10 @@ CONFIG_INSTRUCTION_DECODER=y
CONFIG_PERF_EVENTS_INTEL_UNCORE=y
CONFIG_OUTPUT_FORMAT="elf64-x86-64"
CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_ARCH_MMAP_RND_BITS_MIN=28
+CONFIG_ARCH_MMAP_RND_BITS_MAX=32
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
CONFIG_GENERIC_ISA_DMA=y
CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
CONFIG_ARCH_MAY_HAVE_PC_FDC=y
@@ -14,6 +18,7 @@ CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
CONFIG_ZONE_DMA32=y
CONFIG_AUDIT_ARCH=y
CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
@@ -56,6 +61,7 @@ CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
CONFIG_ARCH_SUPPORTS_INT128=y
# CONFIG_NUMA_BALANCING is not set
CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
CONFIG_PCSPKR_PLATFORM=y
#
@@ -70,6 +76,8 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_ARCH_MMAP_RND_BITS=32
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
CONFIG_COMPAT_OLD_SIGACTION=y
#
@@ -90,6 +98,7 @@ CONFIG_QUEUED_RWLOCKS=y
# Processor type and features
#
CONFIG_X86_FEATURE_NAMES=y
+CONFIG_X86_FAST_FEATURE_TESTS=y
CONFIG_X86_X2APIC=y
CONFIG_X86_MPPARSE=y
CONFIG_X86_EXTENDED_PLATFORM=y
@@ -97,9 +106,10 @@ CONFIG_X86_NUMACHIP=y
# CONFIG_X86_VSMP is not set
# CONFIG_X86_UV is not set
# CONFIG_X86_GOLDFISH is not set
+# CONFIG_X86_INTEL_MID is not set
CONFIG_X86_INTEL_LPSS=y
# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
-CONFIG_IOSF_MBI=m
+CONFIG_IOSF_MBI=y
# CONFIG_IOSF_MBI_DEBUG is not set
CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y
@@ -150,6 +160,7 @@ CONFIG_MICROCODE=y
CONFIG_MICROCODE_INTEL=y
CONFIG_MICROCODE_AMD=y
CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_PERF_EVENTS_AMD_POWER=m
# CONFIG_X86_MSR is not set
CONFIG_X86_CPUID=y
CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
@@ -186,8 +197,9 @@ CONFIG_MEMORY_FAILURE=y
CONFIG_TRANSPARENT_HUGEPAGE=y
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
-CONFIG_GENERIC_EARLY_IOREMAP=y
CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
+CONFIG_ARCH_HAS_PKEYS=y
CONFIG_X86_PMEM_LEGACY_DEVICE=y
CONFIG_X86_PMEM_LEGACY=y
CONFIG_X86_CHECK_BIOS_CORRUPTION=y
@@ -202,6 +214,7 @@ CONFIG_ARCH_USES_PG_UNCACHED=y
CONFIG_ARCH_RANDOM=y
CONFIG_X86_SMAP=y
CONFIG_X86_INTEL_MPX=y
+CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
# CONFIG_EFI_MIXED is not set
@@ -322,7 +335,6 @@ CONFIG_I7300_IDLE=m
CONFIG_PCI_DIRECT=y
CONFIG_PCI_MMCONFIG=y
# CONFIG_PCI_CNB20LE_QUIRK is not set
-CONFIG_HOTPLUG_PCI_PCIE=y
CONFIG_PCIE_ECRC=y
CONFIG_PCIEAER_INJECT=m
# CONFIG_PCIEASPM_DEFAULT is not set
@@ -337,6 +349,8 @@ CONFIG_PCI_IOV=y
CONFIG_PCI_PRI=y
CONFIG_PCI_PASID=y
CONFIG_PCI_LABEL=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
#
# PCI host controller drivers
@@ -356,11 +370,6 @@ CONFIG_YENTA_RICOH=y
CONFIG_YENTA_TI=y
CONFIG_YENTA_ENE_TUNE=y
CONFIG_YENTA_TOSHIBA=y
-CONFIG_HOTPLUG_PCI=y
-CONFIG_HOTPLUG_PCI_ACPI=y
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-# CONFIG_HOTPLUG_PCI_CPCI is not set
-CONFIG_HOTPLUG_PCI_SHPC=m
# CONFIG_RAPIDIO is not set
# CONFIG_X86_SYSFB is not set
@@ -377,6 +386,7 @@ CONFIG_SYSVIPC_COMPAT=y
CONFIG_KEYS_COMPAT=y
CONFIG_X86_DEV_DMA_OPS=y
CONFIG_PMC_ATOM=y
+CONFIG_VMD=m
CONFIG_COMPAT_NETLINK_MESSAGES=y
#
@@ -402,6 +412,7 @@ CONFIG_GENERIC_CPU_AUTOPROBE=y
#
# Bus devices
#
+CONFIG_OF_DYNAMIC=y
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
CONFIG_PARPORT=m
CONFIG_PARPORT_PC=m
@@ -431,7 +442,9 @@ CONFIG_BLK_DEV_SX8=m
CONFIG_BLK_DEV_RAM_SIZE=16384
# CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_RSXX=m
+CONFIG_NVME_CORE=m
CONFIG_BLK_DEV_NVME=m
+CONFIG_BLK_DEV_NVME_SCSI=y
#
# Misc devices
@@ -442,6 +455,7 @@ CONFIG_SGI_IOC4=m
CONFIG_HP_ILO=m
CONFIG_VMWARE_BALLOON=m
# CONFIG_SRAM is not set
+# CONFIG_PANEL is not set
#
# Altera FPGA firmware download module
@@ -462,7 +476,12 @@ CONFIG_INTEL_MIC_BUS=m
# CONFIG_SCIF_BUS is not set
#
-# Intel MIC Coprocessor State Management (COSM) Drivers
+# VOP Bus Driver
+#
+# CONFIG_VOP_BUS is not set
+
+#
+# VOP Driver
#
# CONFIG_GENWQE is not set
# CONFIG_IDE is not set
@@ -551,6 +570,7 @@ CONFIG_TULIP_NAPI=y
CONFIG_TULIP_NAPI_HW_MITIGATION=y
CONFIG_DE4X5=m
CONFIG_PCMCIA_XIRCOM=m
+CONFIG_E1000E_HWTS=y
CONFIG_IGB_DCA=y
CONFIG_IXGBE_DCA=y
CONFIG_IXGBEVF=m
@@ -560,6 +580,8 @@ CONFIG_FM10K=m
CONFIG_FM10K_VXLAN=y
CONFIG_SKGE_GENESIS=y
CONFIG_MYRI10GE_DCA=y
+CONFIG_NFP_NETVF=m
+# CONFIG_NFP_NET_DEBUG is not set
CONFIG_QLCNIC_SRIOV=y
CONFIG_QLCNIC_VXLAN=y
CONFIG_ATP=m
@@ -573,10 +595,12 @@ CONFIG_NET_SB1000=m
#
# MII PHY device drivers
#
+CONFIG_MDIO_CAVIUM=m
CONFIG_MDIO_OCTEON=m
+CONFIG_MDIO_THUNDER=m
# CONFIG_PLIP is not set
-CONFIG_AIRO=m
# CONFIG_WIL6210_TRACING is not set
+CONFIG_AIRO=m
CONFIG_IPW2100_MONITOR=y
CONFIG_IPW2200_MONITOR=y
CONFIG_IPW2200_RADIOTAP=y
@@ -642,12 +666,12 @@ CONFIG_NOZOMI=m
CONFIG_SERIAL_8250_PNP=y
# CONFIG_SERIAL_8250_FSL is not set
CONFIG_SERIAL_8250_FINTEK=m
+CONFIG_SERIAL_OF_PLATFORM=m
#
# Non-8250 serial port support
#
CONFIG_SERIAL_JSM=m
-CONFIG_SERIAL_OF_PLATFORM=m
CONFIG_SERIAL_SCCNXP=m
CONFIG_SERIAL_XILINX_PS_UART=m
CONFIG_SERIAL_ARC=m
@@ -677,6 +701,7 @@ CONFIG_ACPI_I2C_OPREGION=y
#
CONFIG_I2C_ARB_GPIO_CHALLENGE=m
CONFIG_I2C_MUX_PINCTRL=m
+CONFIG_I2C_DEMUX_PINCTRL=m
#
# PC SMBus host controller drivers
@@ -696,14 +721,14 @@ CONFIG_I2C_NFORCE2_S4985=m
CONFIG_I2C_SCMI=m
#
-# External I2C/SMBus adapter drivers
+# I2C system bus drivers (mostly embedded / system-on-chip)
#
-CONFIG_I2C_PARPORT=m
+CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
#
-# Other I2C/SMBus bus drivers
+# External I2C/SMBus adapter drivers
#
-# CONFIG_I2C_SLAVE is not set
+CONFIG_I2C_PARPORT=m
#
# PPS support
@@ -756,11 +781,14 @@ CONFIG_GPIO_XILINX=m
#
# Port-mapped I/O GPIO drivers
#
+CONFIG_GPIO_104_DIO_48E=m
CONFIG_GPIO_104_IDIO_16=m
+CONFIG_GPIO_104_IDI_48=m
# CONFIG_GPIO_F7188X is not set
CONFIG_GPIO_IT87=m
CONFIG_GPIO_SCH=m
# CONFIG_GPIO_SCH311X is not set
+CONFIG_GPIO_WS16C48=m
#
# MFD GPIO expanders
@@ -826,6 +854,7 @@ CONFIG_INTEL_PCH_THERMAL=m
# CONFIG_ACQUIRE_WDT is not set
# CONFIG_ADVANTECH_WDT is not set
CONFIG_ALIM1535_WDT=m
+CONFIG_EBC_C384_WDT=m
CONFIG_F71808E_WDT=m
CONFIG_SP5100_TCO=m
CONFIG_SBC_FITPC2_WATCHDOG=m
@@ -853,6 +882,8 @@ CONFIG_W83877F_WDT=m
CONFIG_W83977F_WDT=m
CONFIG_MACHZ_WDT=m
# CONFIG_SBC_EPX_C3_WATCHDOG is not set
+CONFIG_INTEL_MEI_WDT=m
+CONFIG_NI903X_WDT=m
#
# PCI-based Watchdog Cards
@@ -968,6 +999,7 @@ CONFIG_VIDEO_SAA7146_VV=m
#
# Audio decoders, processors and mixers
#
+CONFIG_VIDEO_CS3308=m
CONFIG_VIDEO_CS5345=m
CONFIG_VIDEO_WM8775=m
@@ -1041,9 +1073,14 @@ CONFIG_VGA_SWITCHEROO=y
# I2C encoder or helper chips
#
CONFIG_DRM_I2C_NXP_TDA998X=m
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
CONFIG_DRM_I810=m
CONFIG_DRM_I915=m
# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set
+CONFIG_DRM_I915_USERPTR=y
CONFIG_DRM_SIS=m
CONFIG_DRM_VMWGFX=m
# CONFIG_DRM_VMWGFX_FBCON is not set
@@ -1190,6 +1227,7 @@ CONFIG_ACER_WMI=m
CONFIG_ACERHDF=m
CONFIG_ALIENWARE_WMI=m
CONFIG_ASUS_LAPTOP=m
+CONFIG_DELL_SMBIOS=m
CONFIG_DELL_LAPTOP=m
CONFIG_DELL_WMI=m
CONFIG_DELL_WMI_AIO=m
@@ -1221,6 +1259,7 @@ CONFIG_EEEPC_LAPTOP=m
CONFIG_ASUS_WMI=m
CONFIG_ASUS_NB_WMI=m
CONFIG_EEEPC_WMI=m
+CONFIG_ASUS_WIRELESS=m
CONFIG_ACPI_WMI=m
CONFIG_MSI_WMI=m
CONFIG_TOPSTAR_LAPTOP=m
@@ -1229,6 +1268,7 @@ CONFIG_TOSHIBA_BT_RFKILL=m
CONFIG_TOSHIBA_HAPS=m
CONFIG_TOSHIBA_WMI=m
CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_HID_EVENT=m
CONFIG_INTEL_IPS=m
# CONFIG_IBM_RTL is not set
CONFIG_SAMSUNG_LAPTOP=m
@@ -1241,6 +1281,8 @@ CONFIG_INTEL_SMARTCONNECT=m
CONFIG_PVPANIC=m
CONFIG_INTEL_PMC_IPC=m
# CONFIG_SURFACE_PRO3_BUTTON is not set
+CONFIG_INTEL_PUNIT_IPC=m
+CONFIG_INTEL_TELEMETRY=m
CONFIG_CHROME_PLATFORMS=y
CONFIG_CHROMEOS_LAPTOP=m
# CONFIG_CHROMEOS_PSTORE is not set
@@ -1257,13 +1299,11 @@ CONFIG_COMMON_CLK_MAX77686=m
CONFIG_CLKEVT_I8253=y
CONFIG_I8253_LOCK=y
CONFIG_CLKBLD_I8253=y
-# CONFIG_SH_TIMER_TMU is not set
CONFIG_PCC=y
#
# Generic IOMMU Pagetable Support
#
-CONFIG_IOMMU_IOVA=y
CONFIG_AMD_IOMMU=y
CONFIG_AMD_IOMMU_STATS=y
CONFIG_AMD_IOMMU_V2=m
@@ -1330,6 +1370,8 @@ CONFIG_DMI_SYSFS=y
CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
CONFIG_ISCSI_IBFT_FIND=y
CONFIG_ISCSI_IBFT=m
+CONFIG_FW_CFG_SYSFS=m
+# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
# CONFIG_GOOGLE_FIRMWARE is not set
#
@@ -1362,12 +1404,15 @@ CONFIG_EFIVAR_FS=m
#
CONFIG_ARCH_WANT_FRAME_POINTERS=y
CONFIG_FRAME_POINTER=y
+CONFIG_STACK_VALIDATION=y
#
# Memory Debugging
#
# CONFIG_DEBUG_VIRTUAL is not set
CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_ARCH_HAS_KCOV=y
+# CONFIG_KCOV is not set
#
# Debug Lockups and Hangs
@@ -1380,7 +1425,6 @@ CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
# RCU Debugging
#
CONFIG_RCU_CPU_STALL_TIMEOUT=60
-# CONFIG_LATENCYTOP is not set
CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y
# CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
CONFIG_USER_STACKTRACE_SUPPORT=y
@@ -1394,6 +1438,7 @@ CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
# Runtime Testing
#
# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
# CONFIG_X86_VERBOSE_BOOTUP is not set
CONFIG_EARLY_PRINTK=y
# CONFIG_EARLY_PRINTK_DBGP is not set
@@ -1422,7 +1467,6 @@ CONFIG_DEBUG_BOOT_PARAMS=y
CONFIG_OPTIMIZE_INLINING=y
# CONFIG_DEBUG_ENTRY is not set
# CONFIG_DEBUG_NMI_SELFTEST is not set
-# CONFIG_X86_DEBUG_STATIC_CPU_HAS is not set
# CONFIG_X86_DEBUG_FPU is not set
# CONFIG_PUNIT_ATOM_DEBUG is not set
@@ -1490,7 +1534,11 @@ CONFIG_CRYPTO_DEV_CCP_DD=m
CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
CONFIG_CRYPTO_DEV_QAT=m
CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_C3XXX=m
+CONFIG_CRYPTO_DEV_QAT_C62X=m
CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
+CONFIG_CRYPTO_DEV_QAT_C62XVF=m
#
# Certificates for signature checking
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index b459d88..3d546b1 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -4,8 +4,8 @@
###############################################################################
name = kernel
-version = 4.4.19
-release = 2
+version = 4.6.7
+release = 1
thisapp = linux-%{version}
maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
diff --git a/kernel/patches/linux-3.14.25-rt5592_no_special_txop_init.patch b/kernel/patches/linux-3.14.25-rt5592_no_special_txop_init.patch
deleted file mode 100644
index fe30c9e..0000000
--- a/kernel/patches/linux-3.14.25-rt5592_no_special_txop_init.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c
---- linux-3.14.25.org/drivers/net/wireless/rt2x00/rt2800lib.c 2014-11-21 18:23:44.000000000 +0100
-+++ linux-3.14.25/drivers/net/wireless/rt2x00/rt2800lib.c 2014-12-03 11:30:58.813355413 +0100
-@@ -4847,7 +4847,8 @@
- rt2x00_set_field32(®, TXOP_CTRL_CFG_EXT_CWMIN, 0);
- rt2800_register_write(rt2x00dev, TXOP_CTRL_CFG, reg);
-
-- reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
-+// reg = rt2x00_rt(rt2x00dev, RT5592) ? 0x00000082 : 0x00000002;
-+ reg = 0x00000002;
- rt2800_register_write(rt2x00dev, TXOP_HLDR_ET, reg);
-
- rt2800_register_read(rt2x00dev, TX_RTS_CFG, ®);
diff --git a/kernel/scripts/configure b/kernel/scripts/configure
index 397beb8..7ce8ed5 100755
--- a/kernel/scripts/configure
+++ b/kernel/scripts/configure
@@ -271,7 +271,7 @@ function diff_configs() {
filename=${tmpdir}/config-${arch}-${flavour}
case "${config}" in
- aarch64:default|armv7hl:default)
+ aarch64:default|armv7hl:default|x86_64:default)
# Virtual configuration
rm -f ${filename}
continue
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2016-10-18 20:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-10-18 20:50 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 43556e68bd6ccbf65d2c3ffd60f702bd01e8d9af git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox