diff --git a/debian/config/armhf/config.armmp b/debian/config/armhf/config.armmp
index 5ff902c6a..3824cf23b 100644
--- a/debian/config/armhf/config.armmp
+++ b/debian/config/armhf/config.armmp
@@ -146,8 +146,8 @@ CONFIG_BT_WILINK=m
 ##
 ## file: drivers/bus/Kconfig
 ##
-CONFIG_OMAP_OCP2SCP=m
 CONFIG_OMAP_INTERCONNECT=m
+CONFIG_OMAP_OCP2SCP=m
 
 ##
 ## file: drivers/char/hw_random/Kconfig
@@ -206,12 +206,12 @@ CONFIG_EXTCON_PALMAS=m
 ##
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_DA9052=m
 CONFIG_GPIO_GENERIC_PLATFORM=m
 CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_DA9052=m
+CONFIG_GPIO_PALMAS=y
 CONFIG_GPIO_TWL4030=y
 CONFIG_GPIO_TWL6040=y
-CONFIG_GPIO_PALMAS=y
 
 ##
 ## file: drivers/gpu/drm/Kconfig
diff --git a/debian/config/config b/debian/config/config
index 3024e2f90..2f893f6ea 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -472,26 +472,26 @@ CONFIG_EFI_VARS_PSTORE=m
 # CONFIG_GPIOLIB is not set
 # CONFIG_DEBUG_GPIO is not set
 # CONFIG_GPIO_SYSFS is not set
-# CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_DWAPB is not set
+# CONFIG_GPIO_GENERIC_PLATFORM is not set
 # CONFIG_GPIO_IT8761E is not set
 # CONFIG_GPIO_SCH311X is not set
 # CONFIG_GPIO_TS5500 is not set
 # CONFIG_GPIO_VX855 is not set
+# CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_MAX7300 is not set
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
-# CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_CS5535 is not set
 # CONFIG_GPIO_AMD8111 is not set
 # CONFIG_GPIO_INTEL_MID is not set
 # CONFIG_GPIO_ML_IOH is not set
 # CONFIG_GPIO_RDC321X is not set
+# CONFIG_GPIO_74X164 is not set
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_MC33880 is not set
-# CONFIG_GPIO_74X164 is not set
 CONFIG_GPIO_VIPERBOARD=m
 
 ##
@@ -5633,12 +5633,12 @@ CONFIG_TCP_MD5SIG=y
 ##
 CONFIG_NF_CONNTRACK_IPV4=m
 CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_NF_LOG_ARP=m
-CONFIG_NF_LOG_IPV4=m
 CONFIG_NF_TABLES_IPV4=m
 CONFIG_NFT_CHAIN_ROUTE_IPV4=m
-CONFIG_NF_REJECT_IPV4=m
 CONFIG_NF_TABLES_ARP=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
 CONFIG_NFT_CHAIN_NAT_IPV4=m
 CONFIG_NFT_MASQ_IPV4=m
 CONFIG_NF_NAT_SNMP_BASIC=m
diff --git a/debian/config/kernelarch-arm/config b/debian/config/kernelarch-arm/config
index 99ac4908b..03046fe67 100644
--- a/debian/config/kernelarch-arm/config
+++ b/debian/config/kernelarch-arm/config
@@ -6,6 +6,12 @@ CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
 CONFIG_KEXEC=y
 
+##
+## file: arch/arm/crypto/Kconfig
+##
+CONFIG_CRYPTO_SHA1_ARM=m
+CONFIG_CRYPTO_AES_ARM=m
+
 ##
 ## file: arch/arm/Kconfig.debug
 ##
@@ -18,12 +24,6 @@ CONFIG_EARLY_PRINTK=y
 #. Support Thumb user binaries
 CONFIG_ARM_THUMB=y
 
-##
-## file: crypto/Kconfig
-##
-CONFIG_CRYPTO_SHA1_ARM=m
-CONFIG_CRYPTO_AES_ARM=m
-
 ##
 ## file: drivers/input/misc/Kconfig
 ##
diff --git a/debian/config/kernelarch-x86/config b/debian/config/kernelarch-x86/config
index 7e734481b..e3210f717 100644
--- a/debian/config/kernelarch-x86/config
+++ b/debian/config/kernelarch-x86/config
@@ -19,7 +19,6 @@ CONFIG_PARAVIRT_SPINLOCKS=y
 CONFIG_KVM_GUEST=y
 # CONFIG_KVM_DEBUG_FS is not set
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-CONFIG_MEMTEST=y
 CONFIG_HPET_TIMER=y
 CONFIG_DMI=y
 CONFIG_GART_IOMMU=y
@@ -454,12 +453,12 @@ CONFIG_EFI_RUNTIME_MAP=y
 ##
 CONFIG_GPIOLIB=y
 # CONFIG_GPIO_F7188X is not set
-# CONFIG_GPIO_SCH is not set
 # CONFIG_GPIO_ICH is not set
 # CONFIG_GPIO_LYNXPOINT is not set
+# CONFIG_GPIO_SCH is not set
+CONFIG_GPIO_KEMPLD=m
 # CONFIG_GPIO_INTEL_MID is not set
 CONFIG_GPIO_ML_IOH=m
-CONFIG_GPIO_KEMPLD=m
 
 ##
 ## file: drivers/gpu/drm/Kconfig
@@ -1770,6 +1769,7 @@ CONFIG_SPARSE_IRQ=y
 # CONFIG_DEBUG_SHIRQ is not set
 # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set
 # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+CONFIG_MEMTEST=y
 
 ##
 ## file: lib/xz/Kconfig