aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2016-11-15 20:31:15 +0100
committerMatthias Schiffer <mschiffer@universe-factory.net>2016-11-16 01:48:19 +0100
commitfe6a3415e091850506a4fa5a8ef6d86148934c64 (patch)
tree47027790d441f3b47dabf4eea653d236d8ad397f /target/linux
parent5247ac2f805e39afe2e6e30980e439ea8b8ae7f8 (diff)
downloadupstream-fe6a3415e091850506a4fa5a8ef6d86148934c64.tar.gz
upstream-fe6a3415e091850506a4fa5a8ef6d86148934c64.tar.bz2
upstream-fe6a3415e091850506a4fa5a8ef6d86148934c64.zip
x86: refresh generic subtarget config
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/x86/generic/config-default6
1 files changed, 2 insertions, 4 deletions
diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default
index 8694a59f5c..e94becb782 100644
--- a/target/linux/x86/generic/config-default
+++ b/target/linux/x86/generic/config-default
@@ -224,7 +224,6 @@ CONFIG_MPENTIUM4=y
CONFIG_MUTEX_SPIN_ON_OWNER=y
CONFIG_NEED_DMA_MAP_STATE=y
CONFIG_NET_FLOW_LIMIT=y
-CONFIG_NLS=y
CONFIG_NO_HZ=y
CONFIG_NR_CPUS=4
CONFIG_PARAVIRT=y
@@ -234,7 +233,6 @@ CONFIG_PARAVIRT_SPINLOCKS=y
# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
CONFIG_PCIEAER=y
CONFIG_PCIEPORTBUS=y
-CONFIG_PCI_LABEL=y
CONFIG_PCI_MMCONFIG=y
# CONFIG_PCWATCHDOG is not set
CONFIG_PGTABLE_LEVELS=3
@@ -307,10 +305,9 @@ CONFIG_VIRTUALIZATION=y
CONFIG_X86_32_SMP=y
CONFIG_X86_ACPI_CPUFREQ=y
# CONFIG_X86_ACPI_CPUFREQ_CPB is not set
-# CONFIG_X86_POWERNOW_K8 is not set
+CONFIG_X86_AMD_FREQ_SENSITIVITY=y
# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
# CONFIG_X86_BIGSMP is not set
-CONFIG_X86_AMD_FREQ_SENSITIVITY=y
CONFIG_X86_CMOV=y
CONFIG_X86_CMPXCHG64=y
CONFIG_X86_DEBUGCTLMSR=y
@@ -326,6 +323,7 @@ CONFIG_X86_PAE=y
# CONFIG_X86_PCC_CPUFREQ is not set
# CONFIG_X86_PMEM_LEGACY is not set
CONFIG_X86_PM_TIMER=y
+# CONFIG_X86_POWERNOW_K8 is not set
CONFIG_X86_TSC=y
CONFIG_X86_USE_PPRO_CHECKSUM=y
CONFIG_XPS=y