summaryrefslogtreecommitdiff
path: root/drivers/timer
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-03-14 17:58:41 +0300
committerTom Rini <trini@konsulko.com>2023-03-14 19:06:35 +0300
commita5faa4a9eb45f2cc0e858622db8fabafd644085b (patch)
tree36be30dcb8b9a6743c21f9db02ee3b8d1976180a /drivers/timer
parent20aaff677d8bc3cc2d529d859aa1ea65f5a4db7d (diff)
parent88e08fc5f6e508eac46cd1dfb0379b11ae032c0a (diff)
downloadu-boot-a5faa4a9eb45f2cc0e858622db8fabafd644085b.tar.xz
Merge tag 'v2023.04-rc4' into next
Prepare v2023.04-rc4 Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'drivers/timer')
-rw-r--r--drivers/timer/sandbox_timer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/timer/sandbox_timer.c b/drivers/timer/sandbox_timer.c
index c846bfb9f1..1da7e0c3a7 100644
--- a/drivers/timer/sandbox_timer.c
+++ b/drivers/timer/sandbox_timer.c
@@ -66,6 +66,8 @@ U_BOOT_DRIVER(sandbox_timer) = {
};
/* This is here in case we don't have a device tree */
+#if !CONFIG_IS_ENABLED(OF_PLATDATA)
U_BOOT_DRVINFO(sandbox_timer_non_fdt) = {
.name = "sandbox_timer",
};
+#endif