aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2017-11-26 11:24:11 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2017-12-16 22:11:05 +0100
commita362df6f253e4460504fd870d6a7af40ef86ad70 (patch)
tree8ad8c8717c11ef896957d57e0854b8723e609631
parent0402c48cbad0408fc6d70babe363afa102a628f9 (diff)
downloadupstream-a362df6f253e4460504fd870d6a7af40ef86ad70.tar.gz
upstream-a362df6f253e4460504fd870d6a7af40ef86ad70.tar.bz2
upstream-a362df6f253e4460504fd870d6a7af40ef86ad70.zip
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>
-rw-r--r--target/linux/x86/64/config-default6
-rw-r--r--target/linux/x86/generic/config-default7
-rw-r--r--target/linux/x86/geode/config-default6
3 files changed, 3 insertions, 16 deletions
diff --git a/target/linux/x86/64/config-default b/target/linux/x86/64/config-default
index 7fcce94bf8..b6fee8b043 100644
--- 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 51d835cc1f..f9893f4c11 100644
--- 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 69d31b00a5..daf397bdc0 100644
--- 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