From 9bdf3e01dcdd55854193315915e21604f3b055b4 Mon Sep 17 00:00:00 2001
From: Thomas Clarke <tonux@riseup.net>
Date: Thu, 7 Jan 2021 19:17:23 +0000
Subject: [PATCH] Update all Librem and KGPE-D16 board to build with Linux
 5.10.5. Update KGPE-D16 and Librem linux configs to 5.10.5 with `make
 savedefconfig`.

---
 .../kgpe-d16_server-whiptail.config           |   2 +-
 boards/kgpe-d16_server/kgpe-d16_server.config |   2 +-
 .../kgpe-d16_workstation-usb_keyboard.config  |   2 +-
 .../kgpe-d16_workstation.config               |   2 +-
 boards/librem_13v2/librem_13v2.config         |   2 +-
 boards/librem_13v4/librem_13v4.config         |   2 +-
 boards/librem_15v3/librem_15v3.config         |   2 +-
 boards/librem_15v4/librem_15v4.config         |   2 +-
 boards/librem_l1um/librem_l1um.config         |   2 +-
 boards/librem_mini/librem_mini.config         |   2 +-
 boards/librem_mini_v2/librem_mini_v2.config   |   2 +-
 config/linux-kgpe-d16_server-whiptail.config  | 107 +++++++-----------
 config/linux-kgpe-d16_server.config           | 107 +++++++-----------
 config/linux-kgpe-d16_workstation.config      | 106 +++++++----------
 config/linux-librem_common.config             |  13 +--
 15 files changed, 134 insertions(+), 221 deletions(-)

diff --git a/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config b/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config
index 5ebc96be..f8aa1a23 100644
--- a/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config
+++ b/boards/kgpe-d16_server-whiptail/kgpe-d16_server-whiptail.config
@@ -15,7 +15,7 @@
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.11
-export CONFIG_LINUX_VERSION=4.14.62
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server-whiptail.config
 CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server-whiptail.config
diff --git a/boards/kgpe-d16_server/kgpe-d16_server.config b/boards/kgpe-d16_server/kgpe-d16_server.config
index dafa7672..66d1668b 100644
--- a/boards/kgpe-d16_server/kgpe-d16_server.config
+++ b/boards/kgpe-d16_server/kgpe-d16_server.config
@@ -13,7 +13,7 @@
 # - Please support https://github.com/osresearch/heads/issues/719
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.11
-export CONFIG_LINUX_VERSION=4.14.62
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_server.config
 CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_server.config
diff --git a/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config
index 65caf422..1f4028a1 100644
--- a/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config
+++ b/boards/kgpe-d16_workstation-usb_keyboard/kgpe-d16_workstation-usb_keyboard.config
@@ -9,7 +9,7 @@
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.11
-export CONFIG_LINUX_VERSION=4.14.62
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation-usb_keyboard.config
 CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config
diff --git a/boards/kgpe-d16_workstation/kgpe-d16_workstation.config b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config
index 1c492def..0a6a9238 100644
--- a/boards/kgpe-d16_workstation/kgpe-d16_workstation.config
+++ b/boards/kgpe-d16_workstation/kgpe-d16_workstation.config
@@ -13,7 +13,7 @@
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.11
-export CONFIG_LINUX_VERSION=4.14.62
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_COREBOOT_CONFIG=config/coreboot-kgpe-d16_workstation.config
 CONFIG_LINUX_CONFIG=config/linux-kgpe-d16_workstation.config
diff --git a/boards/librem_13v2/librem_13v2.config b/boards/librem_13v2/librem_13v2.config
index ef2e908a..44aba862 100644
--- a/boards/librem_13v2/librem_13v2.config
+++ b/boards/librem_13v2/librem_13v2.config
@@ -4,7 +4,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-librem_13v2.config
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.8.1
-export CONFIG_LINUX_VERSION=5.4.69
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y
diff --git a/boards/librem_13v4/librem_13v4.config b/boards/librem_13v4/librem_13v4.config
index 1cdb4013..21fd92bd 100644
--- a/boards/librem_13v4/librem_13v4.config
+++ b/boards/librem_13v4/librem_13v4.config
@@ -4,7 +4,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-librem_13v4.config
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.8.1
-export CONFIG_LINUX_VERSION=5.4.69
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y
diff --git a/boards/librem_15v3/librem_15v3.config b/boards/librem_15v3/librem_15v3.config
index 11b2351c..8e5e7c2b 100644
--- a/boards/librem_15v3/librem_15v3.config
+++ b/boards/librem_15v3/librem_15v3.config
@@ -4,7 +4,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-librem_15v3.config
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.8.1
-export CONFIG_LINUX_VERSION=5.4.69
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y
diff --git a/boards/librem_15v4/librem_15v4.config b/boards/librem_15v4/librem_15v4.config
index 81211239..57a3c5ae 100644
--- a/boards/librem_15v4/librem_15v4.config
+++ b/boards/librem_15v4/librem_15v4.config
@@ -4,7 +4,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-librem_15v4.config
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.8.1
-export CONFIG_LINUX_VERSION=5.4.69
+export CONFIG_LINUX_VERSION=5.10.5
 
 CONFIG_CRYPTSETUP=y
 CONFIG_FLASHROM=y
diff --git a/boards/librem_l1um/librem_l1um.config b/boards/librem_l1um/librem_l1um.config
index 7bf0598b..7f07e6ec 100644
--- a/boards/librem_l1um/librem_l1um.config
+++ b/boards/librem_l1um/librem_l1um.config
@@ -4,7 +4,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-librem_l1um.config
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.11
-export CONFIG_LINUX_VERSION=5.4.69
+export CONFIG_LINUX_VERSION=5.10.5
 export CONFIG_PURISM_BLOBS=y
 
 CONFIG_CRYPTSETUP=y
diff --git a/boards/librem_mini/librem_mini.config b/boards/librem_mini/librem_mini.config
index e8b3887c..e78a9b0b 100644
--- a/boards/librem_mini/librem_mini.config
+++ b/boards/librem_mini/librem_mini.config
@@ -4,7 +4,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini.config
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.13
-export CONFIG_LINUX_VERSION=5.4.69
+export CONFIG_LINUX_VERSION=5.10.5
 export CONFIG_PURISM_BLOBS=y
 
 CONFIG_CRYPTSETUP=y
diff --git a/boards/librem_mini_v2/librem_mini_v2.config b/boards/librem_mini_v2/librem_mini_v2.config
index d5a0c049..e38fcd26 100644
--- a/boards/librem_mini_v2/librem_mini_v2.config
+++ b/boards/librem_mini_v2/librem_mini_v2.config
@@ -4,7 +4,7 @@ CONFIG_COREBOOT_CONFIG=config/coreboot-librem_mini_v2.config
 
 export CONFIG_COREBOOT=y
 export CONFIG_COREBOOT_VERSION=4.13
-export CONFIG_LINUX_VERSION=5.4.69
+export CONFIG_LINUX_VERSION=5.10.5
 export CONFIG_PURISM_BLOBS=y
 
 CONFIG_CRYPTSETUP=y
diff --git a/config/linux-kgpe-d16_server-whiptail.config b/config/linux-kgpe-d16_server-whiptail.config
index 72354147..47d9e847 100644
--- a/config/linux-kgpe-d16_server-whiptail.config
+++ b/config/linux-kgpe-d16_server-whiptail.config
@@ -3,8 +3,8 @@ CONFIG_LOCALVERSION="-heads"
 CONFIG_KERNEL_XZ=y
 # CONFIG_SWAP is not set
 # CONFIG_CROSS_MEMORY_ATTACH is not set
-# CONFIG_FHANDLE is not set
 CONFIG_NO_HZ_IDLE=y
+CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio"
@@ -16,40 +16,29 @@ CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio"
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_SGETMASK_SYSCALL is not set
 # CONFIG_SYSFS_SYSCALL is not set
+# CONFIG_FHANDLE is not set
 # CONFIG_BASE_FULL is not set
 # CONFIG_SIGNALFD is not set
 # CONFIG_TIMERFD is not set
 # CONFIG_EVENTFD is not set
 # CONFIG_AIO is not set
 # CONFIG_ADVISE_SYSCALLS is not set
-# CONFIG_MEMBARRIER is not set
 CONFIG_EMBEDDED=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
-CONFIG_JUMP_LABEL=y
-CONFIG_CC_STACKPROTECTOR_STRONG=y
-CONFIG_MODULES=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_SMP=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_PROCESSOR_SELECT=y
 # CONFIG_CPU_SUP_CENTAUR is not set
-CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 # CONFIG_X86_MCE_AMD is not set
 # CONFIG_PERF_EVENTS_INTEL_RAPL is not set
 # CONFIG_MICROCODE is not set
-# CONFIG_SPARSEMEM_VMEMMAP is not set
-# CONFIG_COMPACTION is not set
-# CONFIG_BOUNCE is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_X86_PMEM_LEGACY=y
 # CONFIG_MTRR is not set
 # CONFIG_X86_SMAP is not set
 # CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set
-# CONFIG_SECCOMP is not set
 CONFIG_KEXEC=y
 CONFIG_KEXEC_FILE=y
 # CONFIG_RELOCATABLE is not set
@@ -57,27 +46,30 @@ CONFIG_PHYSICAL_ALIGN=0x1000000
 # CONFIG_MODIFY_LDT_SYSCALL is not set
 # CONFIG_SUSPEND is not set
 CONFIG_ACPI_VIDEO=y
-CONFIG_PCI_MSI=y
-# CONFIG_HT_IRQ is not set
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
+# CONFIG_FIRMWARE_MEMMAP is not set
+# CONFIG_DMIID is not set
+# CONFIG_VIRTUALIZATION is not set
+CONFIG_JUMP_LABEL=y
+# CONFIG_SECCOMP is not set
+CONFIG_MODULES=y
 # CONFIG_COREDUMP is not set
+# CONFIG_COMPACTION is not set
+# CONFIG_BOUNCE is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_IOV=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_ALLOW_DEV_COREDUMP is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
@@ -109,7 +101,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_AMD is not set
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_CADENCE is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
 # CONFIG_NET_VENDOR_BROCADE is not set
 # CONFIG_NET_VENDOR_CAVIUM is not set
@@ -119,11 +110,9 @@ CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_DLINK is not set
 # CONFIG_NET_VENDOR_EMULEX is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
-# CONFIG_NET_VENDOR_EXAR is not set
-# CONFIG_NET_VENDOR_HP is not set
+# CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_E1000=m
 CONFIG_E1000E=m
-# CONFIG_NET_VENDOR_I825XX is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 # CONFIG_NET_VENDOR_MELLANOX is not set
 # CONFIG_NET_VENDOR_MICREL is not set
@@ -132,12 +121,11 @@ CONFIG_E1000E=m
 # CONFIG_NET_VENDOR_NETRONOME is not set
 # CONFIG_NET_VENDOR_NVIDIA is not set
 # CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_NET_PACKET_ENGINE is not set
 # CONFIG_NET_VENDOR_QLOGIC is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_REALTEK is not set
 # CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_ROCKER is not set
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
@@ -146,11 +134,11 @@ CONFIG_E1000E=m
 # CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_STMICRO is not set
 # CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_NET_VENDOR_TEHUTI is not set
 # CONFIG_NET_VENDOR_TI is not set
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_USB_NET_DRIVERS is not set
 # CONFIG_WLAN is not set
 # CONFIG_INPUT_MOUSE is not set
@@ -169,7 +157,6 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_TPM=m
 CONFIG_TCG_TPM=y
 CONFIG_TCG_TIS=y
 # CONFIG_I2C_COMPAT is not set
@@ -185,10 +172,7 @@ CONFIG_MFD_SYSCON=y
 CONFIG_DRM=y
 CONFIG_DRM_AST=y
 CONFIG_FB_VESA=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=m
@@ -207,8 +191,6 @@ CONFIG_GENERIC_PHY=y
 # CONFIG_BLK_DEV_PMEM is not set
 # CONFIG_ND_BLK is not set
 # CONFIG_BTT is not set
-# CONFIG_FIRMWARE_MEMMAP is not set
-# CONFIG_DMIID is not set
 CONFIG_EXT4_FS=y
 # CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY_USER is not set
@@ -224,35 +206,9 @@ CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
-CONFIG_PRINTK_TIME=y
-CONFIG_BOOT_PRINTK_DELAY=y
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_INFO_DWARF4=y
-CONFIG_GDB_SCRIPTS=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-CONFIG_DEBUG_FS=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-CONFIG_WQ_WATCHDOG=y
-# CONFIG_SCHED_DEBUG is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_FTRACE is not set
-# CONFIG_STRICT_DEVMEM is not set
-# CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_DOUBLEFAULT is not set
-CONFIG_IO_DELAY_0XED=y
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_X86_DEBUG_FPU is not set
 CONFIG_HARDENED_USERCOPY=y
-CONFIG_CRYPTO_RSA=m
 CONFIG_CRYPTO_USER=y
-CONFIG_CRYPTO_MCRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_RSA=m
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
@@ -307,14 +263,12 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_HASH=y
-CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_USER_API_RNG=y
 CONFIG_CRYPTO_USER_API_AEAD=y
 # CONFIG_CRYPTO_HW is not set
-# CONFIG_VIRTUALIZATION is not set
+CONFIG_CORDIC=m
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=m
@@ -322,5 +276,24 @@ CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
 CONFIG_CRC8=m
 CONFIG_XZ_DEC_TEST=m
-CONFIG_CORDIC=m
-CONFIG_IRQ_POLL=y
+CONFIG_PRINTK_TIME=y
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DYNAMIC_DEBUG=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_INFO_DWARF4=y
+CONFIG_GDB_SCRIPTS=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_FS=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_WQ_WATCHDOG=y
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_STACKTRACE=y
+# CONFIG_RCU_TRACE is not set
+# CONFIG_FTRACE is not set
+# CONFIG_STRICT_DEVMEM is not set
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_IO_DELAY_0XED=y
+# CONFIG_X86_DEBUG_FPU is not set
diff --git a/config/linux-kgpe-d16_server.config b/config/linux-kgpe-d16_server.config
index 72354147..47d9e847 100644
--- a/config/linux-kgpe-d16_server.config
+++ b/config/linux-kgpe-d16_server.config
@@ -3,8 +3,8 @@ CONFIG_LOCALVERSION="-heads"
 CONFIG_KERNEL_XZ=y
 # CONFIG_SWAP is not set
 # CONFIG_CROSS_MEMORY_ATTACH is not set
-# CONFIG_FHANDLE is not set
 CONFIG_NO_HZ_IDLE=y
+CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio"
@@ -16,40 +16,29 @@ CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio"
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_SGETMASK_SYSCALL is not set
 # CONFIG_SYSFS_SYSCALL is not set
+# CONFIG_FHANDLE is not set
 # CONFIG_BASE_FULL is not set
 # CONFIG_SIGNALFD is not set
 # CONFIG_TIMERFD is not set
 # CONFIG_EVENTFD is not set
 # CONFIG_AIO is not set
 # CONFIG_ADVISE_SYSCALLS is not set
-# CONFIG_MEMBARRIER is not set
 CONFIG_EMBEDDED=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
-CONFIG_JUMP_LABEL=y
-CONFIG_CC_STACKPROTECTOR_STRONG=y
-CONFIG_MODULES=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_SMP=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_PROCESSOR_SELECT=y
 # CONFIG_CPU_SUP_CENTAUR is not set
-CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 # CONFIG_X86_MCE_AMD is not set
 # CONFIG_PERF_EVENTS_INTEL_RAPL is not set
 # CONFIG_MICROCODE is not set
-# CONFIG_SPARSEMEM_VMEMMAP is not set
-# CONFIG_COMPACTION is not set
-# CONFIG_BOUNCE is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_X86_PMEM_LEGACY=y
 # CONFIG_MTRR is not set
 # CONFIG_X86_SMAP is not set
 # CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set
-# CONFIG_SECCOMP is not set
 CONFIG_KEXEC=y
 CONFIG_KEXEC_FILE=y
 # CONFIG_RELOCATABLE is not set
@@ -57,27 +46,30 @@ CONFIG_PHYSICAL_ALIGN=0x1000000
 # CONFIG_MODIFY_LDT_SYSCALL is not set
 # CONFIG_SUSPEND is not set
 CONFIG_ACPI_VIDEO=y
-CONFIG_PCI_MSI=y
-# CONFIG_HT_IRQ is not set
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
+# CONFIG_FIRMWARE_MEMMAP is not set
+# CONFIG_DMIID is not set
+# CONFIG_VIRTUALIZATION is not set
+CONFIG_JUMP_LABEL=y
+# CONFIG_SECCOMP is not set
+CONFIG_MODULES=y
 # CONFIG_COREDUMP is not set
+# CONFIG_COMPACTION is not set
+# CONFIG_BOUNCE is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_IOV=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_ALLOW_DEV_COREDUMP is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
@@ -109,7 +101,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_AMD is not set
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_CADENCE is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
 # CONFIG_NET_VENDOR_BROCADE is not set
 # CONFIG_NET_VENDOR_CAVIUM is not set
@@ -119,11 +110,9 @@ CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_DLINK is not set
 # CONFIG_NET_VENDOR_EMULEX is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
-# CONFIG_NET_VENDOR_EXAR is not set
-# CONFIG_NET_VENDOR_HP is not set
+# CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_E1000=m
 CONFIG_E1000E=m
-# CONFIG_NET_VENDOR_I825XX is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 # CONFIG_NET_VENDOR_MELLANOX is not set
 # CONFIG_NET_VENDOR_MICREL is not set
@@ -132,12 +121,11 @@ CONFIG_E1000E=m
 # CONFIG_NET_VENDOR_NETRONOME is not set
 # CONFIG_NET_VENDOR_NVIDIA is not set
 # CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_NET_PACKET_ENGINE is not set
 # CONFIG_NET_VENDOR_QLOGIC is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_REALTEK is not set
 # CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_ROCKER is not set
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
@@ -146,11 +134,11 @@ CONFIG_E1000E=m
 # CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_STMICRO is not set
 # CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_NET_VENDOR_TEHUTI is not set
 # CONFIG_NET_VENDOR_TI is not set
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_USB_NET_DRIVERS is not set
 # CONFIG_WLAN is not set
 # CONFIG_INPUT_MOUSE is not set
@@ -169,7 +157,6 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_TPM=m
 CONFIG_TCG_TPM=y
 CONFIG_TCG_TIS=y
 # CONFIG_I2C_COMPAT is not set
@@ -185,10 +172,7 @@ CONFIG_MFD_SYSCON=y
 CONFIG_DRM=y
 CONFIG_DRM_AST=y
 CONFIG_FB_VESA=y
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-# CONFIG_LCD_CLASS_DEVICE is not set
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-# CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=m
@@ -207,8 +191,6 @@ CONFIG_GENERIC_PHY=y
 # CONFIG_BLK_DEV_PMEM is not set
 # CONFIG_ND_BLK is not set
 # CONFIG_BTT is not set
-# CONFIG_FIRMWARE_MEMMAP is not set
-# CONFIG_DMIID is not set
 CONFIG_EXT4_FS=y
 # CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY_USER is not set
@@ -224,35 +206,9 @@ CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
-CONFIG_PRINTK_TIME=y
-CONFIG_BOOT_PRINTK_DELAY=y
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_INFO_DWARF4=y
-CONFIG_GDB_SCRIPTS=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-CONFIG_DEBUG_FS=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-CONFIG_WQ_WATCHDOG=y
-# CONFIG_SCHED_DEBUG is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_FTRACE is not set
-# CONFIG_STRICT_DEVMEM is not set
-# CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_DOUBLEFAULT is not set
-CONFIG_IO_DELAY_0XED=y
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_X86_DEBUG_FPU is not set
 CONFIG_HARDENED_USERCOPY=y
-CONFIG_CRYPTO_RSA=m
 CONFIG_CRYPTO_USER=y
-CONFIG_CRYPTO_MCRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_RSA=m
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
@@ -307,14 +263,12 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_HASH=y
-CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_USER_API_RNG=y
 CONFIG_CRYPTO_USER_API_AEAD=y
 # CONFIG_CRYPTO_HW is not set
-# CONFIG_VIRTUALIZATION is not set
+CONFIG_CORDIC=m
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=m
@@ -322,5 +276,24 @@ CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
 CONFIG_CRC8=m
 CONFIG_XZ_DEC_TEST=m
-CONFIG_CORDIC=m
-CONFIG_IRQ_POLL=y
+CONFIG_PRINTK_TIME=y
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DYNAMIC_DEBUG=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_INFO_DWARF4=y
+CONFIG_GDB_SCRIPTS=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_FS=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_WQ_WATCHDOG=y
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_STACKTRACE=y
+# CONFIG_RCU_TRACE is not set
+# CONFIG_FTRACE is not set
+# CONFIG_STRICT_DEVMEM is not set
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_IO_DELAY_0XED=y
+# CONFIG_X86_DEBUG_FPU is not set
diff --git a/config/linux-kgpe-d16_workstation.config b/config/linux-kgpe-d16_workstation.config
index 81e6eaa4..b20ca08e 100644
--- a/config/linux-kgpe-d16_workstation.config
+++ b/config/linux-kgpe-d16_workstation.config
@@ -3,8 +3,8 @@ CONFIG_LOCALVERSION="-heads"
 CONFIG_KERNEL_XZ=y
 # CONFIG_SWAP is not set
 # CONFIG_CROSS_MEMORY_ATTACH is not set
-# CONFIG_FHANDLE is not set
 CONFIG_NO_HZ_IDLE=y
+CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_LOG_BUF_SHIFT=18
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio"
@@ -16,67 +16,59 @@ CONFIG_INITRAMFS_SOURCE="../../../blobs/dev.cpio"
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 # CONFIG_SGETMASK_SYSCALL is not set
 # CONFIG_SYSFS_SYSCALL is not set
+# CONFIG_FHANDLE is not set
 # CONFIG_BASE_FULL is not set
 # CONFIG_SIGNALFD is not set
 # CONFIG_TIMERFD is not set
 # CONFIG_EVENTFD is not set
 # CONFIG_AIO is not set
 # CONFIG_ADVISE_SYSCALLS is not set
-# CONFIG_MEMBARRIER is not set
 CONFIG_EMBEDDED=y
 # CONFIG_VM_EVENT_COUNTERS is not set
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
-CONFIG_JUMP_LABEL=y
-CONFIG_CC_STACKPROTECTOR_STRONG=y
-CONFIG_MODULES=y
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
 CONFIG_SMP=y
 # CONFIG_X86_EXTENDED_PLATFORM is not set
 CONFIG_PROCESSOR_SELECT=y
 # CONFIG_CPU_SUP_CENTAUR is not set
-CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
 # CONFIG_X86_MCE_AMD is not set
 # CONFIG_PERF_EVENTS_INTEL_RAPL is not set
 # CONFIG_MICROCODE is not set
-# CONFIG_SPARSEMEM_VMEMMAP is not set
-# CONFIG_COMPACTION is not set
-# CONFIG_BOUNCE is not set
-CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_X86_PMEM_LEGACY=y
 # CONFIG_MTRR is not set
 # CONFIG_X86_SMAP is not set
 # CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set
-# CONFIG_SECCOMP is not set
 CONFIG_KEXEC=y
 CONFIG_KEXEC_FILE=y
 # CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x1000000
 # CONFIG_MODIFY_LDT_SYSCALL is not set
 # CONFIG_SUSPEND is not set
-CONFIG_PCI_MSI=y
-# CONFIG_HT_IRQ is not set
-CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
+# CONFIG_FIRMWARE_MEMMAP is not set
+# CONFIG_DMIID is not set
+# CONFIG_VIRTUALIZATION is not set
+CONFIG_JUMP_LABEL=y
+# CONFIG_SECCOMP is not set
+CONFIG_MODULES=y
 # CONFIG_COREDUMP is not set
+# CONFIG_COMPACTION is not set
+# CONFIG_BOUNCE is not set
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
 CONFIG_NET=y
 CONFIG_PACKET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
 CONFIG_SYN_COOKIES=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
 # CONFIG_WIRELESS is not set
-# CONFIG_UEVENT_HELPER is not set
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_IOV=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
-# CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_ALLOW_DEV_COREDUMP is not set
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
@@ -108,7 +100,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_AMD is not set
 # CONFIG_NET_VENDOR_ARC is not set
 # CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_CADENCE is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
 # CONFIG_NET_VENDOR_BROCADE is not set
 # CONFIG_NET_VENDOR_CAVIUM is not set
@@ -118,11 +109,9 @@ CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_DLINK is not set
 # CONFIG_NET_VENDOR_EMULEX is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
-# CONFIG_NET_VENDOR_EXAR is not set
-# CONFIG_NET_VENDOR_HP is not set
+# CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_E1000=m
 CONFIG_E1000E=m
-# CONFIG_NET_VENDOR_I825XX is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 # CONFIG_NET_VENDOR_MELLANOX is not set
 # CONFIG_NET_VENDOR_MICREL is not set
@@ -131,12 +120,11 @@ CONFIG_E1000E=m
 # CONFIG_NET_VENDOR_NETRONOME is not set
 # CONFIG_NET_VENDOR_NVIDIA is not set
 # CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_NET_PACKET_ENGINE is not set
 # CONFIG_NET_VENDOR_QLOGIC is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
+# CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_REALTEK is not set
 # CONFIG_NET_VENDOR_RENESAS is not set
-# CONFIG_NET_VENDOR_RDC is not set
 # CONFIG_NET_VENDOR_ROCKER is not set
 # CONFIG_NET_VENDOR_SAMSUNG is not set
 # CONFIG_NET_VENDOR_SEEQ is not set
@@ -145,11 +133,11 @@ CONFIG_E1000E=m
 # CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_STMICRO is not set
 # CONFIG_NET_VENDOR_SUN is not set
+# CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_NET_VENDOR_TEHUTI is not set
 # CONFIG_NET_VENDOR_TI is not set
 # CONFIG_NET_VENDOR_VIA is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
-# CONFIG_NET_VENDOR_SYNOPSYS is not set
 # CONFIG_USB_NET_DRIVERS is not set
 # CONFIG_WLAN is not set
 # CONFIG_INPUT_MOUSE is not set
@@ -168,7 +156,6 @@ CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_INTEL=m
 CONFIG_HW_RANDOM_AMD=m
 CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_TPM=m
 CONFIG_TCG_TPM=y
 CONFIG_TCG_TIS=y
 # CONFIG_I2C_COMPAT is not set
@@ -186,8 +173,6 @@ CONFIG_DRM_AMDGPU=y
 CONFIG_DRM_NOUVEAU=y
 CONFIG_DRM_AST=y
 CONFIG_FB_VESA=y
-# CONFIG_LCD_CLASS_DEVICE is not set
-# CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=m
@@ -205,8 +190,6 @@ CONFIG_GENERIC_PHY=y
 # CONFIG_BLK_DEV_PMEM is not set
 # CONFIG_ND_BLK is not set
 # CONFIG_BTT is not set
-# CONFIG_FIRMWARE_MEMMAP is not set
-# CONFIG_DMIID is not set
 CONFIG_EXT4_FS=y
 # CONFIG_DNOTIFY is not set
 # CONFIG_INOTIFY_USER is not set
@@ -222,35 +205,9 @@ CONFIG_NLS_DEFAULT="utf8"
 CONFIG_NLS_CODEPAGE_437=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_UTF8=y
-CONFIG_PRINTK_TIME=y
-CONFIG_BOOT_PRINTK_DELAY=y
-CONFIG_DYNAMIC_DEBUG=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_INFO_DWARF4=y
-CONFIG_GDB_SCRIPTS=y
-# CONFIG_ENABLE_WARN_DEPRECATED is not set
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-CONFIG_DEBUG_FS=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_HARDLOCKUP_DETECTOR=y
-CONFIG_WQ_WATCHDOG=y
-# CONFIG_SCHED_DEBUG is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
-# CONFIG_RCU_TRACE is not set
-# CONFIG_FTRACE is not set
-# CONFIG_STRICT_DEVMEM is not set
-# CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_DOUBLEFAULT is not set
-CONFIG_IO_DELAY_0XED=y
-CONFIG_OPTIMIZE_INLINING=y
-# CONFIG_X86_DEBUG_FPU is not set
 CONFIG_HARDENED_USERCOPY=y
-CONFIG_CRYPTO_RSA=m
 CONFIG_CRYPTO_USER=y
-CONFIG_CRYPTO_MCRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_RSA=m
 CONFIG_CRYPTO_CCM=m
 CONFIG_CRYPTO_GCM=m
 CONFIG_CRYPTO_CHACHA20POLY1305=m
@@ -305,14 +262,12 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_HASH=y
-CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_USER_API_RNG=y
 CONFIG_CRYPTO_USER_API_AEAD=y
 # CONFIG_CRYPTO_HW is not set
-# CONFIG_VIRTUALIZATION is not set
+CONFIG_CORDIC=m
 CONFIG_CRC_CCITT=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=m
@@ -320,5 +275,24 @@ CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
 CONFIG_CRC8=m
 CONFIG_XZ_DEC_TEST=m
-CONFIG_CORDIC=m
-CONFIG_IRQ_POLL=y
+CONFIG_PRINTK_TIME=y
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DYNAMIC_DEBUG=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_INFO_DWARF4=y
+CONFIG_GDB_SCRIPTS=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_FS=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_WQ_WATCHDOG=y
+# CONFIG_SCHED_DEBUG is not set
+CONFIG_STACKTRACE=y
+# CONFIG_RCU_TRACE is not set
+# CONFIG_FTRACE is not set
+# CONFIG_STRICT_DEVMEM is not set
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_IO_DELAY_0XED=y
+# CONFIG_X86_DEBUG_FPU is not set
diff --git a/config/linux-librem_common.config b/config/linux-librem_common.config
index daedcca7..f0a615bf 100644
--- a/config/linux-librem_common.config
+++ b/config/linux-librem_common.config
@@ -40,7 +40,6 @@ CONFIG_X86_PMEM_LEGACY=y
 # CONFIG_MTRR is not set
 # CONFIG_X86_SMAP is not set
 # CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS is not set
-# CONFIG_SECCOMP is not set
 CONFIG_KEXEC=y
 CONFIG_KEXEC_FILE=y
 # CONFIG_RELOCATABLE is not set
@@ -51,9 +50,9 @@ CONFIG_PHYSICAL_ALIGN=0x1000000
 # CONFIG_DMIID is not set
 # CONFIG_VIRTUALIZATION is not set
 CONFIG_JUMP_LABEL=y
+# CONFIG_SECCOMP is not set
 CONFIG_MODULES=y
 # CONFIG_COREDUMP is not set
-# CONFIG_SPARSEMEM_VMEMMAP is not set
 # CONFIG_COMPACTION is not set
 # CONFIG_BOUNCE is not set
 CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
@@ -68,7 +67,6 @@ CONFIG_SYN_COOKIES=y
 CONFIG_PCI=y
 CONFIG_PCI_MSI=y
 CONFIG_PCI_IOV=y
-CONFIG_PCI_PRI=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
@@ -112,7 +110,6 @@ CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_DLINK is not set
 # CONFIG_NET_VENDOR_EMULEX is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
-# CONFIG_NET_VENDOR_HP is not set
 # CONFIG_NET_VENDOR_I825XX is not set
 CONFIG_E1000=m
 CONFIG_E1000E=m
@@ -176,7 +173,6 @@ CONFIG_DRM=y
 CONFIG_DRM_I915=y
 CONFIG_DRM_AST=y
 CONFIG_FB_VESA=y
-# CONFIG_BACKLIGHT_GENERIC is not set
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_USB=y
 CONFIG_USB_XHCI_HCD=m
@@ -263,8 +259,6 @@ CONFIG_CRYPTO_842=m
 CONFIG_CRYPTO_LZ4=m
 CONFIG_CRYPTO_LZ4HC=m
 CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_DRBG_HASH=y
-CONFIG_CRYPTO_DRBG_CTR=y
 CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_USER_API_RNG=y
@@ -282,22 +276,21 @@ CONFIG_IRQ_POLL=y
 CONFIG_PRINTK_TIME=y
 CONFIG_BOOT_PRINTK_DELAY=y
 CONFIG_DYNAMIC_DEBUG=y
+# CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_INFO_DWARF4=y
 CONFIG_GDB_SCRIPTS=y
 # CONFIG_ENABLE_MUST_CHECK is not set
 CONFIG_FRAME_WARN=1024
-CONFIG_DEBUG_FS=y
 CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_FS=y
 CONFIG_HARDLOCKUP_DETECTOR=y
 CONFIG_WQ_WATCHDOG=y
 # CONFIG_SCHED_DEBUG is not set
 CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_BUGVERBOSE is not set
 # CONFIG_RCU_TRACE is not set
 # CONFIG_FTRACE is not set
 # CONFIG_STRICT_DEVMEM is not set
 # CONFIG_X86_VERBOSE_BOOTUP is not set
-# CONFIG_DOUBLEFAULT is not set
 CONFIG_IO_DELAY_0XED=y
 # CONFIG_X86_DEBUG_FPU is not set