kernel: reorder kernel symbol configs

Sort kernel configuration files alphabetically. Also resolve the
"CONFIG_ARM_PAN" conflict introduced in commit
057a0a075edc ("generic: Fix up the v6.12 config for ARM"). Based on
the original PR comment[1], this symbol should be disabled by default.

[1] https://github.com/openwrt/openwrt/pull/18900#discussion_r2106253528
Signed-off-by: Shiji Yang <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/18947
Signed-off-by: Hauke Mehrtens <[email protected]>

diff --git a/target/linux/bcm27xx/config-6.12 b/target/linux/bcm27xx/config-6.12
index d6e576cca7f50a930d9d76203b9caf7a83964277..157d532caead645393d870d85d178ae4e04274d7 100644 (file)
--- a/target/linux/bcm27xx/config-6.12
+++ b/target/linux/bcm27xx/config-6.12
@@ -4,8 +4,8 @@
 # CONFIG_COMMON_CLK_RP1_SDIO is not set
 # CONFIG_COMMON_CLK_RP1_SDIO  is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9805 is not set
-# CONFIG_DRM_PANEL_ILITEK_ILI9806E_SPI is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9806E is not set
+# CONFIG_DRM_PANEL_ILITEK_ILI9806E_SPI is not set
 # CONFIG_DRM_PANEL_ILITEK_ILI9882T is not set
 # CONFIG_DRM_PANEL_TPO_Y17P is not set
 # CONFIG_DRM_PANEL_WAVESHARE_TOUCHSCREEN is not set

diff --git a/target/linux/generic/config-6.12 b/target/linux/generic/config-6.12
index db70f392205c1a888b90af64d759c6151a61682d..594c0165281fbbe37f6c9aa9373591a2f360e306 100644 (file)
--- a/target/linux/generic/config-6.12
+++ b/target/linux/generic/config-6.12
@@ -436,9 +436,8 @@ CONFIG_ARM_GIC_MAX_NR=1
 # CONFIG_ARM_MHU is not set
 CONFIG_ARM_MODULE_PLTS=y
 # CONFIG_ARM_NI is not set
-CONFIG_ARM_PAN=y
-# CONFIG_ARM_PATCH_PHYS_VIRT is not set
 # CONFIG_ARM_PAN is not set
+# CONFIG_ARM_PATCH_PHYS_VIRT is not set
 # CONFIG_ARM_PSCI is not set
 # CONFIG_ARM_PSCI_CHECKER is not set
 # CONFIG_ARM_PSCI_CPUIDLE is not set
@@ -1951,6 +1950,7 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 # CONFIG_FAT_FS is not set
 # CONFIG_FAULT_INJECTION is not set
 # CONFIG_FB is not set
+# CONFIG_FBNIC is not set
 # CONFIG_FB_3DFX is not set
 # CONFIG_FB_ARC is not set
 # CONFIG_FB_ARK is not set
@@ -2054,7 +2054,6 @@ CONFIG_FB_NOTIFY=y
 # CONFIG_FB_VIRTUAL is not set
 # CONFIG_FB_VOODOO1 is not set
 # CONFIG_FB_VT8623 is not set
-# CONFIG_FBNIC is not set
 # CONFIG_FCOE is not set
 # CONFIG_FCOE_FNIC is not set
 # CONFIG_FDDI is not set

diff --git a/target/linux/mediatek/filogic/config-6.12 b/target/linux/mediatek/filogic/config-6.12
index 0335600ce617c85923d5165af5e5464fd705b9b2..6fa53b7b8492e4257a4e3de4e5eded587f75e3d3 100644 (file)
--- a/target/linux/mediatek/filogic/config-6.12
+++ b/target/linux/mediatek/filogic/config-6.12
@@ -40,8 +40,8 @@ CONFIG_ARM_GIC=y
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3=y
 CONFIG_ARM_GIC_V3_ITS=y
-CONFIG_ARM_MEDIATEK_CPUFREQ=y
 CONFIG_ARM_MEDIATEK_CCI_DEVFREQ=y
+CONFIG_ARM_MEDIATEK_CPUFREQ=y
 CONFIG_ARM_PMU=y
 CONFIG_ARM_PMUV3=y
 CONFIG_ARM_PSCI_FW=y

diff --git a/target/linux/octeon/config-6.6 b/target/linux/octeon/config-6.6
index d0821b755cf673848a8941d2e5fc3c7d7f395ee5..1b4142d2b8f56d05bc75904eb8b83842d0eac144 100644 (file)
--- a/target/linux/octeon/config-6.6
+++ b/target/linux/octeon/config-6.6
@@ -216,9 +216,9 @@ CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
 CONFIG_RANDSTRUCT_NONE=y
 CONFIG_RAS=y
-CONFIG_REGULATOR=y
 CONFIG_REGMAP=y
 CONFIG_REGMAP_I2C=y
+CONFIG_REGULATOR=y
 CONFIG_RELAY=y
 CONFIG_RFS_ACCEL=y
 CONFIG_RPS=y

diff --git a/target/linux/qualcommbe/ipq95xx/config-default b/target/linux/qualcommbe/ipq95xx/config-default
index 3ac8eaf23c2ae6c307b124a54703b583188e5771..c53a35b29670ea15197e431e1e134d2f1dd3a7a7 100644 (file)
--- a/target/linux/qualcommbe/ipq95xx/config-default
+++ b/target/linux/qualcommbe/ipq95xx/config-default
@@ -2,11 +2,24 @@ CONFIG_AQUANTIA_PHY=y
 CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y
 CONFIG_DT_IDLE_GENPD=y
 CONFIG_GRO_CELLS=y
+CONFIG_INTERCONNECT_QCOM=y
+# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
+# CONFIG_INTERCONNECT_QCOM_MSM8939 is not set
+# CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
+# CONFIG_INTERCONNECT_QCOM_MSM8996 is not set
+CONFIG_INTERCONNECT_QCOM_OSM_L3=y
+# CONFIG_INTERCONNECT_QCOM_QCM2290 is not set
+# CONFIG_INTERCONNECT_QCOM_QCS404 is not set
+# CONFIG_INTERCONNECT_QCOM_SDM660 is not set
+CONFIG_IPQ_CMN_PLL=y
 CONFIG_IPQ_GCC_9574=y
+CONFIG_IPQ_NSSCC_9574=y
+CONFIG_IPQ_NSSCC_QCA8K=y
 CONFIG_MDIO_BITBANG=y
 CONFIG_MDIO_GPIO=y
 # CONFIG_MFD_HI6421_SPMI is not set
 CONFIG_MFD_SPMI_PMIC=y
+CONFIG_MTD_SPI_NAND=y
 CONFIG_NET_DEVLINK=y
 CONFIG_NET_DSA=y
 CONFIG_NET_DSA_QCA8K=y
@@ -21,8 +34,12 @@ CONFIG_PM_GENERIC_DOMAINS_OF=y
 # CONFIG_POWER_RESET_QCOM_PON is not set
 CONFIG_QCA83XX_PHY=y
 CONFIG_QCOM_APM=y
+# CONFIG_QCOM_CLK_SMD_RPM is not set
 # CONFIG_QCOM_COINCELL is not set
 CONFIG_QCOM_GDSC=y
+CONFIG_QCOM_PPE=y
+# CONFIG_QCOM_RPMPD is not set
+CONFIG_QCOM_SMD_RPM=y
 CONFIG_QCOM_SPMI_ADC5=y
 # CONFIG_QCOM_SPMI_RRADC is not set
 CONFIG_QCOM_VADC_COMMON=y
@@ -31,30 +48,13 @@ CONFIG_REGULATOR_CPR3=y
 # CONFIG_REGULATOR_CPR3_NPU is not set
 CONFIG_REGULATOR_CPR4_APSS=y
 # CONFIG_REGULATOR_QCOM_LABIBB is not set
+CONFIG_REGULATOR_QCOM_SMD_RPM=y
 CONFIG_REGULATOR_QCOM_SPMI=y
 # CONFIG_REGULATOR_QCOM_USB_VBUS is not set
 CONFIG_REGULATOR_USERSPACE_CONSUMER=y
 CONFIG_RTC_DRV_PM8XXX=y
+CONFIG_SPI_QPIC_SNAND=y
 CONFIG_SPMI=y
 # CONFIG_SPMI_HISI3670 is not set
 CONFIG_SPMI_MSM_PMIC_ARB=y
 # CONFIG_SPMI_PMIC_CLKDIV is not set
-CONFIG_SPI_QPIC_SNAND=y
-CONFIG_IPQ_CMN_PLL=y
-CONFIG_IPQ_NSSCC_9574=y
-CONFIG_IPQ_NSSCC_QCA8K=y
-CONFIG_QCOM_PPE=y
-CONFIG_INTERCONNECT_QCOM=y
-CONFIG_INTERCONNECT_QCOM_OSM_L3=y
-CONFIG_MTD_SPI_NAND=y
-CONFIG_QCOM_SMD_RPM=y
-CONFIG_REGULATOR_QCOM_SMD_RPM=y
-# CONFIG_QCOM_CLK_SMD_RPM is not set
-# CONFIG_QCOM_RPMPD is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8916 is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8939 is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8996 is not set
-# CONFIG_INTERCONNECT_QCOM_MSM8974 is not set
-# CONFIG_INTERCONNECT_QCOM_QCM2290 is not set
-# CONFIG_INTERCONNECT_QCOM_QCS404 is not set
-# CONFIG_INTERCONNECT_QCOM_SDM660 is not set

diff --git a/target/linux/realtek/rtl838x/config-6.6 b/target/linux/realtek/rtl838x/config-6.6
index a9d406f98d5d57488881672abd8c9d40a3122be4..dd9a61a261b155b266d88a1af9d6ccb7e01ab8b0 100644 (file)
--- a/target/linux/realtek/rtl838x/config-6.6
+++ b/target/linux/realtek/rtl838x/config-6.6
@@ -239,8 +239,8 @@ CONFIG_SYS_SUPPORTS_HIGHMEM=y
 CONFIG_SYS_SUPPORTS_MIPS16=y
 CONFIG_TARGET_ISA_REV=2
 CONFIG_THERMAL=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_GOV_STEP_WISE=y

diff --git a/target/linux/realtek/rtl930x/config-6.6 b/target/linux/realtek/rtl930x/config-6.6
index 772240e4fc97c34b5d2e67ac62e7e62b3963987f..c01fa172f47ff741c766f5c3211f04b92b4652ce 100644 (file)
--- a/target/linux/realtek/rtl930x/config-6.6
+++ b/target/linux/realtek/rtl930x/config-6.6
@@ -218,8 +218,8 @@ CONFIG_SYS_SUPPORTS_MIPS16=y
 CONFIG_SYS_SUPPORTS_MULTITHREADING=y
 CONFIG_TARGET_ISA_REV=2
 CONFIG_THERMAL=y
-CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
 # CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
 CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
 CONFIG_THERMAL_GOV_STEP_WISE=y

diff --git a/target/linux/x86/64/config-6.12 b/target/linux/x86/64/config-6.12
index 5ab986a2924351ec7ebf6ef92a16a0f1fdcb5c82..c55d5465acf2adf1b30464bc24a41e1a5ab20282 100644 (file)
--- a/target/linux/x86/64/config-6.12
+++ b/target/linux/x86/64/config-6.12
@@ -82,11 +82,11 @@ CONFIG_CDROM=y
 CONFIG_CONNECTOR=y
 CONFIG_CONTEXT_TRACKING=y
 CONFIG_CONTEXT_TRACKING_IDLE=y
+# CONFIG_CPUSETS_V1 is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPU_IDLE_GOV_HALTPOLL=y
 CONFIG_CPU_RMAP=y
-# CONFIG_CPUSETS_V1 is not set
 CONFIG_CRASH_HOTPLUG=y
 CONFIG_CRASH_MAX_MEMORY_RANGES=8192
 CONFIG_CRC64=y
@@ -187,7 +187,6 @@ CONFIG_FB_CORE=y
 CONFIG_FB_DEFERRED_IO=y
 CONFIG_FB_DEVICE=y
 CONFIG_FB_EFI=y
-# CONFIG_HUAWEI_WMI is not set
 CONFIG_FB_HYPERV=y
 CONFIG_FB_IOMEM_FOPS=y
 CONFIG_FB_IOMEM_HELPERS=y
@@ -254,6 +253,7 @@ CONFIG_HOTPLUG_SMT=y
 CONFIG_HOTPLUG_SPLIT_STARTUP=y
 CONFIG_HPET=y
 CONFIG_HPET_MMAP=y
+# CONFIG_HUAWEI_WMI is not set
 CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
@@ -335,8 +335,8 @@ CONFIG_IRQ_REMAP=y
 CONFIG_ISO9660_FS=y
 CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
 CONFIG_KCMP=y
-CONFIG_KVM_HYPERV=y
 CONFIG_KVM_GUEST=y
+CONFIG_KVM_HYPERV=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEGACY_VSYSCALL_NONE=y
 # CONFIG_LEGACY_VSYSCALL_XONLY is not set
@@ -370,13 +370,13 @@ CONFIG_MMC_SDHCI_PCI=y
 # CONFIG_MMC_SDHCI_PLTFM is not set
 # CONFIG_MMC_WBSD is not set
 CONFIG_MMU_NOTIFIER=y
-# CONFIG_MXM_WMI is not set
 CONFIG_MODULES_USE_ELF_RELA=y
 # CONFIG_MPSC is not set
 # CONFIG_MSI_EC is not set
 # CONFIG_MSI_WMI is not set
 # CONFIG_MSI_WMI_PLATFORM is not set
 CONFIG_MUTEX_SPIN_ON_OWNER=y
+# CONFIG_MXM_WMI is not set
 CONFIG_ND_CLAIM=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_FLAGS=y
@@ -515,8 +515,8 @@ CONFIG_SMP=y
 # CONFIG_SND_HDA_SCODEC_CS35L56_I2C is not set
 # CONFIG_SND_HDA_SCODEC_CS35L56_SPI is not set
 # CONFIG_SND_HDA_SCODEC_TAS2781_I2C is not set
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_ACP6x is not set
+# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_RPL_ACP6x is not set
 # CONFIG_SND_SOC_INTEL_AVS is not set
 CONFIG_SOCK_RX_QUEUE_MAPPING=y
@@ -552,8 +552,8 @@ CONFIG_USB_HIDDEV=y
 CONFIG_USB_STORAGE=y
 CONFIG_VDSO_GETRANDOM=y
 CONFIG_VIDEO=y
-# CONFIG_VIDEO_IPU3_CIO2 is not set
 # CONFIG_VIDEO_INTEL_IPU6 is not set
+# CONFIG_VIDEO_IPU3_CIO2 is not set
 CONFIG_VIRTIO=y
 CONFIG_VIRTIO_ANCHOR=y
 CONFIG_VIRTIO_BALLOON=y

diff --git a/target/linux/x86/config-6.12 b/target/linux/x86/config-6.12
index 4418db541d3571c9e965caf2402ca2764acd0765..7a72dd25779ffe266764fb11222bbcae3c69e5b6 100644 (file)
--- a/target/linux/x86/config-6.12
+++ b/target/linux/x86/config-6.12
@@ -106,10 +106,10 @@ CONFIG_DMIID=y
 CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
 CONFIG_DMI_SYSFS=y
 CONFIG_DNOTIFY=y
+# CONFIG_DP83TG720_PHY is not set
 CONFIG_DRM_ACCEL=y
 # CONFIG_DRM_I915_GVT_KVMGT is not set
 CONFIG_DUMMY_CONSOLE=y
-# CONFIG_DP83TG720_PHY is not set
 # CONFIG_DWC_PCIE_PMU is not set
 CONFIG_DYNAMIC_SIGFRAME=y
 CONFIG_EARLY_PRINTK=y
@@ -256,8 +256,8 @@ CONFIG_MICROCODE_INITRD32=y
 CONFIG_MICROCODE_LATE_FORCE_MINREV=y
 CONFIG_MICROCODE_LATE_LOADING=y
 CONFIG_MIGRATION=y
-CONFIG_MITIGATION_ITS=y
 CONFIG_MITIGATION_GDS=y
+CONFIG_MITIGATION_ITS=y
 CONFIG_MITIGATION_L1TF=y
 CONFIG_MITIGATION_MDS=y
 CONFIG_MITIGATION_MMIO_STALE_DATA=y

diff --git a/target/linux/x86/generic/config-6.12 b/target/linux/x86/generic/config-6.12
index 1ad034cb180b47d6c87453ab0fb55f0f6d066220..a14888a211dd469cfa17a6805f499a51e5954d13 100644 (file)
--- a/target/linux/x86/generic/config-6.12
+++ b/target/linux/x86/generic/config-6.12
@@ -66,11 +66,11 @@ CONFIG_CDROM=y
 CONFIG_CONNECTOR=y
 CONFIG_CONTEXT_TRACKING=y
 CONFIG_CONTEXT_TRACKING_IDLE=y
+# CONFIG_CPUSETS_V1 is not set
 CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPU_IDLE_GOV_HALTPOLL=y
 CONFIG_CPU_RMAP=y
-# CONFIG_CPUSETS_V1 is not set
 CONFIG_CRASH_HOTPLUG=y
 CONFIG_CRASH_MAX_MEMORY_RANGES=8192
 # CONFIG_CS89x0_ISA is not set
@@ -86,9 +86,9 @@ CONFIG_DRM_BRIDGE=y
 CONFIG_DRM_FBDEV_EMULATION=y
 CONFIG_DRM_FBDEV_OVERALLOC=100
 CONFIG_DRM_GEM_SHMEM_HELPER=y
+# CONFIG_DRM_HYPERV is not set
 # CONFIG_DRM_I915_DEBUG_WAKEREF is not set
 # CONFIG_DRM_I915_REPLAY_GPU_HANGS_API is not set
-# CONFIG_DRM_HYPERV is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_BRIDGE=y
@@ -430,8 +430,8 @@ CONFIG_SMP=y
 # CONFIG_SND_HDA_SCODEC_CS35L56_I2C is not set
 # CONFIG_SND_HDA_SCODEC_CS35L56_SPI is not set
 # CONFIG_SND_HDA_SCODEC_TAS2781_I2C is not set
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_ACP6x is not set
+# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_RPL_ACP6x is not set
 # CONFIG_SND_SOC_INTEL_AVS is not set
 CONFIG_SOCK_RX_QUEUE_MAPPING=y

diff --git a/target/linux/x86/geode/config-6.12 b/target/linux/x86/geode/config-6.12
index ff884334f579d7d452391f3e16832b1d094f0371..55051dfed5c9ad26772eb16a7560a585e78c59b8 100644 (file)
--- a/target/linux/x86/geode/config-6.12
+++ b/target/linux/x86/geode/config-6.12
@@ -162,12 +162,12 @@ CONFIG_SENSORS_LM90=y
 CONFIG_SERIAL_8250_PNP=y
 # CONFIG_SERIAL_MULTI_INSTANTIATE is not set
 # CONFIG_SILICOM_PLATFORM is not set
-# CONFIG_SND_HDA_CTL_DEV_ID is not set
 # CONFIG_SND_HDA_CODEC_SENARYTECH is not set
+# CONFIG_SND_HDA_CTL_DEV_ID is not set
 # CONFIG_SND_HDA_SCODEC_CS35L56_I2C is not set
 # CONFIG_SND_HDA_SCODEC_CS35L56_SPI is not set
-# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_ACP6x is not set
+# CONFIG_SND_SOC_AMD_ACP_COMMON is not set
 # CONFIG_SND_SOC_AMD_RPL_ACP6x is not set
 # CONFIG_SND_SOC_INTEL_AVS is not set
 # CONFIG_THINKPAD_LMI is not set