From 3a761c90afc0af1a17a03241534508b52a235410 Mon Sep 17 00:00:00 2001 From: Daniel Engberg Date: Mon, 18 Feb 2019 09:13:19 +0000 Subject: [PATCH] treewide: Don't diverge from upstream default HZ settings on 4.19 Most targets upstream use 250Hz or even 1000Hz by default while 100Hz is hardcoded in OpenWrt's default config. Use upstream default except for apm821xx which hardsets 1000Hz instead of platform default of 250Hz. Signed-off-by: Daniel Engberg [Apply same changes to 5.4] Signed-off-by: Kevin Darbyshire-Bryant --- target/linux/apm821xx/config-4.19 | 1 - target/linux/apm821xx/config-5.4 | 1 - target/linux/generic/config-4.19 | 4 ++-- target/linux/generic/config-5.4 | 4 ++-- target/linux/mpc85xx/config-4.19 | 3 --- target/linux/mpc85xx/config-5.4 | 3 --- 6 files changed, 4 insertions(+), 12 deletions(-) diff --git a/target/linux/apm821xx/config-4.19 b/target/linux/apm821xx/config-4.19 index 72d648fd23..27385ef1fd 100644 --- a/target/linux/apm821xx/config-4.19 +++ b/target/linux/apm821xx/config-4.19 @@ -169,7 +169,6 @@ CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_PPC4XX=y CONFIG_HZ=1000 -# CONFIG_HZ_100 is not set CONFIG_HZ_1000=y CONFIG_HZ_PERIODIC=y CONFIG_I2C=y diff --git a/target/linux/apm821xx/config-5.4 b/target/linux/apm821xx/config-5.4 index 4c62821561..106a142627 100644 --- a/target/linux/apm821xx/config-5.4 +++ b/target/linux/apm821xx/config-5.4 @@ -218,7 +218,6 @@ CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_PPC4XX=y CONFIG_HZ=1000 -# CONFIG_HZ_100 is not set CONFIG_HZ_1000=y CONFIG_HZ_PERIODIC=y CONFIG_I2C=y diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19 index 418b85a738..32209674ba 100644 --- a/target/linux/generic/config-4.19 +++ b/target/linux/generic/config-4.19 @@ -1914,8 +1914,8 @@ CONFIG_HW_RANDOM_TPM=y # CONFIG_HYPERV is not set # CONFIG_HYPERV_TSCPAGE is not set # CONFIG_HYSDN is not set -CONFIG_HZ=100 -CONFIG_HZ_100=y +# CONFIG_HZ is not set +# CONFIG_HZ_100 is not set # CONFIG_HZ_1000 is not set # CONFIG_HZ_1024 is not set # CONFIG_HZ_128 is not set diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4 index 2bdb0f5f75..48750c2cdc 100644 --- a/target/linux/generic/config-5.4 +++ b/target/linux/generic/config-5.4 @@ -2042,8 +2042,8 @@ CONFIG_HW_RANDOM_TPM=y # CONFIG_HYPERV is not set # CONFIG_HYPERV_TSCPAGE is not set # CONFIG_HYSDN is not set -CONFIG_HZ=100 -CONFIG_HZ_100=y +# CONFIG_HZ is not set +# CONFIG_HZ_100 is not set # CONFIG_HZ_1000 is not set # CONFIG_HZ_1024 is not set # CONFIG_HZ_128 is not set diff --git a/target/linux/mpc85xx/config-4.19 b/target/linux/mpc85xx/config-4.19 index ad21e576cc..67f4134d25 100644 --- a/target/linux/mpc85xx/config-4.19 +++ b/target/linux/mpc85xx/config-4.19 @@ -156,9 +156,6 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y # CONFIG_HIVEAP_330 is not set CONFIG_HW_RANDOM=y -CONFIG_HZ=250 -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y CONFIG_HZ_PERIODIC=y CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y diff --git a/target/linux/mpc85xx/config-5.4 b/target/linux/mpc85xx/config-5.4 index 65ee414c4e..340d5ece99 100644 --- a/target/linux/mpc85xx/config-5.4 +++ b/target/linux/mpc85xx/config-5.4 @@ -156,9 +156,6 @@ CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING=y # CONFIG_HIVEAP_330 is not set CONFIG_HW_RANDOM=y -CONFIG_HZ=250 -# CONFIG_HZ_100 is not set -CONFIG_HZ_250=y CONFIG_HZ_PERIODIC=y CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y -- 2.30.2