From: Tom Rini <trini@konsulko.com>
Date: Tue, 17 Mar 2026 01:24:46 +0000 (-0600)
Subject: timer: Correct Kconfig entry for XILINX_TIMER
X-Git-Tag: v2026.07-rc1~21^2~56^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c54a0a8ed901eff9e3e458dd3cc49da565753357;p=thirdparty%2Fu-boot.git

timer: Correct Kconfig entry for XILINX_TIMER

As exposed by "make randconfig", we have an issue with the dependencies
for XILINX_TIMER. This symbol is a case where we have one that covers
both main U-Boot and SPL. In this case, we need to select SPL_REGMAP not
when SPL is enabled but rather when SPL_TIMER is enabled (and in turn,
SPL_DM).

Signed-off-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/20260317012446.4162630-1-trini@konsulko.com
---

diff --git a/drivers/timer/Kconfig b/drivers/timer/Kconfig
index a84a0dc0539..9ffda4aca86 100644
--- a/drivers/timer/Kconfig
+++ b/drivers/timer/Kconfig
@@ -328,7 +328,7 @@ config XILINX_TIMER
 	bool "Xilinx timer support"
 	depends on TIMER
 	select REGMAP
-	select SPL_REGMAP if SPL
+	select SPL_REGMAP if SPL_TIMER
 	help
 	  Select this to enable support for the timer found on
 	  any Xilinx boards (axi timer).