From 1f0a39b8377b4f85c9d191b42875ca97e6b6f5b4 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 22 May 2024 13:32:42 +0000 Subject: [PATCH] arm-bsp/linux-yocto: fvp-base: remove fvp-timer.cfg The fvp-timer.cfg enables two modules for the SP804 and SP810 devices. These are older pieces of hardware that predate the architectural timer in modern systems, so even if the drivers are built they will not be used by the kernel. Whilst this is a good reason to remove them, another reason is that the SP804 driver is incorrectly defined in the Kconfig so it can only be built if a machine selects it explicitly (for arm64, only ARCH_BCM2835 and ARCH_HISI do this) or if COMPILE_TEST is enabled. This led to COMPILE_TEST being enabled so that this driver can be built. However, COMPILE_TEST does more, notably it turns on COMPILE_WERROR which then makes any compile warnings fatal. This is inconvenient, especially when compiler upgrades happen. Remove the timer configuration entirely: the architectural timer is used so this is entirely redundant. Signed-off-by: Ross Burton Signed-off-by: Jon Mason --- .../linux/arm-platforms-kmeta/bsp/arm-platforms/fvp.scc | 1 - .../arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-timer.cfg | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-timer.cfg diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp.scc b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp.scc index 80b85819..8e9731d4 100644 --- a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp.scc +++ b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp.scc @@ -9,5 +9,4 @@ kconf hardware fvp/fvp-rtc.cfg kconf hardware fvp/fvp-serial.cfg kconf hardware fvp/fvp-cfi.cfg kconf hardware fvp/fvp-drm.cfg -kconf hardware fvp/fvp-timer.cfg kconf hardware fvp/fvp-watchdog.cfg diff --git a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-timer.cfg b/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-timer.cfg deleted file mode 100644 index b33c65c2..00000000 --- a/meta-arm-bsp/recipes-kernel/linux/arm-platforms-kmeta/bsp/arm-platforms/fvp/fvp-timer.cfg +++ /dev/null @@ -1,4 +0,0 @@ -# Dual timer module -CONFIG_COMPILE_TEST=y -CONFIG_ARM_TIMER_SP804=y -CONFIG_CLK_SP810=y