summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2016-05-30 14:32:47 +0100
committerPeter Robinson <pbrobinson@gmail.com>2016-05-30 14:32:47 +0100
commit7d1f6548feef9b3d546a35e57f4b1d33424d3179 (patch)
tree291928a86bf0eb0744563c36c1de67a52ca5eb41
parent961d16042ce08757137bb74d154581f4ad673eda (diff)
downloadkernel-7d1f6548feef9b3d546a35e57f4b1d33424d3179.tar.gz
kernel-7d1f6548feef9b3d546a35e57f4b1d33424d3179.tar.xz
kernel-7d1f6548feef9b3d546a35e57f4b1d33424d3179.zip
Minor ARM cleanups
-rw-r--r--config-arm-generic8
-rw-r--r--config-armv7-generic14
-rw-r--r--kernel.spec1
3 files changed, 11 insertions, 12 deletions
diff --git a/config-arm-generic b/config-arm-generic
index 4d1705219..2697d71e6 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -191,8 +191,14 @@ CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
# CONFIG_EFI_BOOTLOADER_CONTROL is not set
# CONFIG_EFI_CAPSULE_LOADER is not set
-
# Power management / thermal / cpu scaling
+CONFIG_PM_OPP=y
+CONFIG_ARM_PSCI=y
+CONFIG_THERMAL=y
+CONFIG_CLOCK_THERMAL=y
+CONFIG_CPUFREQ_DT=m
+CONFIG_CPUFREQ_DT_PLATDEV=y
+CONFIG_DEVFREQ_THERMAL=y
# CONFIG_ARM_CPUIDLE is not set
# CONFIG_ARM_DT_BL_CPUFREQ is not set
# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index af1652c4a..21edda3a0 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -34,6 +34,7 @@ CONFIG_ARCH_HAS_TICK_BROADCAST=y
CONFIG_IRQ_CROSSBAR=y
CONFIG_IOMMU_IO_PGTABLE_LPAE=y
CONFIG_CPU_SW_DOMAIN_PAN=y
+CONFIG_ARM_CPU_SUSPEND=y
# CONFIG_MCPM is not set
# CONFIG_OABI_COMPAT is not set
@@ -142,17 +143,7 @@ CONFIG_SCHED_SMT=y
CONFIG_RCU_FANOUT=32
-CONFIG_CHECKPOINT_RESTORE=y
-
-# Power management / thermal / cpu scaling
-CONFIG_PM_OPP=y
-CONFIG_ARM_CPU_SUSPEND=y
-CONFIG_ARM_PSCI=y
-CONFIG_THERMAL=y
-CONFIG_CLOCK_THERMAL=y
-# CONFIG_DEVFREQ_THERMAL is not set
-CONFIG_CPUFREQ_DT=m
-# CONFIG_ARM_BIG_LITTLE_CPUFREQ is not set
+# Dynamic Voltage and Frequency Scaling
CONFIG_PM_DEVFREQ=y
CONFIG_PM_DEVFREQ_EVENT=y
CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
@@ -164,6 +155,7 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
CONFIG_LSM_MMAP_MIN_ADDR=32768
# CONFIG_PCI_LAYERSCAPE is not set
+
# Do NOT enable this, it breaks stuff and makes things go slow
# CONFIG_UACCESS_WITH_MEMCPY is not set
diff --git a/kernel.spec b/kernel.spec
index cb88fed7a..82d11993e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2135,6 +2135,7 @@ fi
%changelog
* Sat May 28 2016 Peter Robinson <pbrobinson@fedoraproject.org>
- Update Utilite patch
+- Minor ARM cleanups
* Fri May 27 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git10.1
- Linux v4.6-11010-gdc03c0f