summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-02-01 08:15:46 -0500
committerTom Rini <trini@konsulko.com>2021-02-01 08:15:46 -0500
commit7ee6205a5f286937cbd47f9ffbc27fd510be9223 (patch)
tree608f320cbdf0b9fbbf8de40cb0b05b7e4f5bf02a /drivers
parentd039975f077f39a3129e1aa1f7236d67e4b06e7b (diff)
parent77f898d04095cdccb69c476ba0aa19f257fca64d (diff)
downloadu-boot-7ee6205a5f286937cbd47f9ffbc27fd510be9223.tar.gz
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86WIP/01Feb2021
- Fix CMD_ACPI dependency in Kconfig - Correct overflow in __udelay() in TSC timer driver - Add a devicetree node for eMMC for Coral - Minor improvements on image loading - Reduce size of Samus image
Diffstat (limited to 'drivers')
-rw-r--r--drivers/timer/tsc_timer.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/timer/tsc_timer.c b/drivers/timer/tsc_timer.c
index 706d52b830..7d0fc66cc7 100644
--- a/drivers/timer/tsc_timer.c
+++ b/drivers/timer/tsc_timer.c
@@ -372,7 +372,7 @@ void __udelay(unsigned long usec)
u64 now = get_ticks();
u64 stop;
- stop = now + usec * get_tbclk_mhz();
+ stop = now + (u64)usec * get_tbclk_mhz();
while ((int64_t)(stop - get_ticks()) > 0)
#if defined(CONFIG_QEMU) && defined(CONFIG_SMP)