[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 06b014b20404a2ee81e7a6c6a61646f0a197017a - IPFire-SCM

30 Dec 2018

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
       via  06b014b20404a2ee81e7a6c6a61646f0a197017a (commit)
       via  fc32b25fbe5b1c77f5804d43b9e01ee7a42d3e6e (commit)
       via  f55e2a21c45014acc599899915578df6395137dd (commit)
       via  fa4b3a6b1ecb03f49f8d53cc7e2ced0ce2df49dc (commit)
      from  29c70149e3a04f360d5f013ee58b11cd13018aca (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 06b014b20404a2ee81e7a6c6a61646f0a197017a
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Dec 30 14:28:53 2018 +0000
kernel: Configure cpufreq governor to performance
This patch also enabled all cpufreq drivers as modules
Fixes: #11373
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fc32b25fbe5b1c77f5804d43b9e01ee7a42d3e6e
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Dec 30 14:23:52 2018 +0000
kernel: Change ASPM policy to default
Fixes: #11372
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit f55e2a21c45014acc599899915578df6395137dd
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Dec 30 14:22:13 2018 +0000
kernel: Disable support for 6RD
Fixes: #11370
    Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit fa4b3a6b1ecb03f49f8d53cc7e2ced0ce2df49dc
Author: Michael Tremer michael.tremer@ipfire.org
Date:   Sun Dec 30 14:20:51 2018 +0000
kernel: configure: Pass arch as an extra argument
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes:
 kernel/README.md            | 12 +++++-------
 kernel/config-arm-generic   | 10 +++++++---
 kernel/config-arm32-generic | 17 +++++++++--------
 kernel/config-generic       | 12 +++++++-----
 kernel/config-x86-generic   |  6 ++----
 kernel/kernel.nm            |  2 +-
 kernel/scripts/configure    | 25 ++++++++++---------------
 7 files changed, 41 insertions(+), 43 deletions(-)
Difference in files:

diff --git a/kernel/README.md b/kernel/README.md
index 26a3f79a7..90083aaa4 100644
--- a/kernel/README.md
+++ b/kernel/README.md
@@ -17,7 +17,8 @@ the kernel directory:
   # pakfire-builder shell kernel.nm
   (pakfire-shell)> cd /usr/src/packages/kernel-x.y.z...
-The following commands are available:
+The following commands are available. Appending the <arch> argument allows you
+to edit a specific architecture. Default is x86_64.
#### oldconfig
@@ -25,7 +26,7 @@ You can run this when updating the kernel to a new release or after changing any
 options manually. All unset or updated options will be prompted for and all
 configuration files for all architectures will be updated.
-  (pakfire-shell)> scripts/configure oldconfig
+  (pakfire-shell)> scripts/configure oldconfig <arch>
#### olddefconfig
@@ -39,13 +40,10 @@ If you want to edit the configuration using the kernel's config editor. All
 configuration files will be updated afterwards and potentially prompted for options
 that diverge for different architectures.
-  (pakfire-shell)> scripts/configure menuconfig
-
-Appending the --arch= argument allows you to edit a specific architecture.
-Default is x86_64.
+  (pakfire-shell)> scripts/configure menuconfig <arch>
#### listnewconfig
This will list all unset options.
-  (pakfire-shell)> scripts/configure listnewconfig
+  (pakfire-shell)> scripts/configure listnewconfig <arch>
diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 8ca1a8835..af3ab1afc 100644
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -39,8 +39,6 @@ CONFIG_PCI_DOMAINS_GENERIC=y
 CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEAER_INJECT is not set
 # CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCI_IOV is not set
 # CONFIG_PCI_PRI is not set
@@ -63,10 +61,16 @@ CONFIG_HARDEN_BRANCH_PREDICTOR=y
 #
 CONFIG_CPU_PM=y
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
+CONFIG_DT_IDLE_STATES=y
+
 #
 # ARM CPU Idle Drivers
 #
-# CONFIG_ARM_CPUIDLE is not set
+CONFIG_ARM_CPUIDLE=y
#
 # CPU frequency scaling drivers
diff --git a/kernel/config-arm32-generic b/kernel/config-arm32-generic
index d05c9d68e..14f999bcb 100644
--- a/kernel/config-arm32-generic
+++ b/kernel/config-arm32-generic
@@ -108,6 +108,7 @@ 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
#
@@ -398,8 +399,8 @@ CONFIG_AUTO_ZRELADDR=y
 # CPU frequency scaling drivers
 #
 CONFIG_ARM_BIG_LITTLE_CPUFREQ=m
-# CONFIG_ARM_VEXPRESS_SPC_CPUFREQ is not set
-CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=y
+CONFIG_ARM_VEXPRESS_SPC_CPUFREQ=m
+CONFIG_ARM_BRCMSTB_AVS_CPUFREQ=m
 CONFIG_ARM_HIGHBANK_CPUFREQ=m
 CONFIG_ARM_IMX6Q_CPUFREQ=m
 CONFIG_ARM_MEDIATEK_CPUFREQ=m
@@ -407,16 +408,16 @@ CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 CONFIG_ARM_STI_CPUFREQ=m
 CONFIG_ARM_TEGRA20_CPUFREQ=y
 CONFIG_ARM_TEGRA124_CPUFREQ=m
-# CONFIG_ARM_TI_CPUFREQ is not set
+CONFIG_ARM_TI_CPUFREQ=y
#
 # ARM CPU Idle Drivers
 #
-# CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set
-# CONFIG_ARM_HIGHBANK_CPUIDLE is not set
-# CONFIG_ARM_ZYNQ_CPUIDLE is not set
-# CONFIG_ARM_U8500_CPUIDLE is not set
-# CONFIG_ARM_EXYNOS_CPUIDLE is not set
+CONFIG_ARM_BIG_LITTLE_CPUIDLE=y
+CONFIG_ARM_HIGHBANK_CPUIDLE=y
+CONFIG_ARM_ZYNQ_CPUIDLE=y
+CONFIG_ARM_U8500_CPUIDLE=y
+CONFIG_ARM_EXYNOS_CPUIDLE=y
 CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
#
diff --git a/kernel/config-generic b/kernel/config-generic
index f44d360e2..c9654e42a 100644
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -246,15 +246,15 @@ CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_GOV_ATTR_SET=y
 CONFIG_CPU_FREQ_GOV_COMMON=y
 CONFIG_CPU_FREQ_STAT=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
 # 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=m
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
 CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=m
 CONFIG_CPU_FREQ_GOV_ONDEMAND=m
 CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
@@ -286,6 +286,8 @@ CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y
@@ -638,7 +640,7 @@ CONFIG_INET6_XFRM_MODE_BEET=m
 CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
 CONFIG_IPV6_VTI=m
 CONFIG_IPV6_SIT=m
-CONFIG_IPV6_SIT_6RD=y
+# CONFIG_IPV6_SIT_6RD is not set
 CONFIG_IPV6_NDISC_NODETYPE=y
 CONFIG_IPV6_TUNNEL=m
 CONFIG_IPV6_GRE=m
diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 6b3ae388d..cfb0bced4 100644
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -286,12 +286,12 @@ CONFIG_X86_ACPI_CPUFREQ=m
 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
+CONFIG_X86_P4_CLOCKMOD=m
#
 # shared options
 #
-CONFIG_X86_SPEEDSTEP_LIB=y
+CONFIG_X86_SPEEDSTEP_LIB=m
#
 # CPU Idle
@@ -308,8 +308,6 @@ CONFIG_MMCONF_FAM10H=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
 CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIE_ECRC=y
-# CONFIG_PCIEASPM_DEFAULT is not set
-CONFIG_PCIEASPM_POWERSAVE=y
 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
 CONFIG_PCI_STUB=y
 CONFIG_PCI_PF_STUB=m
diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 5dce3cf73..50424e1bd 100644
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
name       = kernel
 version    = 4.20
-release    = 5
+release    = 8
 thisapp    = linux-%{version}
maintainer = Arne Fitzenreiter arne.fitzenreiter@ipfire.org
diff --git a/kernel/scripts/configure b/kernel/scripts/configure
index 2d45dd16e..b2c1fa371 100755
--- a/kernel/scripts/configure
+++ b/kernel/scripts/configure
@@ -164,8 +164,13 @@ function merge_config() {
# This function runs an interactive "make oldconfig".
 function make_config() {
-	local arch="${1}"
-	shift
+	local action="${1}"
+	local arch="${2}"
+
+	# Default to x86_64 when no arch is given
+	if [ -z "${arch}" ]; then
+		arch="x86_64"
+	fi
# Detect kernel arch
    local kernel_arch="$(get_kernel_arch "${arch}")"
@@ -182,7 +187,7 @@ function make_config() {
    	cat ${config_in} > .config
echo "You may now edit the configuration..."
-		make ARCH=${kernel_arch} "$@"
+		make ARCH=${kernel_arch} "${action}"
cat .config > ${config_out}
    	popd
@@ -296,7 +301,6 @@ function diff_configs() {
    rm -rf ${tmpdir}
 }
-ARCH="x86_64"
 KERNEL_DIR="$(search_kernel_dir)"
# Parse commandline.
@@ -313,16 +317,7 @@ while [ $# -gt 0 ]; do
    		;;
    	listnewconfig|menuconfig|merge|oldconfig|olddefconfig)
    		action=${arg}
-			;;
-
-		# Parse switches
-		--arch=*)
-			ARCH="${arg#*=}"
-
-			if ! get_platform "${ARCH}" &>/dev/null; then
-				echo "Unknown architecture: ${ARCH}" >&2
-				exit 2
-			fi
+			break
    		;;
    esac
 done
@@ -343,7 +338,7 @@ case "${action}" in
    	exit $?
    	;;
    listnewconfig|menuconfig|oldconfig|olddefconfig)
-		make_config "${ARCH}" "${action}"
+		make_config "${action}" "$@"
    	exit $?
    	;;
 esac
hooks/post-receive
--
IPFire 3.x development tree

    