x86: refresh configuration

Just refresh the kernel configuration, some options are removed because
they are now in the generic kernel configuration.

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

diff --git a/target/linux/x86/64/config-default b/target/linux/x86/64/config-default
index 7fcce94bf839b685d7311e62fc097962b51f18af..b6fee8b043fba7fbc722bf8cce6889261583009e 100644 (file)
--- a/target/linux/x86/64/config-default
+++ b/target/linux/x86/64/config-default
@@ -17,7 +17,6 @@ CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_HOTPLUG_IOAPIC=y
 # CONFIG_ACPI_I2C_OPREGION is not set
 CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
-# CONFIG_ACPI_NFIT is not set
 # CONFIG_ACPI_PCI_SLOT is not set
 CONFIG_ACPI_PROCESSOR=y
 # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
@@ -141,8 +140,6 @@ CONFIG_GENERIC_PENDING_IRQ=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIOLIB_IRQCHIP=y
 CONFIG_GPIO_ACPI=y
-# CONFIG_GPIO_AMDPT is not set
-# CONFIG_GPIO_F7188X is not set
 CONFIG_GPIO_ICH=y
 CONFIG_GPIO_IT87=y
 CONFIG_GPIO_LYNXPOINT=y
@@ -276,9 +273,12 @@ CONFIG_QUEUED_SPINLOCKS=y
 # CONFIG_RANDOMIZE_BASE is not set
 CONFIG_RAS=y
 CONFIG_RCU_STALL_COMMON=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
 CONFIG_RELOCATABLE=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

diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default
index 51d835cc1f4c46aded5f9a69c7e972bc439ff8c9..f9893f4c114629e3db42466cb7688847576c79ae 100644 (file)
--- a/target/linux/x86/generic/config-default
+++ b/target/linux/x86/generic/config-default
@@ -17,7 +17,6 @@ CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_HOTPLUG_IOAPIC=y
 # CONFIG_ACPI_I2C_OPREGION is not set
 CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
-# CONFIG_ACPI_NFIT is not set
 # CONFIG_ACPI_PCI_SLOT is not set
 CONFIG_ACPI_PROCESSOR=y
 # CONFIG_ACPI_PROCESSOR_AGGREGATOR is not set
@@ -137,12 +136,6 @@ CONFIG_GPIOLIB_IRQCHIP=y
 # CONFIG_GPIO_104_IDIO_16 is not set
 # CONFIG_GPIO_104_IDI_48 is not set
 CONFIG_GPIO_ACPI=y
-# CONFIG_GPIO_AMDPT is not set
-# CONFIG_GPIO_F7188X is not set
-# CONFIG_GPIO_GPIO_MM is not set
-# CONFIG_GPIO_IT87 is not set
-# CONFIG_GPIO_LYNXPOINT is not set
-# CONFIG_GPIO_WS16C48 is not set
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
 CONFIG_HAVE_CLK=y

diff --git a/target/linux/x86/geode/config-default b/target/linux/x86/geode/config-default
index 69d31b00a516cbe49b177bcf4cafc2b7ff6b34db..daf397bdc0cd630eae5eb393c9ec2bbc6f85dd58 100644 (file)
--- a/target/linux/x86/geode/config-default
+++ b/target/linux/x86/geode/config-default
@@ -49,14 +49,8 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_104_IDIO_16 is not set
 # CONFIG_GPIO_104_IDI_48 is not set
 CONFIG_GPIO_ACPI=y
-# CONFIG_GPIO_AMDPT is not set
 CONFIG_GPIO_CS5535=y
-# CONFIG_GPIO_F7188X is not set
-# CONFIG_GPIO_GPIO_MM is not set
-# CONFIG_GPIO_IT87 is not set
-# CONFIG_GPIO_LYNXPOINT is not set
 CONFIG_GPIO_SYSFS=y
-# CONFIG_GPIO_WS16C48 is not set
 CONFIG_HAVE_ACPI_APEI=y
 CONFIG_HAVE_ACPI_APEI_NMI=y
 CONFIG_HIGHMEM4G=y