From: Michael Tremer Date: Sat, 29 Dec 2018 12:45:52 +0000 (+0000) Subject: kernel: Update power management settings X-Git-Url: http://git.ipfire.org/?p=ipfire-3.x.git;a=commitdiff_plain;h=569d6b67126c5c5dcb8437a9b7b166bc24c38ab5 kernel: Update power management settings Build as many things as a module as possible and disable CONFIG_SUSPEND Signed-off-by: Michael Tremer --- diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic index 3ac848afa..b44975a4c 100644 --- a/kernel/config-arm32-generic +++ b/kernel/config-arm32-generic @@ -108,7 +108,6 @@ CONFIG_SOC_EXYNOS5410=y CONFIG_SOC_EXYNOS5420=y CONFIG_SOC_EXYNOS5800=y # CONFIG_EXYNOS5420_MCPM is not set -CONFIG_EXYNOS_CPU_SUSPEND=y CONFIG_PLAT_SAMSUNG=y # diff --git a/kernel/config-arm64-generic b/kernel/config-arm64-generic index 2fd520554..2316e9903 100644 --- a/kernel/config-arm64-generic +++ b/kernel/config-arm64-generic @@ -211,7 +211,6 @@ CONFIG_ACPI_SPCR_TABLE=y # CONFIG_ACPI_EC_DEBUGFS is not set CONFIG_ACPI_BUTTON=m CONFIG_ACPI_FAN=m -CONFIG_ACPI_TAD=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_PROCESSOR_IDLE=y CONFIG_ACPI_MCFG=y diff --git a/kernel/config-generic b/kernel/config-generic index d19f66a87..497f3d2f1 100644 --- a/kernel/config-generic +++ b/kernel/config-generic @@ -219,26 +219,18 @@ CONFIG_SECCOMP=y # CONFIG_HZ_250 is not set # CONFIG_HZ_1000 is not set CONFIG_SCHED_HRTICK=y -# CONFIG_KEXEC is not set CONFIG_HOTPLUG_CPU=y # # Power management and ACPI options # -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -# CONFIG_SUSPEND_SKIP_SYNC is not set +# CONFIG_SUSPEND is not set # CONFIG_HIBERNATION is not set -CONFIG_PM_SLEEP=y -CONFIG_PM_SLEEP_SMP=y -# CONFIG_PM_AUTOSLEEP is not set -# CONFIG_PM_WAKELOCKS is not set CONFIG_PM=y # CONFIG_PM_DEBUG is not set CONFIG_PM_CLK=y CONFIG_PM_GENERIC_DOMAINS=y # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set -CONFIG_PM_GENERIC_DOMAINS_SLEEP=y CONFIG_PM_GENERIC_DOMAINS_OF=y # @@ -254,7 +246,7 @@ CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=m CONFIG_CPU_FREQ_GOV_POWERSAVE=m CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=m @@ -2473,7 +2465,6 @@ CONFIG_TTY=y CONFIG_VT=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_VT_CONSOLE=y -CONFIG_VT_CONSOLE_SLEEP=y CONFIG_HW_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_UNIX98_PTYS=y diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic index 8d150e1f7..6352d4215 100644 --- a/kernel/config-x86-generic +++ b/kernel/config-x86-generic @@ -186,6 +186,7 @@ CONFIG_EFI_STUB=y # CONFIG_HZ_100 is not set CONFIG_HZ_300=y CONFIG_HZ=300 +# CONFIG_KEXEC is not set # CONFIG_KEXEC_FILE is not set CONFIG_CRASH_DUMP=y CONFIG_PHYSICAL_START=0x1000000 @@ -214,6 +215,11 @@ CONFIG_ARCH_ENABLE_THP_MIGRATION=y # Power management and ACPI options # CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set +CONFIG_PM_GENERIC_DOMAINS_SLEEP=y CONFIG_ARCH_SUPPORTS_ACPI=y CONFIG_ACPI=y CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y @@ -222,15 +228,14 @@ CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y # CONFIG_ACPI_DEBUGGER is not set CONFIG_ACPI_SPCR_TABLE=y CONFIG_ACPI_LPIT=y -CONFIG_ACPI_SLEEP=y # CONFIG_ACPI_PROCFS_POWER is not set CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y # CONFIG_ACPI_EC_DEBUGFS is not set -CONFIG_ACPI_AC=y -CONFIG_ACPI_BATTERY=y -CONFIG_ACPI_BUTTON=y +CONFIG_ACPI_AC=m +CONFIG_ACPI_BATTERY=m +CONFIG_ACPI_BUTTON=m CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=y +CONFIG_ACPI_FAN=m CONFIG_ACPI_TAD=m CONFIG_ACPI_DOCK=y CONFIG_ACPI_CPU_FREQ_PSS=y @@ -274,10 +279,10 @@ CONFIG_SFI=y # CPU frequency scaling drivers # CONFIG_X86_INTEL_PSTATE=y -CONFIG_X86_PCC_CPUFREQ=y -CONFIG_X86_ACPI_CPUFREQ=y +CONFIG_X86_PCC_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ=m # CONFIG_X86_ACPI_CPUFREQ_CPB is not set -CONFIG_X86_POWERNOW_K8=y +CONFIG_X86_POWERNOW_K8=m # CONFIG_X86_AMD_FREQ_SENSITIVITY is not set # CONFIG_X86_SPEEDSTEP_CENTRINO is not set CONFIG_X86_P4_CLOCKMOD=y @@ -726,6 +731,7 @@ CONFIG_SERIO_I8042=y # # Character devices # +CONFIG_VT_CONSOLE_SLEEP=y CONFIG_ROCKETPORT=m CONFIG_CYCLADES=m # CONFIG_CYZ_INTR is not set diff --git a/kernel/kernel.nm b/kernel/kernel.nm index 0819e104f..5221eb366 100644 --- a/kernel/kernel.nm +++ b/kernel/kernel.nm @@ -5,7 +5,7 @@ name = kernel version = 4.19.12 -release = 4 +release = 5 thisapp = linux-%{version} maintainer = Arne Fitzenreiter