aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2022-03-31 15:50:46 +0200
committerPetr Štetiar <ynezz@true.cz>2022-03-31 17:30:17 +0200
commitbf1c3a5f3ca1fe3446c7a65a2c7796f5ee41ea02 (patch)
treeef36b6b6383f4dd89e2f9305a4765845b250645b /target
parentf389831db6ef219fa665c1355291ac7704967fa0 (diff)
downloadupstream-bf1c3a5f3ca1fe3446c7a65a2c7796f5ee41ea02.tar.gz
upstream-bf1c3a5f3ca1fe3446c7a65a2c7796f5ee41ea02.tar.bz2
upstream-bf1c3a5f3ca1fe3446c7a65a2c7796f5ee41ea02.zip
imx: re-enable ARM arch timer
Config option `ARM_ARCH_TIMER` has been removed during rebasing onto 5.15 kernel in commit 2b395c298247 ("imx: update config for 5.15"). Anyway, as stated in commit 8cdc356f8c30 ("mediatek: mt7623: Re-enable ARM arch timer") config option `ARM_ARCH_TIMER` cannot be enabled in the config directly; it is only selected by `HAVE_ARM_ARCH_TIMER`. We need to enable the latter in our config. Fixes: 2b395c298247 ("imx: update config for 5.15") Reported-by: Piotr Dymacz <pepe2k@gmail.com> Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target')
-rw-r--r--target/linux/imx/config-5.152
1 files changed, 2 insertions, 0 deletions
diff --git a/target/linux/imx/config-5.15 b/target/linux/imx/config-5.15
index 44c02eccbc..f27828e0bf 100644
--- a/target/linux/imx/config-5.15
+++ b/target/linux/imx/config-5.15
@@ -16,6 +16,7 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
CONFIG_ARCH_SPARSEMEM_ENABLE=y
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_ARM=y
+CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
CONFIG_ARM_CRYPTO=y
CONFIG_ARM_ERRATA_754322=y
CONFIG_ARM_ERRATA_764369=y
@@ -210,6 +211,7 @@ CONFIG_HARDIRQS_SW_RESEND=y
CONFIG_HAS_DMA=y
CONFIG_HAS_IOMEM=y
CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
CONFIG_HAVE_SMP=y
CONFIG_HWMON=y
CONFIG_HW_RANDOM=y