diff options
| author | Christian Marangi <ansuelsmth@gmail.com> | 2023-06-16 11:28:39 +0200 |
|---|---|---|
| committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-06-16 11:28:39 +0200 |
| commit | 6d673c748baddc69d9485d0bdbff31838b301fb8 (patch) | |
| tree | 9f44edbedefc6bbd5a2f4e572de374584b10286e /target | |
| parent | 6f5ea752d7c95ba426ca21a6588cae8812bb3e7c (diff) | |
Revert "Revert "ipq806x: disable cache and fabric devfreq driver to improve stability""
This reverts commit 5d88bfdc1f3b7fca987002d9b7cd069101f98edb.
The revert contains merge error.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/ipq806x/config-5.15 | 9 | ||||
| -rw-r--r-- | target/linux/ipq806x/config-6.1 | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/target/linux/ipq806x/config-5.15 b/target/linux/ipq806x/config-5.15 index 0750e99328..ee6d86cf01 100644 --- a/target/linux/ipq806x/config-5.15 +++ b/target/linux/ipq806x/config-5.15 @@ -35,8 +35,8 @@ CONFIG_ARM_CPU_SUSPEND=y CONFIG_ARM_CRYPTO=y CONFIG_ARM_GIC=y CONFIG_ARM_HAS_SG_CHAIN=y -CONFIG_ARM_IPQ806X_FAB_DEVFREQ=y -CONFIG_ARM_KRAIT_CACHE_DEVFREQ=y +# CONFIG_ARM_IPQ806X_FAB_DEVFREQ is not set +# CONFIG_ARM_KRAIT_CACHE_DEVFREQ is not set CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_L1_CACHE_SHIFT_6=y CONFIG_ARM_PATCH_IDIV=y @@ -125,11 +125,6 @@ CONFIG_DEVFREQ_GOV_PASSIVE=y # CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND is not set # CONFIG_DEVFREQ_GOV_USERSPACE is not set # CONFIG_DEVFREQ_THERMAL is not set -<<<<<<< HEAD -======= -CONFIG_ARM_KRAIT_CACHE_DEVFREQ=y -CONFIG_ARM_IPQ806X_FAB_DEVFREQ=y ->>>>>>> parent of 60fc93b359 (ipq806x: disable cache and fabric devfreq driver to improve stability) CONFIG_DMADEVICES=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y diff --git a/target/linux/ipq806x/config-6.1 b/target/linux/ipq806x/config-6.1 index 559de1cf48..1e0666a5b7 100644 --- a/target/linux/ipq806x/config-6.1 +++ b/target/linux/ipq806x/config-6.1 @@ -39,8 +39,8 @@ CONFIG_ARM_CPU_SUSPEND=y CONFIG_ARM_CRYPTO=y CONFIG_ARM_GIC=y CONFIG_ARM_HAS_SG_CHAIN=y -CONFIG_ARM_IPQ806X_FAB_DEVFREQ=y -CONFIG_ARM_KRAIT_CACHE_DEVFREQ=y +# CONFIG_ARM_IPQ806X_FAB_DEVFREQ is not set +# CONFIG_ARM_KRAIT_CACHE_DEVFREQ is not set CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_L1_CACHE_SHIFT_6=y CONFIG_ARM_PATCH_IDIV=y |