Re-order config

8 files changed, 115 insertions, 115 deletions

diff --git a/debian/config/arm64/config b/debian/config/arm64/config
index 43d6a11bbddb..d4815a5a9723 100644
--- a/debian/config/arm64/config
+++ b/debian/config/arm64/config
@@ -32,6 +32,27 @@ CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
 CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y
 
 ##
+## file: arch/arm64/Kconfig.platforms
+##
+CONFIG_ARCH_SUNXI=y
+CONFIG_ARCH_BCM2835=y
+CONFIG_ARCH_LAYERSCAPE=y
+CONFIG_ARCH_HISI=y
+CONFIG_ARCH_MESON=y
+CONFIG_ARCH_MVEBU=y
+CONFIG_ARCH_MXC=y
+CONFIG_ARCH_QCOM=y
+CONFIG_ARCH_ROCKCHIP=y
+CONFIG_ARCH_SEATTLE=y
+CONFIG_ARCH_SYNQUACER=y
+CONFIG_ARCH_TEGRA=y
+CONFIG_ARCH_THUNDER=y
+CONFIG_ARCH_THUNDER2=y
+CONFIG_ARCH_VEXPRESS=y
+CONFIG_ARCH_XGENE=y
+CONFIG_ARCH_ZYNQMP=y
+
+##
 ## file: arch/arm64/crypto/Kconfig
 ##
 CONFIG_ARM64_CRYPTO=y
@@ -56,27 +77,6 @@ CONFIG_VIRTUALIZATION=y
 CONFIG_KVM=y
 
 ##
-## file: arch/arm64/Kconfig.platforms
-##
-CONFIG_ARCH_SUNXI=y
-CONFIG_ARCH_BCM2835=y
-CONFIG_ARCH_LAYERSCAPE=y
-CONFIG_ARCH_HISI=y
-CONFIG_ARCH_MESON=y
-CONFIG_ARCH_MVEBU=y
-CONFIG_ARCH_MXC=y
-CONFIG_ARCH_QCOM=y
-CONFIG_ARCH_ROCKCHIP=y
-CONFIG_ARCH_SEATTLE=y
-CONFIG_ARCH_SYNQUACER=y
-CONFIG_ARCH_TEGRA=y
-CONFIG_ARCH_THUNDER=y
-CONFIG_ARCH_THUNDER2=y
-CONFIG_ARCH_VEXPRESS=y
-CONFIG_ARCH_XGENE=y
-CONFIG_ARCH_ZYNQMP=y
-
-##
 ## file: drivers/acpi/Kconfig
 ##
 CONFIG_ACPI=y
diff --git a/debian/config/config b/debian/config/config
index 15e7984e7be3..fe2ddd9a8ccd 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -5751,6 +5751,16 @@ CONFIG_MISC_FILESYSTEMS=y
 CONFIG_NETWORK_FILESYSTEMS=y
 
 ##
+## file: fs/Kconfig.binfmt
+##
+CONFIG_BINFMT_ELF=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+# CONFIG_BINFMT_AOUT is not set
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+
+##
 ## file: fs/9p/Kconfig
 ##
 CONFIG_9P_FS=m
@@ -5793,16 +5803,6 @@ CONFIG_BEFS_FS=m
 CONFIG_BFS_FS=m
 
 ##
-## file: fs/Kconfig.binfmt
-##
-CONFIG_BINFMT_ELF=y
-CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
-CONFIG_BINFMT_SCRIPT=y
-# CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_MISC=m
-CONFIG_COREDUMP=y
-
-##
 ## file: fs/btrfs/Kconfig
 ##
 CONFIG_BTRFS_FS=m
@@ -6439,6 +6439,25 @@ CONFIG_MODULE_SIG_SHA256=y
 # CONFIG_TRIM_UNUSED_KSYMS is not set
 
 ##
+## file: kernel/Kconfig.hz
+##
+## choice: Timer frequency
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+## end choice
+
+##
+## file: kernel/Kconfig.preempt
+##
+## choice: Preemption Model
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+## end choice
+
+##
 ## file: kernel/bpf/Kconfig
 ##
 CONFIG_BPF_SYSCALL=y
@@ -6461,16 +6480,6 @@ CONFIG_BPF_LSM=y
 # CONFIG_GCOV_KERNEL is not set
 
 ##
-## file: kernel/Kconfig.hz
-##
-## choice: Timer frequency
-# CONFIG_HZ_100 is not set
-CONFIG_HZ_250=y
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-## end choice
-
-##
 ## file: kernel/irq/Kconfig
 ##
 # CONFIG_GENERIC_IRQ_DEBUGFS is not set
@@ -6493,15 +6502,6 @@ CONFIG_PM_ADVANCED_DEBUG=y
 CONFIG_ENERGY_MODEL=y
 
 ##
-## file: kernel/Kconfig.preempt
-##
-## choice: Preemption Model
-# CONFIG_PREEMPT_NONE is not set
-CONFIG_PREEMPT_VOLUNTARY=y
-# CONFIG_PREEMPT is not set
-## end choice
-
-##
 ## file: kernel/rcu/Kconfig
 ##
 # CONFIG_RCU_EXPERT is not set
@@ -6674,6 +6674,21 @@ CONFIG_TEST_FIRMWARE=m
 CONFIG_TEST_STATIC_KEYS=m
 
 ##
+## file: lib/Kconfig.kasan
+##
+# CONFIG_KASAN is not set
+
+##
+## file: lib/Kconfig.kgdb
+##
+# CONFIG_KGDB is not set
+
+##
+## file: lib/Kconfig.ubsan
+##
+# CONFIG_UBSAN is not set
+
+##
 ## file: lib/fonts/Kconfig
 ##
 CONFIG_FONTS=y
@@ -6691,26 +6706,11 @@ CONFIG_FONT_8x16=y
 CONFIG_FONT_TER16x32=y
 
 ##
-## file: lib/Kconfig.kasan
-##
-# CONFIG_KASAN is not set
-
-##
-## file: lib/Kconfig.kgdb
-##
-# CONFIG_KGDB is not set
-
-##
 ## file: lib/math/Kconfig
 ##
 CONFIG_CORDIC=m
 
 ##
-## file: lib/Kconfig.ubsan
-##
-# CONFIG_UBSAN is not set
-
-##
 ## file: lib/xz/Kconfig
 ##
 #. These are enabled again by arch config, matching the defaults
@@ -7694,6 +7694,11 @@ CONFIG_DEFAULT_SECURITY_APPARMOR=y
 CONFIG_LSM="lockdown,yama,loadpin,safesetid,integrity,apparmor,selinux,smack,tomoyo"
 
 ##
+## file: security/Kconfig.hardening
+##
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+
+##
 ## file: security/apparmor/Kconfig
 ##
 CONFIG_SECURITY_APPARMOR=y
@@ -7701,11 +7706,6 @@ CONFIG_SECURITY_APPARMOR_HASH=y
 CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
 
 ##
-## file: security/Kconfig.hardening
-##
-CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
-
-##
 ## file: security/integrity/Kconfig
 ##
 CONFIG_INTEGRITY=y
diff --git a/debian/config/kernelarch-arm/config b/debian/config/kernelarch-arm/config
index 2d6bd21ed970..f176eb79c64b 100644
--- a/debian/config/kernelarch-arm/config
+++ b/debian/config/kernelarch-arm/config
@@ -14,13 +14,6 @@ CONFIG_KEXEC=y
 CONFIG_CRASH_DUMP=y
 
 ##
-## file: arch/arm/crypto/Kconfig
-##
-CONFIG_CRYPTO_SHA1_ARM=m
-CONFIG_CRYPTO_AES_ARM=m
-CONFIG_CRYPTO_NHPOLY1305_NEON=m
-
-##
 ## file: arch/arm/Kconfig.debug
 ##
 CONFIG_DEBUG_WX=y
@@ -28,6 +21,13 @@ CONFIG_DEBUG_LL=y
 CONFIG_EARLY_PRINTK=y
 
 ##
+## file: arch/arm/crypto/Kconfig
+##
+CONFIG_CRYPTO_SHA1_ARM=m
+CONFIG_CRYPTO_AES_ARM=m
+CONFIG_CRYPTO_NHPOLY1305_NEON=m
+
+##
 ## file: arch/arm/mm/Kconfig
 ##
 #. Support Thumb user binaries
diff --git a/debian/config/kernelarch-powerpc/config b/debian/config/kernelarch-powerpc/config
index 5ef5786782e9..1abc7ffe30b0 100644
--- a/debian/config/kernelarch-powerpc/config
+++ b/debian/config/kernelarch-powerpc/config
@@ -39,6 +39,12 @@ CONFIG_TAU=y
 # CONFIG_TAU_AVERAGE is not set
 
 ##
+## file: arch/powerpc/platforms/Kconfig.cputype
+##
+CONFIG_PPC_KUEP=y
+CONFIG_PPC_KUAP=y
+
+##
 ## file: arch/powerpc/platforms/52xx/Kconfig
 ##
 # CONFIG_PPC_LITE5200 is not set
@@ -59,12 +65,6 @@ CONFIG_TAU=y
 # CONFIG_PPC_86xx is not set
 
 ##
-## file: arch/powerpc/platforms/Kconfig.cputype
-##
-CONFIG_PPC_KUEP=y
-CONFIG_PPC_KUAP=y
-
-##
 ## file: arch/powerpc/platforms/powermac/Kconfig
 ##
 CONFIG_PPC_PMAC=y
diff --git a/debian/config/m68k/config b/debian/config/m68k/config
index e0f6132fda1d..61cae3ee8bd1 100644
--- a/debian/config/m68k/config
+++ b/debian/config/m68k/config
@@ -617,6 +617,12 @@ CONFIG_FB_ATY=y
 CONFIG_ZORRO_NAMES=y
 
 ##
+## file: fs/Kconfig.binfmt
+##
+CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_MISC=m
+
+##
 ## file: fs/adfs/Kconfig
 ##
 # CONFIG_ADFS_FS is not set
@@ -637,12 +643,6 @@ CONFIG_ZORRO_NAMES=y
 # CONFIG_BFS_FS is not set
 
 ##
-## file: fs/Kconfig.binfmt
-##
-CONFIG_BINFMT_ELF=y
-CONFIG_BINFMT_MISC=m
-
-##
 ## file: fs/ceph/Kconfig
 ##
 # CONFIG_CEPH_FS is not set
diff --git a/debian/config/powerpc/config.powerpc b/debian/config/powerpc/config.powerpc
index a86f323a8f08..c9094daac938 100644
--- a/debian/config/powerpc/config.powerpc
+++ b/debian/config/powerpc/config.powerpc
@@ -5,6 +5,19 @@ CONFIG_HIGHMEM=y
 # CONFIG_ISA is not set
 
 ##
+## file: arch/powerpc/platforms/Kconfig.cputype
+##
+# CONFIG_PPC64 is not set
+## choice: Processor Type
+# CONFIG_PPC_85xx is not set
+# CONFIG_PPC_8xx is not set
+# CONFIG_40x is not set
+# CONFIG_44x is not set
+## end choice
+CONFIG_ALTIVEC=y
+# CONFIG_SMP is not set
+
+##
 ## file: arch/powerpc/platforms/512x/Kconfig
 ##
 # CONFIG_MPC5121_ADS is not set
@@ -24,19 +37,6 @@ CONFIG_PPC_MPC5200_BUGFIX=y
 CONFIG_PPC_CHRP=y
 
 ##
-## file: arch/powerpc/platforms/Kconfig.cputype
-##
-# CONFIG_PPC64 is not set
-## choice: Processor Type
-# CONFIG_PPC_85xx is not set
-# CONFIG_PPC_8xx is not set
-# CONFIG_40x is not set
-# CONFIG_44x is not set
-## end choice
-CONFIG_ALTIVEC=y
-# CONFIG_SMP is not set
-
-##
 ## file: drivers/ata/Kconfig
 ##
 CONFIG_PATA_MPC52xx=m
diff --git a/debian/config/sh4/config.sh7751r b/debian/config/sh4/config.sh7751r
index d5de335e96d4..0e19bdcd89b9 100644
--- a/debian/config/sh4/config.sh7751r
+++ b/debian/config/sh4/config.sh7751r
@@ -7,6 +7,14 @@ CONFIG_CPU_SUBTYPE_SH7751R=y
 CONFIG_SH_PCLK_FREQ=60000000
 
 ##
+## file: arch/sh/Kconfig.cpu
+##
+## choice: Endianness selection
+CONFIG_CPU_LITTLE_ENDIAN=y
+## end choice
+CONFIG_SH_FPU=y
+
+##
 ## file: arch/sh/boards/Kconfig
 ##
 CONFIG_SH_RTS7751R2D=y
@@ -17,14 +25,6 @@ CONFIG_SH_RTS7751R2D=y
 CONFIG_RTS7751R2D_PLUS=y
 
 ##
-## file: arch/sh/Kconfig.cpu
-##
-## choice: Endianness selection
-CONFIG_CPU_LITTLE_ENDIAN=y
-## end choice
-CONFIG_SH_FPU=y
-
-##
 ## file: arch/sh/mm/Kconfig
 ##
 CONFIG_MMU=y
diff --git a/debian/config/sh4/config.sh7785lcr b/debian/config/sh4/config.sh7785lcr
index 0ee3e3f315e6..9b96eb998639 100644
--- a/debian/config/sh4/config.sh7785lcr
+++ b/debian/config/sh4/config.sh7785lcr
@@ -7,11 +7,6 @@ CONFIG_CPU_SUBTYPE_SH7785=y
 CONFIG_SH_PCLK_FREQ=50000000
 
 ##
-## file: arch/sh/boards/Kconfig
-##
-CONFIG_SH_SH7785LCR=y
-
-##
 ## file: arch/sh/Kconfig.cpu
 ##
 ## choice: Endianness selection
@@ -21,6 +16,11 @@ CONFIG_SH_FPU=y
 CONFIG_SH_STORE_QUEUES=y
 
 ##
+## file: arch/sh/boards/Kconfig
+##
+CONFIG_SH_SH7785LCR=y
+
+##
 ## file: arch/sh/mm/Kconfig
 ##
 CONFIG_MMU=y