kernel: reorder configuration options

Reorder the kernel configuration options by running:
./scripts/kconfig-reorder.sh

Link: https://github.com/openwrt/openwrt/pull/21710
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/airoha/an7583/config-6.12 b/target/linux/airoha/an7583/config-6.12
index 98aa5b4a0c21865dd5d4def013186d5e10a756c5..a9905e08cd6198f89e5ecd21d1c8211c84eb8f2d 100644 (file)
--- a/target/linux/airoha/an7583/config-6.12
+++ b/target/linux/airoha/an7583/config-6.12
@@ -170,12 +170,12 @@ CONFIG_HAS_DMA=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_IOPORT_MAP=y
+# CONFIG_HISILICON_ERRATUM_162100801 is not set
 CONFIG_HOTPLUG_CORE_SYNC=y
 CONFIG_HOTPLUG_CORE_SYNC_DEAD=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_AIROHA=y
-# CONFIG_HISILICON_ERRATUM_162100801 is not set
 # CONFIG_IDPF is not set
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 CONFIG_INET_AH=y
@@ -211,9 +211,9 @@ CONFIG_LOCK_SPIN_ON_OWNER=y
 CONFIG_LRU_GEN_WALKS_MMU=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_MDIO_AIROHA=y
 CONFIG_MDIO_BUS=y
 CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_AIROHA=y
 CONFIG_MDIO_DEVRES=y
 # CONFIG_MEDIATEK_GE_SOC_PHY is not set
 # CONFIG_MEMCG is not set

diff --git a/target/linux/airoha/en7523/config-6.12 b/target/linux/airoha/en7523/config-6.12
index a9bf597a4ac90670390bd327d24a2c0f189a5c42..971f359bbd77ad19fed39640ff7ce951f6a4ada0 100644 (file)
--- a/target/linux/airoha/en7523/config-6.12
+++ b/target/linux/airoha/en7523/config-6.12
@@ -168,6 +168,7 @@ CONFIG_LOCK_DEBUGGING_SUPPORT=y
 CONFIG_LOCK_SPIN_ON_OWNER=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+# CONFIG_MDIO_AIROHA is not set
 CONFIG_MDIO_BUS=y
 CONFIG_MDIO_DEVICE=y
 CONFIG_MDIO_DEVRES=y
@@ -191,8 +192,8 @@ CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SRCU_NMI_SAFE=y
 CONFIG_NET_AIROHA=y
-CONFIG_NET_AIROHA_NPU=y
 # CONFIG_NET_AIROHA_FLOW_STATS is not set
+CONFIG_NET_AIROHA_NPU=y
 CONFIG_NET_EGRESS=y
 CONFIG_NET_FLOW_LIMIT=y
 CONFIG_NET_INGRESS=y
@@ -215,9 +216,6 @@ CONFIG_OF_GPIO=y
 CONFIG_OF_IRQ=y
 CONFIG_OF_KOBJ=y
 CONFIG_OF_MDIO=y
-# CONFIG_MDIO_AIROHA is not set
-# CONFIG_PCS_AIROHA_AN7581 is not set
-# CONFIG_PCS_AIROHA_AN7583 is not set
 CONFIG_OLD_SIGACTION=y
 CONFIG_OLD_SIGSUSPEND3=y
 CONFIG_OUTER_CACHE=y
@@ -236,6 +234,8 @@ CONFIG_PCIE_PME=y
 CONFIG_PCI_DOMAINS=y
 CONFIG_PCI_DOMAINS_GENERIC=y
 CONFIG_PCI_MSI=y
+# CONFIG_PCS_AIROHA_AN7581 is not set
+# CONFIG_PCS_AIROHA_AN7583 is not set
 CONFIG_PERF_USE_VMALLOC=y
 CONFIG_PGTABLE_LEVELS=2
 CONFIG_PHYLIB=y

diff --git a/target/linux/generic/config-6.12 b/target/linux/generic/config-6.12
index 38bff49fba6ca7b64e133eb9979cca67243c5336..1e6323f8ddf80ff8c2de0b1bdc702922e15ced10 100644 (file)
--- a/target/linux/generic/config-6.12
+++ b/target/linux/generic/config-6.12
@@ -7394,9 +7394,9 @@ CONFIG_VHOST_MENU=y
 # CONFIG_VIDEO_ADV7604 is not set
 # CONFIG_VIDEO_ADV7842 is not set
 # CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_ALVIUM_CSI2 is not set
 # CONFIG_VIDEO_AK7375 is not set
 # CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_ALVIUM_CSI2 is not set
 # CONFIG_VIDEO_AM437X_VPFE is not set
 # CONFIG_VIDEO_AR0521 is not set
 # CONFIG_VIDEO_ASPEED is not set

diff --git a/target/linux/mpc85xx/p2020/config-default b/target/linux/mpc85xx/p2020/config-default
index 07db6407be4d3247b56b59d9c0f2c94e7ce08b74..28f5d68381906882ddfc6def02b4124e953dbdef 100644 (file)
--- a/target/linux/mpc85xx/p2020/config-default
+++ b/target/linux/mpc85xx/p2020/config-default
@@ -1,7 +1,7 @@
 CONFIG_BLK_DEV_NVME=y
+CONFIG_CMDLINE_OVERRIDE=y
 CONFIG_CONTEXT_TRACKING=y
 CONFIG_CONTEXT_TRACKING_IDLE=y
-CONFIG_CMDLINE_OVERRIDE=y
 CONFIG_CPU_RMAP=y
 CONFIG_DEFAULT_UIMAGE=y
 CONFIG_EEPROM_AT24=y

diff --git a/target/linux/realtek/rtl930x/config-6.12 b/target/linux/realtek/rtl930x/config-6.12
index 6b6fd8693a4a9c12ad8328452b04419d12d9a6ec..02d1463659844bb03ee196652dcccf5c842e33c4 100644 (file)
--- a/target/linux/realtek/rtl930x/config-6.12
+++ b/target/linux/realtek/rtl930x/config-6.12
@@ -25,8 +25,8 @@ CONFIG_CPU_MIPS32=y
 # CONFIG_CPU_MIPS32_R1 is not set
 CONFIG_CPU_MIPS32_R2=y
 CONFIG_CPU_MIPSR2=y
-CONFIG_CPU_MIPSR2_IRQ_VI=y
 CONFIG_CPU_MIPSR2_IRQ_EI=y
+CONFIG_CPU_MIPSR2_IRQ_VI=y
 CONFIG_CPU_MITIGATIONS=y
 CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y
 CONFIG_CPU_R4K_CACHE_TLB=y
@@ -239,8 +239,8 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_HIGHMEM=y
 CONFIG_SYS_SUPPORTS_MIPS16=y
 CONFIG_SYS_SUPPORTS_MULTITHREADING=y
-CONFIG_SYS_SUPPORTS_SMP=y
 CONFIG_SYS_SUPPORTS_SCHED_SMT=y
+CONFIG_SYS_SUPPORTS_SMP=y
 CONFIG_TARGET_ISA_REV=2
 CONFIG_THERMAL=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set

diff --git a/target/linux/realtek/rtl930x_nand/config-6.12 b/target/linux/realtek/rtl930x_nand/config-6.12
index 70686b46926666b8768b8cc739e4b4f6c1942000..4365107528a9f04b7871ff8da0dccc6bbbf27106 100644 (file)
--- a/target/linux/realtek/rtl930x_nand/config-6.12
+++ b/target/linux/realtek/rtl930x_nand/config-6.12
@@ -25,8 +25,8 @@ CONFIG_CPU_MIPS32=y
 # CONFIG_CPU_MIPS32_R1 is not set
 CONFIG_CPU_MIPS32_R2=y
 CONFIG_CPU_MIPSR2=y
-CONFIG_CPU_MIPSR2_IRQ_VI=y
 CONFIG_CPU_MIPSR2_IRQ_EI=y
+CONFIG_CPU_MIPSR2_IRQ_VI=y
 CONFIG_CPU_MITIGATIONS=y
 CONFIG_CPU_NEEDS_NO_SMARTMIPS_OR_MICROMIPS=y
 CONFIG_CPU_R4K_CACHE_TLB=y
@@ -244,8 +244,8 @@ CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
 CONFIG_SYS_SUPPORTS_HIGHMEM=y
 CONFIG_SYS_SUPPORTS_MIPS16=y
 CONFIG_SYS_SUPPORTS_MULTITHREADING=y
-CONFIG_SYS_SUPPORTS_SMP=y
 CONFIG_SYS_SUPPORTS_SCHED_SMT=y
+CONFIG_SYS_SUPPORTS_SMP=y
 CONFIG_TARGET_ISA_REV=2
 CONFIG_THERMAL=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set

diff --git a/target/linux/sunxi/arm926ejs/config-6.12 b/target/linux/sunxi/arm926ejs/config-6.12
index 8625b9751b29cbfcf467d8ee048b8c3eb0f4eaae..771f130cdea678f2bcd1609caafc14015c8867ab 100644 (file)
--- a/target/linux/sunxi/arm926ejs/config-6.12
+++ b/target/linux/sunxi/arm926ejs/config-6.12
@@ -1,28 +1,28 @@
+CONFIG_ARCH_32BIT_OFF_T=y
+CONFIG_ARCH_HAS_BINFMT_FLAT=y
+CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
+CONFIG_ARCH_MULTIPLATFORM=y
+CONFIG_ARCH_MULTI_CPU_AUTO=y
 # CONFIG_ARCH_MULTI_V4 is not set
 # CONFIG_ARCH_MULTI_V4T is not set
 CONFIG_ARCH_MULTI_V4_V5=y
 CONFIG_ARCH_MULTI_V5=y
-CONFIG_ARCH_MULTIPLATFORM=y
-CONFIG_ARCH_MULTI_CPU_AUTO=y
 CONFIG_ARCH_NR_GPIO=416
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_ARCH_32BIT_OFF_T=y
-CONFIG_ARCH_HAS_BINFMT_FLAT=y
-CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y
 CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
 CONFIG_COMPAT_32BIT_TIME=y
-# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 # CONFIG_CPU_CACHE_ROUND_ROBIN is not set
-CONFIG_MACH_SUNIV=y
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 # CONFIG_MACH_SUN4I is not set
 # CONFIG_MACH_SUN5I is not set
 # CONFIG_MACH_SUN6I is not set
 # CONFIG_MACH_SUN7I is not set
 # CONFIG_MACH_SUN8I is not set
 # CONFIG_MACH_SUN9I is not set
+CONFIG_MACH_SUNIV=y
 CONFIG_MDIO_BUS_MUX=y
 CONFIG_MTD_SPI_NAND=y
 CONFIG_MUSB_PIO_ONLY=y
@@ -51,6 +51,6 @@ CONFIG_PINCTRL_SUNIV_F1C100S=y
 CONFIG_PINCTRL_SUNXI=y
 CONFIG_SUNIV_F1C100S_CCU=y
 CONFIG_UNWINDER_ARM=y
-CONFIG_USB_MUSB_HDRC=y
 CONFIG_USB_MUSB_DUAL_ROLE=y
+CONFIG_USB_MUSB_HDRC=y
 CONFIG_USB_MUSB_SUNXI=y

diff --git a/target/linux/sunxi/cortexa8/config-6.12 b/target/linux/sunxi/cortexa8/config-6.12
index dbf26947ab838ef881fac3c74c943d616eb34020..715d3406406428a3dcea3b875dbcfab44d5737d5 100644 (file)
--- a/target/linux/sunxi/cortexa8/config-6.12
+++ b/target/linux/sunxi/cortexa8/config-6.12
@@ -8,10 +8,10 @@ CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 # CONFIG_MACH_SUN8I is not set
 # CONFIG_MACH_SUN9I is not set
 CONFIG_PGTABLE_LEVELS=2
+# CONFIG_PHY_SUN9I_USB is not set
 CONFIG_PINCTRL_AXP209=y
 CONFIG_PINCTRL_SUN4I_A10=y
 CONFIG_PINCTRL_SUN5I=y
-# CONFIG_PHY_SUN9I_USB is not set
 # CONFIG_SPI_SUN6I is not set
 # CONFIG_SUN8I_A83T_CCU is not set
 # CONFIG_SUN8I_THERMAL is not set