x86: move common kconfig symbols into target shared config

These kernel config symbols are selected by all sub-targets. We
can merge them together to simplify the config files.

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/18632
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/target/linux/x86/64/config-6.12 b/target/linux/x86/64/config-6.12
index 6eefef2a94c9545936ac7023e6a32053a41f11a1..bb28d596a37dfe3e5bdb4ef94a1c583c13001eaf 100644 (file)
--- a/target/linux/x86/64/config-6.12
+++ b/target/linux/x86/64/config-6.12
@@ -242,7 +242,6 @@ CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
 CONFIG_HVC_XEN_FRONTEND=y
-CONFIG_HWMON=y
 CONFIG_HWMON_VID=y
 CONFIG_HW_RANDOM_AMD=y
 CONFIG_HW_RANDOM_INTEL=y
@@ -259,10 +258,7 @@ CONFIG_HYPERV_TIMER=y
 CONFIG_HYPERV_UTILS=y
 # CONFIG_HYPERV_VSOCKETS is not set
 # CONFIG_HYPERV_VTL_MODE is not set
-CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_AMD_MP2 is not set
-CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_ZHAOXIN is not set
 # CONFIG_IA32_EMULATION is not set
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
@@ -307,8 +303,6 @@ CONFIG_IOMMU_IO_PGTABLE=y
 CONFIG_IOMMU_MM_DATA=y
 CONFIG_IOMMU_SUPPORT=y
 CONFIG_IOMMU_SVA=y
-CONFIG_IOSF_MBI=y
-# CONFIG_IOSF_MBI_DEBUG is not set
 CONFIG_IRQ_MSI_IOMMU=y
 CONFIG_IRQ_REMAP=y
 # CONFIG_ISCSI_IBFT is not set
@@ -446,7 +440,6 @@ CONFIG_RELOCATABLE=y
 CONFIG_RESET_ATTACK_MITIGATION=y
 CONFIG_RFS_ACCEL=y
 CONFIG_RPS=y
-CONFIG_RTC_I2C_AND_SPI=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 # CONFIG_SAMSUNG_Q10 is not set
 CONFIG_SATA_AHCI=y
@@ -464,11 +457,9 @@ CONFIG_SENSORS_FAM15H_POWER=y
 CONFIG_SENSORS_I5500=y
 CONFIG_SENSORS_K10TEMP=y
 CONFIG_SENSORS_K8TEMP=y
-# CONFIG_SENSORS_LENOVO_EC is not set
 # CONFIG_SENSORS_OXP is not set
 CONFIG_SENSORS_VIA_CPUTEMP=y
 CONFIG_SERIAL_8250_PNP=y
-# CONFIG_SILICOM_PLATFORM is not set
 CONFIG_SMP=y
 CONFIG_SOCK_RX_QUEUE_MAPPING=y
 CONFIG_SPARSEMEM=y

diff --git a/target/linux/x86/config-6.12 b/target/linux/x86/config-6.12
index 6bcfdfd066ea2702ae1cfa83aeec8749564df50c..b3ef0a20a0cbd46703a31a19cfa18fc7f76b5e04 100644 (file)
--- a/target/linux/x86/config-6.12
+++ b/target/linux/x86/config-6.12
@@ -176,11 +176,15 @@ CONFIG_HIGHMEM4G=y
 CONFIG_HIGHPTE=y
 CONFIG_HPET_EMULATE_RTC=y
 CONFIG_HPET_TIMER=y
+CONFIG_HWMON=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_GEODE=y
 CONFIG_HW_RANDOM_VIA=y
 # CONFIG_HYPERVISOR_GUEST is not set
 CONFIG_HZ_PERIODIC=y
+CONFIG_I2C=y
+CONFIG_I2C_ALGOBIT=y
+CONFIG_I2C_BOARDINFO=y
 CONFIG_I8253_LOCK=y
 CONFIG_IA32_FEAT_CTL=y
 # CONFIG_IB700_WDT is not set
@@ -200,7 +204,8 @@ CONFIG_INSTRUCTION_DECODER=y
 # CONFIG_INTEL_SCU_PCI is not set
 # CONFIG_INTEL_TCC_COOLING is not set
 # CONFIG_INTEL_VSEC is not set
-# CONFIG_IOSF_MBI is not set
+CONFIG_IOSF_MBI=y
+# CONFIG_IOSF_MBI_DEBUG is not set
 CONFIG_IO_DELAY_0X80=y
 # CONFIG_IO_DELAY_0XED is not set
 # CONFIG_IO_DELAY_NONE is not set
@@ -345,6 +350,7 @@ CONFIG_RATIONAL=y
 CONFIG_RD_BZIP2=y
 CONFIG_RD_GZIP=y
 CONFIG_RTC_CLASS=y
+CONFIG_RTC_I2C_AND_SPI=y
 CONFIG_RTC_MC146818_LIB=y
 CONFIG_SATA_HOST=y
 # CONFIG_SBC7240_WDT is not set
@@ -358,6 +364,7 @@ CONFIG_SCx200=y
 CONFIG_SCx200HR_TIMER=y
 # CONFIG_SCx200_GPIO is not set
 # CONFIG_SCx200_WDT is not set
+# CONFIG_SENSORS_LENOVO_EC is not set
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PCILIB=y
 # CONFIG_SERIAL_LANTIQ is not set
@@ -368,6 +375,7 @@ CONFIG_SERIO_LIBPS2=y
 CONFIG_SERIO_SERPORT=y
 CONFIG_SG_POOL=y
 # CONFIG_SIEMENS_SIMATIC_IPC is not set
+# CONFIG_SILICOM_PLATFORM is not set
 # CONFIG_SMSC37B787_WDT is not set
 # CONFIG_SMSC_SCH311X_WDT is not set
 CONFIG_SOFTIRQ_ON_OWN_STACK=y

diff --git a/target/linux/x86/generic/config-6.12 b/target/linux/x86/generic/config-6.12
index d1260dbf5c1637c0149c7d9812d6647b713d007a..f5e83a8688201f43667eebde93810982e756b0d8 100644 (file)
--- a/target/linux/x86/generic/config-6.12
+++ b/target/linux/x86/generic/config-6.12
@@ -175,7 +175,6 @@ CONFIG_HVC_DRIVER=y
 CONFIG_HVC_IRQ=y
 CONFIG_HVC_XEN=y
 CONFIG_HVC_XEN_FRONTEND=y
-CONFIG_HWMON=y
 CONFIG_HWMON_VID=y
 CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_HYPERV=y
@@ -187,10 +186,7 @@ CONFIG_HYPERV_STORAGE=y
 # CONFIG_HYPERV_TESTING is not set
 CONFIG_HYPERV_TIMER=y
 CONFIG_HYPERV_UTILS=y
-CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_AMD_MP2 is not set
-CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_ZHAOXIN is not set
 # CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT is not set
 CONFIG_INPUT_MOUSE=y
@@ -209,8 +205,6 @@ CONFIG_INTEL_SOC_DTS_IOSF_CORE=y
 CONFIG_INTEL_SOC_DTS_THERMAL=y
 CONFIG_INTEL_TCC=y
 CONFIG_INTERVAL_TREE=y
-CONFIG_IOSF_MBI=y
-# CONFIG_IOSF_MBI_DEBUG is not set
 CONFIG_IRQ_BYPASS_MANAGER=y
 CONFIG_ISA=y
 CONFIG_ISAPNP=y
@@ -362,7 +356,6 @@ CONFIG_RELOCATABLE=y
 CONFIG_RESET_ATTACK_MITIGATION=y
 CONFIG_RFS_ACCEL=y
 CONFIG_RPS=y
-CONFIG_RTC_I2C_AND_SPI=y
 CONFIG_RWSEM_SPIN_ON_OWNER=y
 # CONFIG_SAMSUNG_Q10 is not set
 CONFIG_SATA_AHCI=y
@@ -380,11 +373,9 @@ CONFIG_SENSORS_FAM15H_POWER=y
 CONFIG_SENSORS_I5500=y
 CONFIG_SENSORS_K10TEMP=y
 CONFIG_SENSORS_K8TEMP=y
-# CONFIG_SENSORS_LENOVO_EC is not set
 # CONFIG_SENSORS_OXP is not set
 CONFIG_SENSORS_VIA_CPUTEMP=y
 CONFIG_SERIAL_8250_PNP=y
-# CONFIG_SILICOM_PLATFORM is not set
 CONFIG_SMP=y
 CONFIG_SOCK_RX_QUEUE_MAPPING=y
 CONFIG_SPLIT_PMD_PTLOCKS=y

diff --git a/target/linux/x86/geode/config-6.12 b/target/linux/x86/geode/config-6.12
index 994a5736c3a3e27d8f9676524fee21a484954aa4..731f1df756d0396a0ff97f3979c2c0cc4dab0164 100644 (file)
--- a/target/linux/x86/geode/config-6.12
+++ b/target/linux/x86/geode/config-6.12
@@ -57,20 +57,14 @@ CONFIG_GEOS=y
 CONFIG_GPIO_ACPI=y
 CONFIG_GPIO_CS5535=y
 # CONFIG_HPET is not set
-CONFIG_HWMON=y
-CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=y
 CONFIG_I2C_ALGOPCA=y
 CONFIG_I2C_ALGOPCF=y
 # CONFIG_I2C_AMD_MP2 is not set
-CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_ZHAOXIN is not set
 # CONFIG_INTEL_IPS is not set
 # CONFIG_INTEL_SAR_INT1092 is not set
 # CONFIG_INTEL_SCU_PLATFORM is not set
 # CONFIG_INTEL_SOC_DTS_THERMAL is not set
-CONFIG_IOSF_MBI=y
-# CONFIG_IOSF_MBI_DEBUG is not set
 CONFIG_ISA=y
 # CONFIG_ISAPNP is not set
 CONFIG_ISA_BUS_API=y
@@ -121,18 +115,15 @@ CONFIG_PNP=y
 CONFIG_PNPACPI=y
 # CONFIG_PNPBIOS is not set
 CONFIG_PNP_DEBUG_MESSAGES=y
-CONFIG_RTC_I2C_AND_SPI=y
 # CONFIG_SAMSUNG_Q10 is not set
 CONFIG_SC1200_WDT=y
 # CONFIG_SCSI_FDOMAIN_ISA is not set
 CONFIG_SCx200_ACB=y
 CONFIG_SCx200_WDT=y
 # CONFIG_SENSORS_ASUS_EC is not set
-# CONFIG_SENSORS_LENOVO_EC is not set
 CONFIG_SENSORS_LM90=y
 # CONFIG_SENSORS_OXP is not set
 CONFIG_SERIAL_8250_PNP=y
-# CONFIG_SILICOM_PLATFORM is not set
 # CONFIG_TOSHIBA_BT_RFKILL is not set
 # CONFIG_USB_LJCA is not set
 # CONFIG_USB_UHCI_HCD is not set

diff --git a/target/linux/x86/legacy/config-6.12 b/target/linux/x86/legacy/config-6.12
index 018a898e266d589af37d1105e54d56d46665344a..927393f8e451ebd17585f98b8788f60ee766215c 100644 (file)
--- a/target/linux/x86/legacy/config-6.12
+++ b/target/linux/x86/legacy/config-6.12
@@ -112,11 +112,7 @@ CONFIG_HID_SUPPORT=y
 # CONFIG_HIGHMEM4G is not set
 CONFIG_HPET=y
 CONFIG_HPET_MMAP=y
-CONFIG_HWMON=y
-CONFIG_I2C=y
-CONFIG_I2C_ALGOBIT=y
 # CONFIG_I2C_AMD_MP2 is not set
-CONFIG_I2C_BOARDINFO=y
 # CONFIG_I2C_ZHAOXIN is not set
 CONFIG_INPUT_MOUSE=y
 CONFIG_INPUT_MOUSEDEV=y
@@ -130,8 +126,6 @@ CONFIG_INTEL_IDLE=y
 # CONFIG_INTEL_SCU_PLATFORM is not set
 # CONFIG_INTEL_SOC_DTS_THERMAL is not set
 CONFIG_INTERVAL_TREE=y
-CONFIG_IOSF_MBI=y
-# CONFIG_IOSF_MBI_DEBUG is not set
 CONFIG_ISA=y
 CONFIG_ISAPNP=y
 CONFIG_ISA_BUS_API=y
@@ -193,15 +187,12 @@ CONFIG_PNPACPI=y
 CONFIG_PNP_DEBUG_MESSAGES=y
 CONFIG_RAS=y
 CONFIG_RELAY=y
-CONFIG_RTC_I2C_AND_SPI=y
 # CONFIG_SAMSUNG_Q10 is not set
 CONFIG_SATA_AHCI=y
 # CONFIG_SCSI_FDOMAIN_ISA is not set
 # CONFIG_SENSORS_ASUS_EC is not set
-# CONFIG_SENSORS_LENOVO_EC is not set
 # CONFIG_SENSORS_OXP is not set
 CONFIG_SERIAL_8250_PNP=y
-# CONFIG_SILICOM_PLATFORM is not set
 CONFIG_SYNC_FILE=y
 # CONFIG_SYSTEM76_ACPI is not set
 # CONFIG_TOSHIBA_BT_RFKILL is not set