kernel: Reorder kernel configuration options

Reorder the options and remove double entries.
This was generated by running this:
$ ./scripts/kconfig.pl '+' target/linux/generic/config-5.10 /dev/null > target/linux/generic/config-5.10.new
$ mv target/linux/generic/config-5.10.new target/linux/generic/config-5.10
$ ./scripts/kconfig.pl '+' target/linux/generic/config-5.4 /dev/null > target/linux/generic/config-5.4.new
$ mv target/linux/generic/config-5.4.new target/linux/generic/config-5.4

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

2 files changed, 9 insertions, 12 deletions

diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10
index 3d270d8c35..cd096b2934 100644
--- a/target/linux/generic/config-5.10
+++ b/target/linux/generic/config-5.10
@@ -679,10 +679,10 @@ CONFIG_BLOCK=y
 # CONFIG_BONDING is not set
 # CONFIG_BOOKE_WDT is not set
 CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT=3
+# CONFIG_BOOTTIME_TRACING is not set
 # CONFIG_BOOT_CONFIG is not set
 # CONFIG_BOOT_PRINTK_DELAY is not set
 CONFIG_BOOT_RAW=y
-# CONFIG_BOOTTIME_TRACING is not set
 # CONFIG_BOUNCE is not set
 CONFIG_BPF=y
 # CONFIG_BPFILTER is not set
@@ -942,7 +942,6 @@ CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_COMPILE_TEST is not set
 # CONFIG_CONFIGFS_FS is not set
-# CONFIG_KVM_AMD_SEV is not set
 # CONFIG_CONNECTOR is not set
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
@@ -1480,8 +1479,8 @@ CONFIG_DQL=y
 # CONFIG_DRM_PANEL_SAMSUNG_S6E3HA2 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E63M0 is not set
-# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 is not set
+# CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0 is not set
 # CONFIG_DRM_PANEL_SEIKO_43WVF1G is not set
 # CONFIG_DRM_PANEL_SHARP_LQ101R1SX01 is not set
 # CONFIG_DRM_PANEL_SHARP_LS037V7DW01 is not set
@@ -1909,13 +1908,13 @@ CONFIG_FIB_RULES=y
 # CONFIG_FIELDBUS_DEV is not set
 CONFIG_FILE_LOCKING=y
 # CONFIG_FIND_BIT_BENCHMARK is not set
-# CONFIG_FIT_PARTITION is not set
 # CONFIG_FIREWIRE is not set
 # CONFIG_FIREWIRE_NOSY is not set
 # CONFIG_FIREWIRE_SERIAL is not set
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_FIRMWARE_MEMMAP is not set
+# CONFIG_FIT_PARTITION is not set
 # CONFIG_FIXED_PHY is not set
 CONFIG_FLATMEM=y
 CONFIG_FLATMEM_MANUAL=y
@@ -2780,8 +2779,6 @@ CONFIG_JFFS2_SUMMARY=y
 # CONFIG_JME is not set
 CONFIG_JOLIET=y
 # CONFIG_JSA1212 is not set
-# CONFIG_JZ4740_WDT is not set
-# CONFIG_JZ4770_PHY is not set
 # CONFIG_JUMP_LABEL is not set
 # CONFIG_JZ4740_WDT is not set
 # CONFIG_JZ4770_PHY is not set
@@ -2801,9 +2798,9 @@ CONFIG_KASAN_STACK=1
 # CONFIG_KERNEL_LZ4 is not set
 # CONFIG_KERNEL_LZMA is not set
 # CONFIG_KERNEL_LZO is not set
-# CONFIG_KERNEL_ZSTD is not set
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_KERNEL_XZ=y
+# CONFIG_KERNEL_ZSTD is not set
 CONFIG_KERNFS=y
 # CONFIG_KEXEC is not set
 # CONFIG_KEXEC_FILE is not set
@@ -2849,10 +2846,10 @@ CONFIG_KERNFS=y
 # CONFIG_KGDB is not set
 # CONFIG_KMEMCHECK is not set
 # CONFIG_KMX61 is not set
-# CONFIG_KPROBE_EVENT_GEN_TEST is not set
-# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
 # CONFIG_KPROBES is not set
 # CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
+# CONFIG_KPROBE_EVENT_GEN_TEST is not set
 # CONFIG_KS7010 is not set
 # CONFIG_KS8842 is not set
 # CONFIG_KS8851 is not set
@@ -2862,6 +2859,7 @@ CONFIG_KERNFS=y
 # CONFIG_KUNIT is not set
 CONFIG_KUSER_HELPERS=y
 # CONFIG_KVM_AMD is not set
+# CONFIG_KVM_AMD_SEV is not set
 # CONFIG_KVM_GUEST is not set
 # CONFIG_KVM_INTEL is not set
 # CONFIG_KVM_WERROR is not set
@@ -3047,7 +3045,6 @@ CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
 # CONFIG_MACH_JZ4740 is not set
 # CONFIG_MACH_LOONGSON2EF is not set
 # CONFIG_MACH_LOONGSON32 is not set
-# CONFIG_MACH_LOONGSON2EF is not set
 # CONFIG_MACH_LOONGSON64 is not set
 # CONFIG_MACH_PIC32 is not set
 # CONFIG_MACH_PISTACHIO is not set
@@ -5932,8 +5929,8 @@ CONFIG_SYMBOLIC_ERRNAME=y
 # CONFIG_SYNCLINK_CS is not set
 # CONFIG_SYNC_FILE is not set
 # CONFIG_SYNOPSYS_DWC_ETH_QOS is not set
-CONFIG_SYN_COOKIES=y
 # CONFIG_SYNTH_EVENTS is not set
+CONFIG_SYN_COOKIES=y
 # CONFIG_SYSCON_REBOOT_MODE is not set
 CONFIG_SYSCTL=y
 # CONFIG_SYSCTL_SYSCALL is not set
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index 71f75ba76f..522a99300d 100644
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -889,7 +889,6 @@ CONFIG_COMPACTION=y
 # CONFIG_COMPAT_BRK is not set
 # CONFIG_COMPILE_TEST is not set
 # CONFIG_CONFIGFS_FS is not set
-# CONFIG_KVM_AMD_SEV is not set
 # CONFIG_CONNECTOR is not set
 CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
 CONFIG_CONSOLE_LOGLEVEL_QUIET=4
@@ -2634,6 +2633,7 @@ CONFIG_KERNFS=y
 # CONFIG_KSZ884X_PCI is not set
 CONFIG_KUSER_HELPERS=y
 # CONFIG_KVM_AMD is not set
+# CONFIG_KVM_AMD_SEV is not set
 # CONFIG_KVM_GUEST is not set
 # CONFIG_KVM_INTEL is not set
 # CONFIG_KXCJK1013 is not set