summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-06-05 15:53:18 -0400
committerTom Rini <trini@konsulko.com>2019-06-05 15:53:18 -0400
commitdbbb1c43f26cb28b64df80b72fffbaf2801e8a30 (patch)
tree6f60c48458e4fb975b0e602cff637c2e65a270cf /arch/arm
parent2253e40caef5b45bcae2ccdb238f9cf037eefc0b (diff)
parent4b27a761321fd17536e02644d0ec0373150eb570 (diff)
Merge tag 'efi-2019-07-rc4-2' of git://git.denx.de/u-boot-efi
Pull request for UEFI sub-system for v2019.07-rc4-2 Support for managing the non-volatile attribute of UEFI variables is added though we do not have a backend for persistence yet. Error messages for changes of UEFI variables are provided. UEFI boottime service implementations are corrected.
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-rockchip/rk_timer.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-rockchip/rk_timer.c b/arch/arm/mach-rockchip/rk_timer.c
index f20e64f48ec..29d379fa0ab 100644
--- a/arch/arm/mach-rockchip/rk_timer.c
+++ b/arch/arm/mach-rockchip/rk_timer.c
@@ -20,13 +20,6 @@ static uint64_t rockchip_get_ticks(void)
return timebase_h << 32 | timebase_l;
}
-static uint64_t usec_to_tick(unsigned int usec)
-{
- uint64_t tick = usec;
- tick *= CONFIG_SYS_TIMER_RATE / (1000 * 1000);
- return tick;
-}
-
void rockchip_udelay(unsigned int usec)
{
uint64_t tmp;