p71924506
/
kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/kkup180/kernel_liteos_a

This commit is contained in:
likailong 2021-04-02 16:05:41 +08:00 committed by SimonLi
parent 3fe7ec0200 d8f89448ba
commit acc1b904bf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -141,7 +141,7 @@ menuconfig:$(MENUCONFIG_MCONF)
$< $(KCONFIG_FILE_PATH) $< $(KCONFIG_FILE_PATH)
genconfig:$(MENUCONFIG_CONF) genconfig:$(MENUCONFIG_CONF)
$(HIDE)mkdir -p include/config include/generated $(HIDE)mkdir -p include/config include/generated platform/include
$< --olddefconfig $(KCONFIG_FILE_PATH) $< --olddefconfig $(KCONFIG_FILE_PATH)
$< --silentoldconfig $(KCONFIG_FILE_PATH) $< --silentoldconfig $(KCONFIG_FILE_PATH)
-mv -f $(LITEOS_MENUCONFIG_H) $(LITEOS_PLATFORM_MENUCONFIG_H) -mv -f $(LITEOS_MENUCONFIG_H) $(LITEOS_PLATFORM_MENUCONFIG_H)

2
arch/arm/arm/src/los_hw_tick.c
View File

@ -68,7 +68,7 @@ LITE_OS_SEC_TEXT_MINOR UINT64 LOS_CurrNanosec(VOID)
UINT64 nanos; UINT64 nanos;
nanos = (UINT64)HalClockGetCycles() * OS_SYS_NS_PER_SECOND / g_sysClock; nanos = (UINT64)HalClockGetCycles() * OS_SYS_NS_PER_SECOND / g_sysClock;
return (UINT64)nanos; return nanos;
} }
LITE_OS_SEC_TEXT_MINOR VOID LOS_Udelay(UINT32 usecs) LITE_OS_SEC_TEXT_MINOR VOID LOS_Udelay(UINT32 usecs)