This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit c6654b1106c17b545517fe47bd5a0690b9a04681 Author: Xiang Xiao <[email protected]> AuthorDate: Sun May 3 15:54:17 2026 +0800 !sched/clock: remove CONFIG_SYSTEM_TIME64 and always use 64-bit time The 32-bit system clock has a limited range (~497 days) and the configuration knob is no longer worth the complexity given that practically every modern target already enables it. Make 64-bit time_t/clock_t/sclock_t/nuttx_time_t the only supported flavor. Specifically: - Drop the SYSTEM_TIME64 Kconfig option and its dependent PERF_OVERFLOW_CORRECTION/HRTIMER guards in sched/Kconfig. - Remove every #ifdef CONFIG_SYSTEM_TIME64 branch in headers (include/{sys/types.h,limits.h,inttypes.h,nuttx/clock.h, nuttx/fs/hostfs.h}) and core code paths (sched/clock/clock.h, drivers/power/pm/pm_procfs.c, drivers/rpmsg/rpmsg_ping.c, fs/procfs/fs_procfsuptime.c, libs/libc/wqueue/work_usrthread.c, arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c). - Strip CONFIG_SYSTEM_TIME64=y from every board defconfig. - Update Documentation/guides/rust.rst accordingly. Signed-off-by: Xiang Xiao <[email protected]> --- Documentation/guides/rust.rst | 1 - arch/arm/src/armv7-a/arm_perf.c | 2 +- arch/arm/src/armv7-m/arm_perf.c | 2 +- arch/arm/src/armv7-r/arm_perf.c | 2 +- arch/arm/src/armv8-m/arm_perf.c | 2 +- arch/arm/src/armv8-r/arm_perf.c | 2 +- arch/arm/src/cxd56xx/cxd56_cisif.c | 2 +- arch/arm/src/cxd56xx/cxd56_nxaudio.c | 8 +++--- arch/arm/src/cxd56xx/cxd56_rtc.c | 2 +- arch/arm/src/efm32/efm32_rtc_burtc.c | 2 +- arch/arm/src/imxrt/imxrt_tickless.c | 2 +- arch/arm/src/lc823450/lc823450_dvfs2.c | 2 +- arch/arm/src/lc823450/lc823450_timer.c | 2 +- arch/arm/src/lpc31xx/lpc31_timerisr.c | 2 +- arch/arm/src/lpc43xx/lpc43_rit.c | 8 +++--- arch/arm/src/lpc54xx/lpc54_tickless.c | 4 +-- arch/arm/src/sam34/sam4cm_oneshot.c | 4 +-- arch/arm/src/sama5/sam_oneshot.c | 6 ++--- arch/arm/src/samd5e5/sam_oneshot.c | 3 +-- arch/arm/src/samv7/sam_oneshot.c | 4 +-- arch/arm/src/stm32/stm32_oneshot.c | 4 +-- arch/arm/src/stm32/stm32_rtcounter.c | 2 +- arch/arm/src/stm32/stm32_tickless.c | 4 +-- arch/arm/src/stm32f7/stm32_tickless.c | 6 ++--- arch/arm/src/stm32h7/stm32_oneshot.c | 4 +-- arch/arm/src/stm32h7/stm32_tickless.c | 6 ++--- arch/arm/src/stm32l4/stm32l4_oneshot.c | 4 +-- arch/arm/src/stm32wb/stm32wb_oneshot.c | 4 +-- arch/arm/src/stm32wb/stm32wb_tickless.c | 4 +-- arch/arm/src/xmc4/xmc4_tickless.c | 4 +-- arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c | 3 +-- arch/mips/src/pic32mz/pic32mz_oneshot.c | 6 ++--- arch/mips/src/pic32mz/pic32mz_timer_lowerhalf.c | 2 +- arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c | 2 +- arch/risc-v/src/common/espressif/esp_i2c.c | 4 +-- arch/risc-v/src/common/espressif/esp_rtc.c | 2 +- arch/risc-v/src/common/espressif/esp_tickless.c | 4 +-- arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c | 4 +-- arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c | 6 ++--- arch/risc-v/src/esp32c3-legacy/esp32c3_pm.c | 4 +-- arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c | 2 +- arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c | 4 +-- .../src/esp32c3-legacy/esp32c3_tim_lowerhalf.c | 2 +- .../src/esp32c3-legacy/esp32c3_wifi_adapter.c | 2 +- arch/risc-v/src/esp32c3/esp_ble_adapter.c | 4 +-- arch/risc-v/src/esp32c3/esp_coex_adapter.c | 2 +- arch/risc-v/src/esp32c6/esp_coex_adapter.c | 2 +- arch/risc-v/src/litex/litex_tickless.c | 4 +-- arch/sparc/src/bm3803/bm3803_freerun.c | 4 +-- arch/sparc/src/bm3803/bm3803_oneshot.c | 6 ++--- arch/x86_64/src/intel64/intel64_oneshot.c | 6 ++--- arch/x86_64/src/intel64/intel64_perf.c | 2 +- arch/xtensa/src/common/espressif/esp_rtc.c | 2 +- arch/xtensa/src/common/xtensa_oneshot.c | 4 +-- arch/xtensa/src/common/xtensa_perf.c | 2 +- arch/xtensa/src/esp32/esp32_i2c.c | 4 +-- arch/xtensa/src/esp32/esp32_oneshot.c | 6 ++--- arch/xtensa/src/esp32/esp32_psram.c | 2 +- arch/xtensa/src/esp32/esp32_tickless.c | 4 +-- arch/xtensa/src/esp32/esp32_tim_lowerhalf.c | 2 +- arch/xtensa/src/esp32/esp32_wifi_adapter.c | 2 +- arch/xtensa/src/esp32s2/esp32s2_i2c.c | 4 +-- arch/xtensa/src/esp32s2/esp32s2_oneshot.c | 6 ++--- arch/xtensa/src/esp32s2/esp32s2_tim_lowerhalf.c | 2 +- arch/xtensa/src/esp32s2/esp32s2_wifi_adapter.c | 2 +- arch/xtensa/src/esp32s3/esp32s3_ble_adapter.c | 4 +-- arch/xtensa/src/esp32s3/esp32s3_i2c.c | 4 +-- arch/xtensa/src/esp32s3/esp32s3_oneshot.c | 6 ++--- arch/xtensa/src/esp32s3/esp32s3_tickless.c | 4 +-- arch/xtensa/src/esp32s3/esp32s3_tim_lowerhalf.c | 2 +- arch/xtensa/src/esp32s3/esp32s3_wifi_adapter.c | 2 +- .../arm/cxd56xx/drivers/audio/cxd56_audio_analog.c | 10 ++++---- .../fvp-armv8r-aarch32/configs/nsh/defconfig | 1 - .../lc823450-xgevk/configs/audio/defconfig | 1 - .../lc823450/lc823450-xgevk/configs/bt/defconfig | 1 - .../lc823450/lc823450-xgevk/configs/knsh/defconfig | 1 - .../lc823450-xgevk/configs/kostest/defconfig | 1 - .../lc823450-xgevk/configs/krndis/defconfig | 1 - .../lc823450/lc823450-xgevk/configs/nsh/defconfig | 1 - .../lc823450-xgevk/configs/rndis/defconfig | 1 - .../lc823450/lc823450-xgevk/configs/usb/defconfig | 1 - boards/arm/stm32/b-g474e-dpow1/src/stm32_smps.c | 4 +-- .../arm/stm32/nucleo-f302r8/configs/can/defconfig | 1 - .../stm32/olimexino-stm32/configs/can/defconfig | 1 - .../olimexino-stm32/configs/composite/defconfig | 1 - .../stm32/olimexino-stm32/configs/nsh/defconfig | 1 - boards/arm/stm32/stm32f334-disco/src/stm32_smps.c | 4 +-- .../stm32f4discovery/configs/canard/defconfig | 1 - boards/arm64/a527/avaota-a1/configs/nsh/defconfig | 1 - boards/arm64/a64/pinephone/configs/lcd/defconfig | 1 - boards/arm64/a64/pinephone/configs/lvgl/defconfig | 1 - boards/arm64/a64/pinephone/configs/nsh/defconfig | 1 - .../arm64/a64/pinephone/configs/sensor/defconfig | 1 - .../bcm2711/raspberrypi-4b/configs/cgol/defconfig | 1 - .../raspberrypi-4b/configs/coremark/defconfig | 1 - .../bcm2711/raspberrypi-4b/configs/fb/defconfig | 1 - .../bcm2711/raspberrypi-4b/configs/lvgl/defconfig | 1 - .../bcm2711/raspberrypi-4b/configs/nsh/defconfig | 1 - .../raspberrypi-4b/configs/ostest/defconfig | 1 - .../bcm2711/raspberrypi-4b/configs/sd/defconfig | 1 - .../fvp-v8r/fvp-armv8r/configs/citest/defconfig | 1 - .../fvp-armv8r/configs/citest_smp/defconfig | 1 - .../arm64/fvp-v8r/fvp-armv8r/configs/nsh/defconfig | 1 - .../fvp-v8r/fvp-armv8r/configs/nsh_smp/defconfig | 1 - .../fvp-v8r/fvp-armv8r/configs/pnsh/defconfig | 1 - .../fvp-v8r/fvp-armv8r/configs/pnsh_smp/defconfig | 1 - boards/arm64/imx8/imx8qm-mek/configs/nsh/defconfig | 1 - .../imx9/imx93-evk/configs/bootloader/defconfig | 1 - boards/arm64/imx9/imx93-evk/configs/knsh/defconfig | 1 - .../arm64/imx9/imx93-evk/configs/koptee/defconfig | 1 - boards/arm64/imx9/imx93-evk/configs/nsh/defconfig | 1 - .../arm64/imx9/imx93-evk/configs/optee/defconfig | 1 - .../imx9/imx95-a55-evk/configs/emmc/defconfig | 1 - .../arm64/imx9/imx95-a55-evk/configs/nsh/defconfig | 1 - .../qemu/qemu-armv8a/configs/citest/defconfig | 1 - .../qemu/qemu-armv8a/configs/citest_smp/defconfig | 1 - .../qemu/qemu-armv8a/configs/fastboot/defconfig | 1 - boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig | 1 - .../qemu/qemu-armv8a/configs/gdbstub/defconfig | 1 - .../arm64/qemu/qemu-armv8a/configs/knsh/defconfig | 1 - .../arm64/qemu/qemu-armv8a/configs/mte/defconfig | 1 - .../qemu/qemu-armv8a/configs/netnsh/defconfig | 1 - .../qemu/qemu-armv8a/configs/netnsh_hv/defconfig | 1 - .../qemu/qemu-armv8a/configs/netnsh_smp/defconfig | 1 - .../qemu-armv8a/configs/netnsh_smp_hv/defconfig | 1 - .../arm64/qemu/qemu-armv8a/configs/nsh/defconfig | 1 - .../qemu/qemu-armv8a/configs/nsh_fiq/defconfig | 1 - .../qemu/qemu-armv8a/configs/nsh_gicv2/defconfig | 1 - .../qemu/qemu-armv8a/configs/nsh_smp/defconfig | 1 - .../qemu-armv8a/configs/nsh_smp_tickless/defconfig | 1 - .../qemu/qemu-armv8a/configs/rpproxy/defconfig | 1 - .../qemu/qemu-armv8a/configs/rpserver/defconfig | 1 - .../qemu/qemu-armv8a/configs/sotest/defconfig | 1 - .../qemu/qemu-armv8a/configs/sw_tags/defconfig | 1 - .../qemu/qemu-armv8a/configs/xedge_demo/defconfig | 1 - .../arm64/rk3399/nanopi_m4/configs/nsh/defconfig | 1 - .../rk3399/pinephonepro/configs/nsh/defconfig | 1 - .../arm64/zynq-mpsoc/zcu111/configs/jtag/defconfig | 1 - .../zynq-mpsoc/zcu111/configs/netjtag/defconfig | 1 - .../zynq-mpsoc/zcu111/configs/netnsh/defconfig | 1 - .../arm64/zynq-mpsoc/zcu111/configs/nsh/defconfig | 1 - .../c906/smartl-c906/configs/sotest/defconfig | 1 - .../litex/arty_a7/configs/knsh-tickless/defconfig | 1 - boards/risc-v/mpfs/icicle/configs/hwtest/defconfig | 1 - boards/risc-v/mpfs/icicle/configs/knsh/defconfig | 1 - boards/risc-v/mpfs/icicle/configs/nsh/defconfig | 1 - .../risc-v/mpfs/icicle/configs/opensbi/defconfig | 1 - boards/risc-v/mpfs/icicle/configs/pnsh/defconfig | 1 - .../risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig | 1 - .../risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig | 1 - .../risc-v/mpfs/icicle/configs/rpmsg-sbi/defconfig | 1 - .../risc-v/mpfs/m100pfsevp/configs/nsh/defconfig | 1 - .../qemu-rv/rv-virt/configs/citest64/defconfig | 1 - boards/sim/sim/sim/configs/matter/defconfig | 1 - boards/sim/sim/sim/configs/ostest/defconfig | 1 - boards/sim/sim/sim/configs/rtptools/defconfig | 1 - boards/sim/sim/sim/configs/tcpblaster/defconfig | 1 - boards/sim/sim/sim/configs/windows/defconfig | 1 - boards/sim/sim/sim/configs/windows64/defconfig | 1 - .../tc397/a2g-tc397-5v-tft/configs/nsh/defconfig | 1 - .../tc4da/triboard_tc4x9_com/configs/nsh/defconfig | 1 - .../qemu/qemu-intel64/configs/earlyfb/defconfig | 1 - .../x86_64/qemu/qemu-intel64/configs/fb/defconfig | 1 - .../qemu/qemu-intel64/configs/jumbo/defconfig | 1 - .../qemu/qemu-intel64/configs/knsh_romfs/defconfig | 1 - .../qemu-intel64/configs/knsh_romfs_pci/defconfig | 1 - .../qemu/qemu-intel64/configs/lvgl/defconfig | 1 - .../x86_64/qemu/qemu-intel64/configs/nsh/defconfig | 1 - .../qemu/qemu-intel64/configs/nsh_pci/defconfig | 1 - .../qemu-intel64/configs/nsh_pci_smp/defconfig | 1 - .../qemu/qemu-intel64/configs/ostest/defconfig | 1 - .../esp32s3-devkit/configs/python/defconfig | 1 - drivers/audio/audio_fake.c | 4 +-- drivers/note/noteram_driver.c | 4 +-- drivers/note/notesnap_driver.c | 6 ++--- drivers/power/pm/pm_procfs.c | 18 ++++--------- drivers/rpmsg/rpmsg_ping.c | 4 --- drivers/timers/arch_timer.c | 2 +- fs/procfs/fs_procfscritmon.c | 2 +- fs/procfs/fs_procfsuptime.c | 9 ------- include/inttypes.h | 30 ---------------------- include/limits.h | 6 +---- include/nuttx/clock.h | 7 +---- include/nuttx/fs/hostfs.h | 4 --- include/sys/types.h | 5 ---- libs/libc/wqueue/work_usrthread.c | 6 +---- sched/Kconfig | 17 +----------- 187 files changed, 147 insertions(+), 338 deletions(-) diff --git a/Documentation/guides/rust.rst b/Documentation/guides/rust.rst index 0656b1bca68..643ef9998d0 100644 --- a/Documentation/guides/rust.rst +++ b/Documentation/guides/rust.rst @@ -57,7 +57,6 @@ Please ensure that you have a working NuttX build environment, and with the foll Please enable the following configurations in your NuttX configuration: -- CONFIG_SYSTEM_TIME64 - CONFIG_FS_LARGEFILE - CONFIG_TLS_NELEM = 16 - CONFIG_DEV_URANDOM diff --git a/arch/arm/src/armv7-a/arm_perf.c b/arch/arm/src/armv7-a/arm_perf.c index f06785f8c98..4337cb0600c 100644 --- a/arch/arm/src/armv7-a/arm_perf.c +++ b/arch/arm/src/armv7-a/arm_perf.c @@ -95,6 +95,6 @@ void up_perf_convert(clock_t elapsed, struct timespec *ts) ts->tv_sec = elapsed / g_cpu_freq; left = elapsed - ts->tv_sec * g_cpu_freq; - ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_cpu_freq; + ts->tv_nsec = NSEC_PER_SEC * left / g_cpu_freq; } #endif diff --git a/arch/arm/src/armv7-m/arm_perf.c b/arch/arm/src/armv7-m/arm_perf.c index a8b58c5ea94..6e30e33c7ed 100644 --- a/arch/arm/src/armv7-m/arm_perf.c +++ b/arch/arm/src/armv7-m/arm_perf.c @@ -76,6 +76,6 @@ void up_perf_convert(clock_t elapsed, struct timespec *ts) ts->tv_sec = elapsed / g_cpu_freq; left = elapsed - ts->tv_sec * g_cpu_freq; - ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_cpu_freq; + ts->tv_nsec = NSEC_PER_SEC * left / g_cpu_freq; } #endif diff --git a/arch/arm/src/armv7-r/arm_perf.c b/arch/arm/src/armv7-r/arm_perf.c index 7f96b6b0075..bcd6aa2d6e8 100644 --- a/arch/arm/src/armv7-r/arm_perf.c +++ b/arch/arm/src/armv7-r/arm_perf.c @@ -91,7 +91,7 @@ void up_perf_convert(clock_t elapsed, struct timespec *ts) ts->tv_sec = elapsed / g_cpu_freq; left = elapsed - ts->tv_sec * g_cpu_freq; - ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_cpu_freq; + ts->tv_nsec = NSEC_PER_SEC * left / g_cpu_freq; } #endif /* CONFIG_BUILD_FLAT || __KERNEL__ */ diff --git a/arch/arm/src/armv8-m/arm_perf.c b/arch/arm/src/armv8-m/arm_perf.c index 826d4a31d4e..842d3b8c96b 100644 --- a/arch/arm/src/armv8-m/arm_perf.c +++ b/arch/arm/src/armv8-m/arm_perf.c @@ -76,6 +76,6 @@ void up_perf_convert(clock_t elapsed, struct timespec *ts) ts->tv_sec = elapsed / g_cpu_freq; left = elapsed - ts->tv_sec * g_cpu_freq; - ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_cpu_freq; + ts->tv_nsec = NSEC_PER_SEC * left / g_cpu_freq; } #endif diff --git a/arch/arm/src/armv8-r/arm_perf.c b/arch/arm/src/armv8-r/arm_perf.c index 5123562d458..28c8fdfe361 100644 --- a/arch/arm/src/armv8-r/arm_perf.c +++ b/arch/arm/src/armv8-r/arm_perf.c @@ -87,6 +87,6 @@ void up_perf_convert(clock_t elapsed, struct timespec *ts) ts->tv_sec = elapsed / g_cpu_freq; left = elapsed - ts->tv_sec * g_cpu_freq; - ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_cpu_freq; + ts->tv_nsec = NSEC_PER_SEC * left / g_cpu_freq; } #endif /* CONFIG_ARCH_PERF_EVENTS */ diff --git a/arch/arm/src/cxd56xx/cxd56_cisif.c b/arch/arm/src/cxd56xx/cxd56_cisif.c index fbe72da17fb..7a2c2df11f9 100644 --- a/arch/arm/src/cxd56xx/cxd56_cisif.c +++ b/arch/arm/src/cxd56xx/cxd56_cisif.c @@ -288,7 +288,7 @@ static uint64_t cisif_get_msec_time(void) clock_systime_timespec(&tp); - return (((uint64_t)tp.tv_sec) * 1000 + tp.tv_nsec / 1000000); + return tp.tv_sec * 1000 + tp.tv_nsec / 1000000; } static void cisif_trace_time_start(void) diff --git a/arch/arm/src/cxd56xx/cxd56_nxaudio.c b/arch/arm/src/cxd56xx/cxd56_nxaudio.c index 75b2d6d3007..80a7e63e778 100644 --- a/arch/arm/src/cxd56xx/cxd56_nxaudio.c +++ b/arch/arm/src/cxd56xx/cxd56_nxaudio.c @@ -2096,8 +2096,8 @@ static int cxd56_power_on_micbias(struct cxd56_dev_s *dev) clock_systime_timespec(&start); - dev->mic_boot_start = (uint64_t)start.tv_sec * 1000 + - (uint64_t)start.tv_nsec / 1000000; + dev->mic_boot_start = start.tv_sec * 1000 + + start.tv_nsec / 1000000; return OK; } @@ -2951,8 +2951,8 @@ static int cxd56_start(struct audio_lowerhalf_s *lower) clock_systime_timespec(&end); - uint64_t time = (uint64_t)end.tv_sec * 1000 + - (uint64_t)end.tv_nsec / 1000000 - + uint64_t time = end.tv_sec * 1000 + + end.tv_nsec / 1000000 - priv->mic_boot_start; if (time < CXD56_MIC_BOOT_WAIT) diff --git a/arch/arm/src/cxd56xx/cxd56_rtc.c b/arch/arm/src/cxd56xx/cxd56_rtc.c index 6dd84cd98ea..35da54eea50 100644 --- a/arch/arm/src/cxd56xx/cxd56_rtc.c +++ b/arch/arm/src/cxd56xx/cxd56_rtc.c @@ -481,7 +481,7 @@ int up_rtc_settime(const struct timespec *tp) /* Only save the difference from HW raw value */ count = SEC_TO_CNT(tp->tv_sec) | NSEC_TO_PRECNT(tp->tv_nsec); - g_rtc_save->offset = (int64_t)count - (int64_t)cxd56_rtc_count(); + g_rtc_save->offset = count - cxd56_rtc_count(); #endif cxd56_update_basetime(&g_basetime); diff --git a/arch/arm/src/efm32/efm32_rtc_burtc.c b/arch/arm/src/efm32/efm32_rtc_burtc.c index e1dc0a7165b..dd86566dfcd 100644 --- a/arch/arm/src/efm32/efm32_rtc_burtc.c +++ b/arch/arm/src/efm32/efm32_rtc_burtc.c @@ -466,7 +466,7 @@ int up_rtc_settime(const struct timespec *tp) /* Compute Burtc offset because we cannot reset counter */ - val = (((uint64_t)tp->tv_sec) * CONFIG_RTC_FREQUENCY) + \ + val = (tp->tv_sec * CONFIG_RTC_FREQUENCY) + \ (tp->tv_nsec / (NSEC_PER_SEC / CONFIG_RTC_FREQUENCY)); if (val < cnt_reg) diff --git a/arch/arm/src/imxrt/imxrt_tickless.c b/arch/arm/src/imxrt/imxrt_tickless.c index fee0870f387..74bae869d5f 100644 --- a/arch/arm/src/imxrt/imxrt_tickless.c +++ b/arch/arm/src/imxrt/imxrt_tickless.c @@ -501,7 +501,7 @@ int up_timer_gettime(struct timespec *ts) int up_alarm_start(const struct timespec *ts) { size_t offset = 1; - uint64_t tm = ((uint64_t)ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec) / + uint64_t tm = (ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec) / NSEC_PER_TICK; irqstate_t flags; uint32_t regval; diff --git a/arch/arm/src/lc823450/lc823450_dvfs2.c b/arch/arm/src/lc823450/lc823450_dvfs2.c index 66db5119f32..d3a6515cf57 100644 --- a/arch/arm/src/lc823450/lc823450_dvfs2.c +++ b/arch/arm/src/lc823450/lc823450_dvfs2.c @@ -131,7 +131,7 @@ static uint64_t _get_current_time64(void) struct timespec ts; clock_systime_timespec(&ts); - return (uint64_t)ts.tv_sec * NSEC_PER_SEC + (uint64_t)ts.tv_nsec; + return ts.tv_sec * NSEC_PER_SEC + ts.tv_nsec; } /**************************************************************************** diff --git a/arch/arm/src/lc823450/lc823450_timer.c b/arch/arm/src/lc823450/lc823450_timer.c index 192b8c23443..6dd954afa6a 100644 --- a/arch/arm/src/lc823450/lc823450_timer.c +++ b/arch/arm/src/lc823450/lc823450_timer.c @@ -706,7 +706,7 @@ int up_rtc_gettime(struct timespec *tp) /* Get the elapsed time */ - elapsed = NSEC_PER_TICK * (uint64_t)clock_systime_ticks(); + elapsed = NSEC_PER_TICK * clock_systime_ticks(); /* Add the timer fraction in nanoseconds */ diff --git a/arch/arm/src/lpc31xx/lpc31_timerisr.c b/arch/arm/src/lpc31xx/lpc31_timerisr.c index b2fe50aaa0b..4e5e99ec6d2 100644 --- a/arch/arm/src/lpc31xx/lpc31_timerisr.c +++ b/arch/arm/src/lpc31xx/lpc31_timerisr.c @@ -111,7 +111,7 @@ void up_timer_initialize(void) freq >>= 4; } - load = ((freq * (uint64_t)10000) / 1000000); + load = ((freq * 10000) / 1000000); putreg32((uint32_t)load, LPC31_TIMER0_LOAD); /* Set periodic mode */ diff --git a/arch/arm/src/lpc43xx/lpc43_rit.c b/arch/arm/src/lpc43xx/lpc43_rit.c index f7e788672f1..9400a9a6b83 100644 --- a/arch/arm/src/lpc43xx/lpc43_rit.c +++ b/arch/arm/src/lpc43xx/lpc43_rit.c @@ -81,7 +81,7 @@ static int lpc43_rit_isr(int irq, void *context, void *arg) putreg32(RIT_CTRL_INT, LPC43_RIT_CTRL); - g_internal_timer += (uint64_t)RIT_TIMER_RESOLUTION; + g_internal_timer += RIT_TIMER_RESOLUTION; if (g_alarm > 0 && g_internal_timer >= g_alarm) { /* handle expired alarm */ @@ -228,8 +228,7 @@ int up_alarm_start(const struct timespec *ts) * coded. */ - g_alarm = (uint64_t)ts->tv_sec * (uint64_t)1000000000 + - (uint64_t)ts->tv_nsec; + g_alarm = ts->tv_sec * 1000000000 + ts->tv_nsec; return OK; } @@ -252,8 +251,7 @@ int up_timer_start(const struct timespec *ts) */ g_alarm = g_internal_timer; - g_alarm += (uint64_t)ts->tv_sec * (uint64_t)1000000000 + - (uint64_t)ts->tv_nsec; + g_alarm += ts->tv_sec * 1000000000 + ts->tv_nsec; return OK; } diff --git a/arch/arm/src/lpc54xx/lpc54_tickless.c b/arch/arm/src/lpc54xx/lpc54_tickless.c index 2ef0d16d911..fa3b6d94cdf 100644 --- a/arch/arm/src/lpc54xx/lpc54_tickless.c +++ b/arch/arm/src/lpc54xx/lpc54_tickless.c @@ -273,8 +273,8 @@ static void lpc54_ts_sub(const struct timespec *ts1, static inline uint64_t lpc54_ts2tick(const struct timespec *ts) { - return ((uint64_t)ts->tv_sec * LPC54_CCLK + - ((uint64_t)ts->tv_nsec / g_min_nsec * g_min_ticks)); + return (ts->tv_sec * LPC54_CCLK + + (ts->tv_nsec / g_min_nsec * g_min_ticks)); } static uint64_t lpc54_tick2ts(uint64_t ticks, struct timespec *ts, diff --git a/arch/arm/src/sam34/sam4cm_oneshot.c b/arch/arm/src/sam34/sam4cm_oneshot.c index d6396e3586b..6c31b6d42ab 100644 --- a/arch/arm/src/sam34/sam4cm_oneshot.c +++ b/arch/arm/src/sam34/sam4cm_oneshot.c @@ -289,8 +289,8 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. diff --git a/arch/arm/src/sama5/sam_oneshot.c b/arch/arm/src/sama5/sam_oneshot.c index 9003efe9ce1..04c35719e79 100644 --- a/arch/arm/src/sama5/sam_oneshot.c +++ b/arch/arm/src/sama5/sam_oneshot.c @@ -299,8 +299,8 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * - USEC_PER_SEC + (uint64_t)(ts->tv_nsec / + usec = ts->tv_sec * + USEC_PER_SEC + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts @@ -311,7 +311,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, * = (usecs * frequency) / USEC_PER_SEC; */ - regval = (usec * (uint64_t)sam_tc_divfreq(oneshot->tch)) / USEC_PER_SEC; + regval = (usec * sam_tc_divfreq(oneshot->tch)) / USEC_PER_SEC; tmrinfo("usec=%llu regval=%08llx\n", usec, regval); DEBUGASSERT(regval <= UINT32_MAX); diff --git a/arch/arm/src/samd5e5/sam_oneshot.c b/arch/arm/src/samd5e5/sam_oneshot.c index b8f9c720b3b..cb5911fb6bb 100644 --- a/arch/arm/src/samd5e5/sam_oneshot.c +++ b/arch/arm/src/samd5e5/sam_oneshot.c @@ -233,8 +233,7 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + (uint64_t)(ts->tv_nsec / - NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine * the number of counts need to achieve the requested delay. diff --git a/arch/arm/src/samv7/sam_oneshot.c b/arch/arm/src/samv7/sam_oneshot.c index 564212828b9..1052435b409 100644 --- a/arch/arm/src/samv7/sam_oneshot.c +++ b/arch/arm/src/samv7/sam_oneshot.c @@ -300,8 +300,8 @@ int sam_oneshot_start(struct sam_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts * needed to achieve the requested delay. diff --git a/arch/arm/src/stm32/stm32_oneshot.c b/arch/arm/src/stm32/stm32_oneshot.c index 0675ce0558f..95a507b7619 100644 --- a/arch/arm/src/stm32/stm32_oneshot.c +++ b/arch/arm/src/stm32/stm32_oneshot.c @@ -283,8 +283,8 @@ int stm32_oneshot_start(struct stm32_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. diff --git a/arch/arm/src/stm32/stm32_rtcounter.c b/arch/arm/src/stm32/stm32_rtcounter.c index c39097c39a2..aed46394773 100644 --- a/arch/arm/src/stm32/stm32_rtcounter.c +++ b/arch/arm/src/stm32/stm32_rtcounter.c @@ -296,7 +296,7 @@ static void stm32_rtc_breakout(const struct timespec *tp, * our use */ - frac = ((uint64_t)tp->tv_nsec * CONFIG_RTC_FREQUENCY) / 1000000000; + frac = (tp->tv_nsec * CONFIG_RTC_FREQUENCY) / 1000000000; cnt = (tp->tv_sec << RTC_CLOCKS_SHIFT) | ((uint32_t)frac & (CONFIG_RTC_FREQUENCY - 1)); ovf = (tp->tv_sec >> (32 - RTC_CLOCKS_SHIFT)); diff --git a/arch/arm/src/stm32/stm32_tickless.c b/arch/arm/src/stm32/stm32_tickless.c index 4109cf446f2..7ddd226cd8d 100644 --- a/arch/arm/src/stm32/stm32_tickless.c +++ b/arch/arm/src/stm32/stm32_tickless.c @@ -929,8 +929,8 @@ int up_timer_start(const struct timespec *ts) /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. diff --git a/arch/arm/src/stm32f7/stm32_tickless.c b/arch/arm/src/stm32f7/stm32_tickless.c index 9e429ea644b..bf0c10d350e 100644 --- a/arch/arm/src/stm32f7/stm32_tickless.c +++ b/arch/arm/src/stm32f7/stm32_tickless.c @@ -973,8 +973,8 @@ int up_timer_start(const struct timespec *ts) /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. @@ -1021,7 +1021,7 @@ int up_timer_start(const struct timespec *ts) int up_alarm_start(const struct timespec *ts) { size_t offset = 1; - uint64_t tm = ((uint64_t)ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec) / + uint64_t tm = (ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec) / NSEC_PER_TICK; irqstate_t flags; diff --git a/arch/arm/src/stm32h7/stm32_oneshot.c b/arch/arm/src/stm32h7/stm32_oneshot.c index 58bd226939b..fe56cfdbe58 100644 --- a/arch/arm/src/stm32h7/stm32_oneshot.c +++ b/arch/arm/src/stm32h7/stm32_oneshot.c @@ -286,8 +286,8 @@ int stm32_oneshot_start(struct stm32_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. diff --git a/arch/arm/src/stm32h7/stm32_tickless.c b/arch/arm/src/stm32h7/stm32_tickless.c index 4fbda7e2605..06d4651ba13 100644 --- a/arch/arm/src/stm32h7/stm32_tickless.c +++ b/arch/arm/src/stm32h7/stm32_tickless.c @@ -947,8 +947,8 @@ int up_timer_start(const struct timespec *ts) /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. @@ -995,7 +995,7 @@ int up_timer_start(const struct timespec *ts) int up_alarm_start(const struct timespec *ts) { size_t offset = 1; - uint64_t tm = ((uint64_t)ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec) / + uint64_t tm = (ts->tv_sec * NSEC_PER_SEC + ts->tv_nsec) / NSEC_PER_TICK; irqstate_t flags; diff --git a/arch/arm/src/stm32l4/stm32l4_oneshot.c b/arch/arm/src/stm32l4/stm32l4_oneshot.c index 69c7362fb18..70b41f1ed11 100644 --- a/arch/arm/src/stm32l4/stm32l4_oneshot.c +++ b/arch/arm/src/stm32l4/stm32l4_oneshot.c @@ -284,8 +284,8 @@ int stm32l4_oneshot_start(struct stm32l4_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. diff --git a/arch/arm/src/stm32wb/stm32wb_oneshot.c b/arch/arm/src/stm32wb/stm32wb_oneshot.c index 56efd2e0275..d9356f01b32 100644 --- a/arch/arm/src/stm32wb/stm32wb_oneshot.c +++ b/arch/arm/src/stm32wb/stm32wb_oneshot.c @@ -284,8 +284,8 @@ int stm32wb_oneshot_start(struct stm32wb_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. diff --git a/arch/arm/src/stm32wb/stm32wb_tickless.c b/arch/arm/src/stm32wb/stm32wb_tickless.c index 2fa23b986c0..00769c2ba85 100644 --- a/arch/arm/src/stm32wb/stm32wb_tickless.c +++ b/arch/arm/src/stm32wb/stm32wb_tickless.c @@ -795,8 +795,8 @@ int up_timer_start(const struct timespec *ts) /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. diff --git a/arch/arm/src/xmc4/xmc4_tickless.c b/arch/arm/src/xmc4/xmc4_tickless.c index b54b7221865..a15241254d8 100644 --- a/arch/arm/src/xmc4/xmc4_tickless.c +++ b/arch/arm/src/xmc4/xmc4_tickless.c @@ -429,8 +429,8 @@ int up_timer_start(const struct timespec *ts) /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Compute periods of the timers to match delay to wait */ diff --git a/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c b/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c index 7f5a2f62a86..927069b0ce8 100644 --- a/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c +++ b/arch/avr/src/avrdx/avrdx_timerisr_tickless_alarm.c @@ -301,8 +301,7 @@ static void avrdx_check_alarm_expired(uint8_t context) /* Note about data types - struct timespec is defined * in include/time.h, tv_sec is of type time_t which is defined - * in include/sys/types.h as uint32_t or uint64_t based - * on CONFIG_SYSTEM_TIME64 + * in include/sys/types.h as uint64_t. * * tv_nsec is defined as long, signed value */ diff --git a/arch/mips/src/pic32mz/pic32mz_oneshot.c b/arch/mips/src/pic32mz/pic32mz_oneshot.c index 7530c2fc7b1..e845875b735 100644 --- a/arch/mips/src/pic32mz/pic32mz_oneshot.c +++ b/arch/mips/src/pic32mz/pic32mz_oneshot.c @@ -302,10 +302,10 @@ int pic32mz_oneshot_start(struct pic32mz_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); - period = (usec * (uint64_t)oneshot->freq) / USEC_PER_SEC; + period = (usec * oneshot->freq) / USEC_PER_SEC; tmrinfo("usec=%llu period=%08llx\n", usec, period); DEBUGASSERT(period <= ((1ull << oneshot->width) - 1ul)); diff --git a/arch/mips/src/pic32mz/pic32mz_timer_lowerhalf.c b/arch/mips/src/pic32mz/pic32mz_timer_lowerhalf.c index 67b9a9b10ff..0b383b383f4 100644 --- a/arch/mips/src/pic32mz/pic32mz_timer_lowerhalf.c +++ b/arch/mips/src/pic32mz/pic32mz_timer_lowerhalf.c @@ -199,7 +199,7 @@ static uint32_t pic32mz_usec2ticks(struct pic32mz_lowerhalf_s *priv, { uint64_t bigticks; - bigticks = ((uint64_t)usecs * (uint64_t)priv->freq) / 1000000; + bigticks = (usecs * priv->freq) / 1000000; if (bigticks > UINT32_MAX) { diff --git a/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c b/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c index d918309202b..a3a67f8a784 100644 --- a/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c +++ b/arch/risc-v/src/bl602/bl602_oneshot_lowerhalf.c @@ -124,7 +124,7 @@ static inline uint64_t bl602_get_nsec(void) up_timer_gettime(&ts); - return (uint64_t)ts.tv_nsec + (uint64_t)ts.tv_sec * NSEC_PER_SEC; + return ts.tv_nsec + ts.tv_sec * NSEC_PER_SEC; } /**************************************************************************** diff --git a/arch/risc-v/src/common/espressif/esp_i2c.c b/arch/risc-v/src/common/espressif/esp_i2c.c index fbc39b3da3f..68707e10a58 100644 --- a/arch/risc-v/src/common/espressif/esp_i2c.c +++ b/arch/risc-v/src/common/espressif/esp_i2c.c @@ -1510,7 +1510,7 @@ static void esp_i2c_tracedump(struct esp_i2c_priv_s *priv) struct esp_trace_s *trace; int i; - syslog(LOG_DEBUG, "Elapsed time: %" PRIu32 "\n", + syslog(LOG_DEBUG, "Elapsed time: %" PRId64 "\n", (clock_systime_ticks() - priv->start_time)); for (i = 0; i < priv->tndx; i++) @@ -1518,7 +1518,7 @@ static void esp_i2c_tracedump(struct esp_i2c_priv_s *priv) trace = &priv->trace[i]; syslog(LOG_DEBUG, "%2d. STATUS: %08" PRIx32 " COUNT: %3" PRIu32 " EVENT: %s(%2d)" - " PARM: %08" PRIx32 " TIME: %" PRIu32 "\n", + " PARM: %08" PRIx32 " TIME: %" PRId64 "\n", i + 1, trace->status, trace->count, g_trace_names[trace->event], trace->event, trace->parm, trace->time - priv->start_time); } diff --git a/arch/risc-v/src/common/espressif/esp_rtc.c b/arch/risc-v/src/common/espressif/esp_rtc.c index 6c36b1ff77b..0896312e1f8 100644 --- a/arch/risc-v/src/common/espressif/esp_rtc.c +++ b/arch/risc-v/src/common/espressif/esp_rtc.c @@ -775,7 +775,7 @@ int up_rtc_settime(const struct timespec *ts) flags = spin_lock_irqsave(&g_rtc_lowerhalf.lock); - now_us = ((uint64_t) ts->tv_sec) * USEC_PER_SEC + + now_us = ts->tv_sec * USEC_PER_SEC + ts->tv_nsec / NSEC_PER_USEC; #ifdef CONFIG_RTC_DRIVER diff --git a/arch/risc-v/src/common/espressif/esp_tickless.c b/arch/risc-v/src/common/espressif/esp_tickless.c index fa6769f38f0..b8dd1f869ae 100644 --- a/arch/risc-v/src/common/espressif/esp_tickless.c +++ b/arch/risc-v/src/common/espressif/esp_tickless.c @@ -359,8 +359,8 @@ int IRAM_ATTR up_timer_start(const struct timespec *ts) up_timer_cancel(NULL); } - target_us = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + target_us = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); alarm_ticks = systimer_hal_get_counter_value(&systimer_hal, SYSTIMER_COUNTER_OS_TICK); diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c index b81cbef477b..72f0f81618e 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_i2c.c @@ -1281,7 +1281,7 @@ static void esp32c3_i2c_tracedump(struct esp32c3_i2c_priv_s *priv) struct esp32c3_trace_s *trace; int i; - syslog(LOG_DEBUG, "Elapsed time: %" PRIu32 "\n", + syslog(LOG_DEBUG, "Elapsed time: %" PRId64 "\n", (clock_systime_ticks() - priv->start_time)); for (i = 0; i < priv->tndx; i++) @@ -1289,7 +1289,7 @@ static void esp32c3_i2c_tracedump(struct esp32c3_i2c_priv_s *priv) trace = &priv->trace[i]; syslog(LOG_DEBUG, "%2d. STATUS: %08" PRIx32 " COUNT: %3" PRIu32 " EVENT: %s(%2d)" - " PARM: %08" PRIx32 " TIME: %" PRIu32 "\n", + " PARM: %08" PRIx32 " TIME: %" PRId64 "\n", i + 1, trace->status, trace->count, g_trace_names[trace->event], trace->event, trace->parm, trace->time - priv->start_time); } diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c index 98f9f54f2d4..7b799a49b62 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_oneshot.c @@ -283,8 +283,8 @@ int esp32c3_oneshot_start(struct esp32c3_oneshot_s *oneshot, /* Retrieve the duration from timespec in microsecond */ - timeout_us = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + timeout_us = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Verify if it is a multiple of the configured resolution. * In case it isn't, warn the user. @@ -452,7 +452,7 @@ int esp32c3_oneshot_current(struct esp32c3_oneshot_s *oneshot, ESP32C3_TIM_GETCTR(oneshot->tim, usec); - *usec = *usec * (uint64_t)oneshot->resolution; + *usec = *usec * oneshot->resolution; return OK; } diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_pm.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_pm.c index 220f4383a3f..5a2a8ef406a 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_pm.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_pm.c @@ -444,8 +444,8 @@ static uint32_t IRAM_ATTR esp32c3_get_power_down_flags(void) static void IRAM_ATTR esp32c3_timer_wakeup_prepare(void) { int64_t ticks; - int64_t sleep_duration = (int64_t)s_config.sleep_duration - - (int64_t) s_config.sleep_time_adjustment; + int64_t sleep_duration = s_config.sleep_duration - + s_config.sleep_time_adjustment; if (sleep_duration < 0) { sleep_duration = 0; diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c index f632e4a5c00..8c48f8f5a60 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_rtc.c @@ -3136,7 +3136,7 @@ int up_rtc_settime(const struct timespec *ts) DEBUGASSERT(ts != NULL && ts->tv_nsec < NSEC_PER_SEC); flags = spin_lock_irqsave(&g_rtc_lock); - now_us = ((uint64_t) ts->tv_sec) * USEC_PER_SEC + + now_us = ts->tv_sec * USEC_PER_SEC + ts->tv_nsec / NSEC_PER_USEC; if (g_rt_timer_enabled == true) { diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c index d16ea6308fe..eb0a37a9254 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_tickless.c @@ -453,8 +453,8 @@ int IRAM_ATTR up_timer_start(const struct timespec *ts) up_timer_cancel(NULL); } - cpu_ticks = SEC_2_CTICK((uint64_t)ts->tv_sec) + - NSEC_2_CTICK((uint64_t)ts->tv_nsec); + cpu_ticks = SEC_2_CTICK(ts->tv_sec) + + NSEC_2_CTICK(ts->tv_nsec); up_tmr_setcounter(cpu_ticks); g_timer_started = true; diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.c index d5d7939ac1c..fde26f80055 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_tim_lowerhalf.c @@ -386,7 +386,7 @@ static int esp32c3_timer_settimeout(struct timer_lowerhalf_s *lower, /* Set the timeout */ - ESP32C3_TIM_SETALRVL(priv->tim, (uint64_t)timeout); + ESP32C3_TIM_SETALRVL(priv->tim, timeout); return ret; } diff --git a/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c index 498f4afb188..51a6bea4110 100644 --- a/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c +++ b/arch/risc-v/src/esp32c3-legacy/esp32c3_wifi_adapter.c @@ -2926,7 +2926,7 @@ static void wifi_rtc_disable_iso(void) int64_t esp_timer_get_time(void) { - return (int64_t)rt_timer_time_us(); + return rt_timer_time_us(); } /**************************************************************************** diff --git a/arch/risc-v/src/esp32c3/esp_ble_adapter.c b/arch/risc-v/src/esp32c3/esp_ble_adapter.c index 6ebc6dacec5..282b41863b1 100644 --- a/arch/risc-v/src/esp32c3/esp_ble_adapter.c +++ b/arch/risc-v/src/esp32c3/esp_ble_adapter.c @@ -1585,7 +1585,7 @@ static uint32_t IRAM_ATTR btdm_lpcycles_2_hus(uint32_t cycles, uint64_t local_error_corr; uint64_t res; - local_error_corr = (error_corr == NULL) ? 0 : (uint64_t)(*error_corr); + local_error_corr = (error_corr == NULL) ? 0 : (*error_corr); res = (uint64_t)g_btdm_lpcycle_us * cycles * 2; local_error_corr += res; @@ -2981,7 +2981,7 @@ static void coex_bt_wakeup_request_end(void) static IRAM_ATTR int64_t get_time_us_wrapper(void) { - return (int64_t)esp_hr_timer_time_us(); + return esp_hr_timer_time_us(); } /**************************************************************************** diff --git a/arch/risc-v/src/esp32c3/esp_coex_adapter.c b/arch/risc-v/src/esp32c3/esp_coex_adapter.c index 8d7cb537d04..52c7a19267f 100644 --- a/arch/risc-v/src/esp32c3/esp_coex_adapter.c +++ b/arch/risc-v/src/esp32c3/esp_coex_adapter.c @@ -117,7 +117,7 @@ coex_adapter_funcs_t g_coex_adapter_funcs = static IRAM_ATTR int64_t esp_coex_esp_timer_get_time_wrapper(void) { - return (int64_t)esp_hr_timer_time_us(); + return esp_hr_timer_time_us(); } /**************************************************************************** diff --git a/arch/risc-v/src/esp32c6/esp_coex_adapter.c b/arch/risc-v/src/esp32c6/esp_coex_adapter.c index a0f9b3d091f..49b7693513d 100644 --- a/arch/risc-v/src/esp32c6/esp_coex_adapter.c +++ b/arch/risc-v/src/esp32c6/esp_coex_adapter.c @@ -114,7 +114,7 @@ coex_adapter_funcs_t g_coex_adapter_funcs = static IRAM_ATTR int64_t esp_coex_esp_timer_get_time_wrapper(void) { - return (int64_t)esp_hr_timer_time_us(); + return esp_hr_timer_time_us(); } /**************************************************************************** diff --git a/arch/risc-v/src/litex/litex_tickless.c b/arch/risc-v/src/litex/litex_tickless.c index 48b6c6228f7..23fbd569ea9 100644 --- a/arch/risc-v/src/litex/litex_tickless.c +++ b/arch/risc-v/src/litex/litex_tickless.c @@ -302,8 +302,8 @@ int up_timer_start(const struct timespec *ts) litex_timer_cancel(); - cpu_ticks = SEC_2_LITEX_TICK((uint64_t)ts->tv_sec) + - NSEC_2_LITEX_TICK((uint64_t)ts->tv_nsec); + cpu_ticks = SEC_2_LITEX_TICK(ts->tv_sec) + + NSEC_2_LITEX_TICK(ts->tv_nsec); DEBUGASSERT(cpu_ticks <= UINT32_MAX); diff --git a/arch/sparc/src/bm3803/bm3803_freerun.c b/arch/sparc/src/bm3803/bm3803_freerun.c index c020d6b4087..aa10a9370ba 100644 --- a/arch/sparc/src/bm3803/bm3803_freerun.c +++ b/arch/sparc/src/bm3803/bm3803_freerun.c @@ -232,8 +232,8 @@ int bm3803_freerun_counter(struct bm3803_freerun_s *freerun, ts->tv_sec = sec; ts->tv_nsec = (usec - (sec * USEC_PER_SEC)) * NSEC_PER_USEC; - tmrinfo("usec=%llu ts=(%u, %lu)\n", - usec, ts->tv_sec, (unsigned long)ts->tv_nsec); + tmrinfo("usec=%llu ts=(%lld, %ld)\n", + usec, ts->tv_sec, ts->tv_nsec); return OK; } diff --git a/arch/sparc/src/bm3803/bm3803_oneshot.c b/arch/sparc/src/bm3803/bm3803_oneshot.c index 956814ff07a..89b9589c185 100644 --- a/arch/sparc/src/bm3803/bm3803_oneshot.c +++ b/arch/sparc/src/bm3803/bm3803_oneshot.c @@ -229,8 +229,8 @@ int bm3803_oneshot_start(struct bm3803_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Get the timer counter frequency and determine the number of counts need * to achieve the requested delay. @@ -240,7 +240,7 @@ int bm3803_oneshot_start(struct bm3803_oneshot_s *oneshot, * = (usecs * frequency) / USEC_PER_SEC; */ - period = (usec * (uint64_t)oneshot->frequency) / USEC_PER_SEC; + period = (usec * oneshot->frequency) / USEC_PER_SEC; tmrinfo("usec=%llu period=%08llx\n", usec, period); DEBUGASSERT(period <= UINT24_MAX); diff --git a/arch/x86_64/src/intel64/intel64_oneshot.c b/arch/x86_64/src/intel64/intel64_oneshot.c index b5fb3936230..d9f3da5b517 100644 --- a/arch/x86_64/src/intel64/intel64_oneshot.c +++ b/arch/x86_64/src/intel64/intel64_oneshot.c @@ -315,8 +315,8 @@ int intel64_oneshot_start(struct intel64_oneshot_s *oneshot, /* Express the delay in microseconds */ - usec = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + usec = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* HPET use free running up-counter and a comparators which generate events * only on a equal event. This can results in event miss if we set too @@ -337,7 +337,7 @@ int intel64_oneshot_start(struct intel64_oneshot_s *oneshot, * = (usecs * frequency) / USEC_PER_SEC; */ - compare = (usec * (uint64_t)oneshot->frequency) / USEC_PER_SEC; + compare = (usec * oneshot->frequency) / USEC_PER_SEC; #ifndef CONFIG_INTEL64_HPET_FSB /* Set up to receive the callback when the interrupt occurs */ diff --git a/arch/x86_64/src/intel64/intel64_perf.c b/arch/x86_64/src/intel64/intel64_perf.c index cd0c2813728..67954bfe903 100644 --- a/arch/x86_64/src/intel64/intel64_perf.c +++ b/arch/x86_64/src/intel64/intel64_perf.c @@ -64,7 +64,7 @@ void up_perf_convert(clock_t elapsed, struct timespec *ts) ts->tv_sec = elapsed / g_x86_64_timer_freq; left = elapsed - ts->tv_sec * g_x86_64_timer_freq; - ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_x86_64_timer_freq; + ts->tv_nsec = NSEC_PER_SEC * left / g_x86_64_timer_freq; } #endif diff --git a/arch/xtensa/src/common/espressif/esp_rtc.c b/arch/xtensa/src/common/espressif/esp_rtc.c index ec27e5a8bbf..2683e118f4a 100644 --- a/arch/xtensa/src/common/espressif/esp_rtc.c +++ b/arch/xtensa/src/common/espressif/esp_rtc.c @@ -774,7 +774,7 @@ int up_rtc_settime(const struct timespec *ts) flags = spin_lock_irqsave(&g_rtc_lowerhalf.lock); - now_us = ((uint64_t) ts->tv_sec) * USEC_PER_SEC + + now_us = ts->tv_sec * USEC_PER_SEC + ts->tv_nsec / NSEC_PER_USEC; #ifdef CONFIG_RTC_DRIVER diff --git a/arch/xtensa/src/common/xtensa_oneshot.c b/arch/xtensa/src/common/xtensa_oneshot.c index 577314a7538..4ae1a56fafd 100644 --- a/arch/xtensa/src/common/xtensa_oneshot.c +++ b/arch/xtensa/src/common/xtensa_oneshot.c @@ -102,8 +102,8 @@ static int xtensa_oneshot_start(struct oneshot_lowerhalf_s *lower_, flags = spin_lock_irqsave(&lower->lock); - count = sec_to_count((uint64_t)ts->tv_sec, lower->freq) + - nsec_to_count((uint64_t)ts->tv_nsec, lower->freq); + count = sec_to_count(ts->tv_sec, lower->freq) + + nsec_to_count(ts->tv_nsec, lower->freq); count = xtensa_getcount() + count; xtensa_setcompare(count); diff --git a/arch/xtensa/src/common/xtensa_perf.c b/arch/xtensa/src/common/xtensa_perf.c index 9898337afd7..ef48fdb4593 100644 --- a/arch/xtensa/src/common/xtensa_perf.c +++ b/arch/xtensa/src/common/xtensa_perf.c @@ -63,6 +63,6 @@ void up_perf_convert(clock_t elapsed, struct timespec *ts) ts->tv_sec = elapsed / g_cpu_freq; left = elapsed - ts->tv_sec * g_cpu_freq; - ts->tv_nsec = NSEC_PER_SEC * (uint64_t)left / g_cpu_freq; + ts->tv_nsec = NSEC_PER_SEC * left / g_cpu_freq; } #endif diff --git a/arch/xtensa/src/esp32/esp32_i2c.c b/arch/xtensa/src/esp32/esp32_i2c.c index 5be6a0ea0fd..ee0cf764263 100644 --- a/arch/xtensa/src/esp32/esp32_i2c.c +++ b/arch/xtensa/src/esp32/esp32_i2c.c @@ -1279,7 +1279,7 @@ static void esp32_i2c_tracedump(struct esp32_i2c_priv_s *priv) struct esp32_trace_s *trace; int i; - syslog(LOG_DEBUG, "Elapsed time: %" PRIu32 "\n", + syslog(LOG_DEBUG, "Elapsed time: %" PRId64 "\n", (clock_systime_ticks() - priv->start_time)); for (i = 0; i < priv->tndx; i++) @@ -1287,7 +1287,7 @@ static void esp32_i2c_tracedump(struct esp32_i2c_priv_s *priv) trace = &priv->trace[i]; syslog(LOG_DEBUG, "%2d. STATUS: %08" PRIx32 " COUNT: %3" PRIu32 " EVENT: %s(%2d)" - " PARM: %08" PRIx32 " TIME: %" PRIu32 "\n", + " PARM: %08" PRIx32 " TIME: %" PRId64 "\n", i + 1, trace->status, trace->count, g_trace_names[trace->event], trace->event, trace->parm, trace->time - priv->start_time); } diff --git a/arch/xtensa/src/esp32/esp32_oneshot.c b/arch/xtensa/src/esp32/esp32_oneshot.c index 9c2f19e14a7..d182188e55b 100644 --- a/arch/xtensa/src/esp32/esp32_oneshot.c +++ b/arch/xtensa/src/esp32/esp32_oneshot.c @@ -274,8 +274,8 @@ int esp32_oneshot_start(struct esp32_oneshot_s *oneshot, /* Retrieve the duration from timespec in microsecond */ - timeout_us = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + timeout_us = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Verify if it is a multiple of the configured resolution. * In case it isn't, warn the user. @@ -443,7 +443,7 @@ int esp32_oneshot_current(struct esp32_oneshot_s *oneshot, uint64_t *usec) ESP32_TIM_GETCTR(oneshot->tim, usec); - *usec = *usec * (uint64_t)oneshot->resolution; + *usec = *usec * oneshot->resolution; return OK; } diff --git a/arch/xtensa/src/esp32/esp32_psram.c b/arch/xtensa/src/esp32/esp32_psram.c index c45b9879cbc..d334e94880d 100644 --- a/arch/xtensa/src/esp32/esp32_psram.c +++ b/arch/xtensa/src/esp32/esp32_psram.c @@ -993,7 +993,7 @@ static void psram_read_id(uint64_t *dev_id) psram_cmd_recv_start(spi_num, ps_cmd.rx_data, ps_cmd.rx_data_bit_len / 8, PSRAM_CMD_SPI); psram_cmd_end(spi_num); - *dev_id = (uint64_t)(((uint64_t)psram_id[1] << 32) | psram_id[0]); + *dev_id = (((uint64_t)psram_id[1] << 32) | psram_id[0]); } /* enter QPI mode */ diff --git a/arch/xtensa/src/esp32/esp32_tickless.c b/arch/xtensa/src/esp32/esp32_tickless.c index 3e6a0fa228e..68570681a7b 100644 --- a/arch/xtensa/src/esp32/esp32_tickless.c +++ b/arch/xtensa/src/esp32/esp32_tickless.c @@ -449,8 +449,8 @@ int IRAM_ATTR up_timer_start(const struct timespec *ts) up_timer_cancel(NULL); } - cpu_ticks = SEC_2_CTICK((uint64_t)ts->tv_sec) + - NSEC_2_CTICK((uint64_t)ts->tv_nsec); + cpu_ticks = SEC_2_CTICK(ts->tv_sec) + + NSEC_2_CTICK(ts->tv_nsec); up_tmr_setcount(cpu_ticks); diff --git a/arch/xtensa/src/esp32/esp32_tim_lowerhalf.c b/arch/xtensa/src/esp32/esp32_tim_lowerhalf.c index 6396190a5b9..522159e6652 100644 --- a/arch/xtensa/src/esp32/esp32_tim_lowerhalf.c +++ b/arch/xtensa/src/esp32/esp32_tim_lowerhalf.c @@ -408,7 +408,7 @@ static int esp32_timer_settimeout(struct timer_lowerhalf_s *lower, /* Set the timeout */ - ESP32_TIM_SETALRVL(priv->tim, (uint64_t)timeout); + ESP32_TIM_SETALRVL(priv->tim, timeout); return ret; } diff --git a/arch/xtensa/src/esp32/esp32_wifi_adapter.c b/arch/xtensa/src/esp32/esp32_wifi_adapter.c index fddae265cc0..6d372ab3007 100644 --- a/arch/xtensa/src/esp32/esp32_wifi_adapter.c +++ b/arch/xtensa/src/esp32/esp32_wifi_adapter.c @@ -2263,7 +2263,7 @@ static void wifi_rtc_disable_iso(void) int64_t esp32_timer_get_time(void) { - return (int64_t)esp_hr_timer_time_us(); + return esp_hr_timer_time_us(); } /**************************************************************************** diff --git a/arch/xtensa/src/esp32s2/esp32s2_i2c.c b/arch/xtensa/src/esp32s2/esp32s2_i2c.c index 2d31ef6eb66..1ae4cbdc645 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_i2c.c +++ b/arch/xtensa/src/esp32s2/esp32s2_i2c.c @@ -1452,7 +1452,7 @@ static void i2c_traceevent(struct esp32s2_i2c_priv_s *priv, #ifdef CONFIG_I2C_TRACE static void i2c_tracedump(struct esp32s2_i2c_priv_s *priv) { - syslog(LOG_DEBUG, "Elapsed time: %" PRIu32 "\n", + syslog(LOG_DEBUG, "Elapsed time: %" PRId64 "\n", clock_systime_ticks() - priv->start_time); for (int i = 0; i < priv->tndx; i++) @@ -1460,7 +1460,7 @@ static void i2c_tracedump(struct esp32s2_i2c_priv_s *priv) struct esp32s2_trace_s *trace = &priv->trace[i]; syslog(LOG_DEBUG, "%2d. STATUS: %08" PRIx32 " COUNT: %3" PRIu32 " EVENT: %s(%2d)" - " PARM: %08" PRIx32 " TIME: %" PRIu32 "\n", + " PARM: %08" PRIx32 " TIME: %" PRId64 "\n", i + 1, trace->status, trace->count, g_trace_names[trace->event], trace->event, trace->parm, trace->time - priv->start_time); } diff --git a/arch/xtensa/src/esp32s2/esp32s2_oneshot.c b/arch/xtensa/src/esp32s2/esp32s2_oneshot.c index d85e252147c..2ee16c5722e 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_oneshot.c +++ b/arch/xtensa/src/esp32s2/esp32s2_oneshot.c @@ -288,8 +288,8 @@ int esp32s2_oneshot_start(struct esp32s2_oneshot_s *oneshot, /* Retrieve the duration from timespec in microsecond */ - timeout_us = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + timeout_us = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Verify if it is a multiple of the configured resolution. * In case it isn't, warn the user. @@ -459,7 +459,7 @@ int esp32s2_oneshot_current(struct esp32s2_oneshot_s *oneshot, ESP32S2_TIM_GETCTR(oneshot->tim, usec); - *usec = *usec * (uint64_t)oneshot->resolution; + *usec = *usec * oneshot->resolution; return OK; } diff --git a/arch/xtensa/src/esp32s2/esp32s2_tim_lowerhalf.c b/arch/xtensa/src/esp32s2/esp32s2_tim_lowerhalf.c index 06454ddfa80..ff60dfbdb77 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_tim_lowerhalf.c +++ b/arch/xtensa/src/esp32s2/esp32s2_tim_lowerhalf.c @@ -405,7 +405,7 @@ static int esp32s2_timer_settimeout(struct timer_lowerhalf_s *lower, /* Set the timeout */ - ESP32S2_TIM_SETALRVL(priv->tim, (uint64_t)timeout); + ESP32S2_TIM_SETALRVL(priv->tim, timeout); return ret; } diff --git a/arch/xtensa/src/esp32s2/esp32s2_wifi_adapter.c b/arch/xtensa/src/esp32s2/esp32s2_wifi_adapter.c index bb8a3deb8aa..bd8a24a4cbb 100644 --- a/arch/xtensa/src/esp32s2/esp32s2_wifi_adapter.c +++ b/arch/xtensa/src/esp32s2/esp32s2_wifi_adapter.c @@ -2081,7 +2081,7 @@ static void wifi_clock_disable(void) int64_t esp32s2_timer_get_time(void) { - return (int64_t)esp_hr_timer_time_us(); + return esp_hr_timer_time_us(); } /**************************************************************************** diff --git a/arch/xtensa/src/esp32s3/esp32s3_ble_adapter.c b/arch/xtensa/src/esp32s3/esp32s3_ble_adapter.c index 9ee9a4af752..cf91149530d 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_ble_adapter.c +++ b/arch/xtensa/src/esp32s3/esp32s3_ble_adapter.c @@ -1569,7 +1569,7 @@ static uint32_t IRAM_ATTR btdm_lpcycles_2_hus(uint32_t cycles, uint64_t local_error_corr; uint64_t res; - local_error_corr = (error_corr == NULL) ? 0 : (uint64_t)(*error_corr); + local_error_corr = (error_corr == NULL) ? 0 : (*error_corr); res = (uint64_t)g_btdm_lpcycle_us * cycles * 2; local_error_corr += res; @@ -2967,7 +2967,7 @@ static void coex_bt_wakeup_request_end(void) static IRAM_ATTR int64_t get_time_us_wrapper(void) { - return (int64_t)esp_hr_timer_time_us(); + return esp_hr_timer_time_us(); } /**************************************************************************** diff --git a/arch/xtensa/src/esp32s3/esp32s3_i2c.c b/arch/xtensa/src/esp32s3/esp32s3_i2c.c index 963d86cf9fe..6a77aa195af 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_i2c.c +++ b/arch/xtensa/src/esp32s3/esp32s3_i2c.c @@ -1484,7 +1484,7 @@ static void i2c_traceevent(struct esp32s3_i2c_priv_s *priv, #ifdef CONFIG_I2C_TRACE static void i2c_tracedump(struct esp32s3_i2c_priv_s *priv) { - syslog(LOG_DEBUG, "Elapsed time: %" PRIu32 "\n", + syslog(LOG_DEBUG, "Elapsed time: %" PRId64 "\n", clock_systime_ticks() - priv->start_time); for (int i = 0; i < priv->tndx; i++) @@ -1492,7 +1492,7 @@ static void i2c_tracedump(struct esp32s3_i2c_priv_s *priv) struct esp32s3_trace_s *trace = &priv->trace[i]; syslog(LOG_DEBUG, "%2d. STATUS: %08" PRIx32 " COUNT: %3" PRIu32 " EVENT: %s(%2d)" - " PARM: %08" PRIx32 " TIME: %" PRIu32 "\n", + " PARM: %08" PRIx32 " TIME: %" PRId64 "\n", i + 1, trace->status, trace->count, g_trace_names[trace->event], trace->event, trace->parm, trace->time - priv->start_time); } diff --git a/arch/xtensa/src/esp32s3/esp32s3_oneshot.c b/arch/xtensa/src/esp32s3/esp32s3_oneshot.c index 7d88841a42e..ba45b5e2fde 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_oneshot.c +++ b/arch/xtensa/src/esp32s3/esp32s3_oneshot.c @@ -288,8 +288,8 @@ int esp32s3_oneshot_start(struct esp32s3_oneshot_s *oneshot, /* Retrieve the duration from timespec in microsecond */ - timeout_us = (uint64_t)ts->tv_sec * USEC_PER_SEC + - (uint64_t)(ts->tv_nsec / NSEC_PER_USEC); + timeout_us = ts->tv_sec * USEC_PER_SEC + + (ts->tv_nsec / NSEC_PER_USEC); /* Verify if it is a multiple of the configured resolution. * In case it isn't, warn the user. @@ -459,7 +459,7 @@ int esp32s3_oneshot_current(struct esp32s3_oneshot_s *oneshot, ESP32S3_TIM_GETCTR(oneshot->tim, usec); - *usec = *usec * (uint64_t)oneshot->resolution; + *usec = *usec * oneshot->resolution; return OK; } diff --git a/arch/xtensa/src/esp32s3/esp32s3_tickless.c b/arch/xtensa/src/esp32s3/esp32s3_tickless.c index aaff1ddeedc..d2dffcc9f2b 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_tickless.c +++ b/arch/xtensa/src/esp32s3/esp32s3_tickless.c @@ -430,8 +430,8 @@ int IRAM_ATTR up_timer_start(const struct timespec *ts) up_timer_cancel(NULL); } - cpu_ticks = SEC_2_CTICK((uint64_t)ts->tv_sec) + - NSEC_2_CTICK((uint64_t)ts->tv_nsec); + cpu_ticks = SEC_2_CTICK(ts->tv_sec) + + NSEC_2_CTICK(ts->tv_nsec); tickless_setcounter(cpu_ticks); g_timer_started = true; diff --git a/arch/xtensa/src/esp32s3/esp32s3_tim_lowerhalf.c b/arch/xtensa/src/esp32s3/esp32s3_tim_lowerhalf.c index 0e2bf34951f..5c2ae985870 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_tim_lowerhalf.c +++ b/arch/xtensa/src/esp32s3/esp32s3_tim_lowerhalf.c @@ -410,7 +410,7 @@ static int timer_lh_settimeout(struct timer_lowerhalf_s *lower, /* Set the timeout */ - ESP32S3_TIM_SETALRVL(priv->tim, (uint64_t)timeout); + ESP32S3_TIM_SETALRVL(priv->tim, timeout); return ret; } diff --git a/arch/xtensa/src/esp32s3/esp32s3_wifi_adapter.c b/arch/xtensa/src/esp32s3/esp32s3_wifi_adapter.c index 3d9d5339b53..6c615e8e388 100644 --- a/arch/xtensa/src/esp32s3/esp32s3_wifi_adapter.c +++ b/arch/xtensa/src/esp32s3/esp32s3_wifi_adapter.c @@ -2253,7 +2253,7 @@ static void wifi_rtc_disable_iso(void) int64_t esp32s3_timer_get_time(void) { - return (int64_t)esp_hr_timer_time_us(); + return esp_hr_timer_time_us(); } /**************************************************************************** diff --git a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_analog.c b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_analog.c index eef34739072..7e8cbb06b45 100644 --- a/boards/arm/cxd56xx/drivers/audio/cxd56_audio_analog.c +++ b/boards/arm/cxd56xx/drivers/audio/cxd56_audio_analog.c @@ -65,8 +65,8 @@ static void set_mic_boot_time(void) { struct timespec start; clock_systime_timespec(&start); - g_mic_boot_start_time = (uint64_t)start.tv_sec * 1000 + - (uint64_t)start.tv_nsec / 1000000; + g_mic_boot_start_time = start.tv_sec * 1000 + + start.tv_nsec / 1000000; } static void wait_mic_boot_finish(void) @@ -75,9 +75,9 @@ static void wait_mic_boot_finish(void) { struct timespec end; clock_systime_timespec(&end); - uint64_t time = (uint64_t)end.tv_sec * 1000 + - (uint64_t)end.tv_nsec / 1000000 - - g_mic_boot_start_time; + uint64_t time = end.tv_sec * 1000 + + end.tv_nsec / 1000000 - + g_mic_boot_start_time; if (time < CXD56_AUDIO_MIC_BOOT_WAIT) { diff --git a/boards/arm/fvp-v8r-aarch32/fvp-armv8r-aarch32/configs/nsh/defconfig b/boards/arm/fvp-v8r-aarch32/fvp-armv8r-aarch32/configs/nsh/defconfig index d99e9b33ec3..92ce3988974 100644 --- a/boards/arm/fvp-v8r-aarch32/fvp-armv8r-aarch32/configs/nsh/defconfig +++ b/boards/arm/fvp-v8r-aarch32/fvp-armv8r-aarch32/configs/nsh/defconfig @@ -52,7 +52,6 @@ CONFIG_SYSLOG_PROCESSID=y CONFIG_SYSLOG_PROCESS_NAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_BASE=0x9c090000 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig index adf52de04c5..7e36119e126 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/audio/defconfig @@ -113,7 +113,6 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_SYSTEM_USBMSC=y CONFIG_SYSTEM_USBMSC_DEVMINOR1=0 CONFIG_SYSTEM_USBMSC_DEVMINOR2=1 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig index d81e4268415..48d48e15dd5 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/bt/defconfig @@ -137,7 +137,6 @@ CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig index efe67a92d9a..78167997634 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/knsh/defconfig @@ -103,7 +103,6 @@ CONFIG_START_MONTH=10 CONFIG_START_YEAR=2013 CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_UART0_RXBUFSIZE=512 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig index caa220773e9..e005fea76b4 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/kostest/defconfig @@ -39,7 +39,6 @@ CONFIG_START_DAY=3 CONFIG_START_MONTH=10 CONFIG_START_YEAR=2013 CONFIG_SYMTAB_ORDEREDBYNAME=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_NBARRIER_THREADS=3 CONFIG_TESTING_OSTEST_STACKSIZE=2048 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig index 8fef690d90b..95857dd792f 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/krndis/defconfig @@ -161,7 +161,6 @@ CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_PING=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_TESTING_OSTEST=y CONFIG_UART0_RXBUFSIZE=512 diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig index f93d8d15c22..a7340dd6948 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/nsh/defconfig @@ -106,7 +106,6 @@ CONFIG_START_MONTH=10 CONFIG_START_YEAR=2013 CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig index b8be2a142a9..2de0028368b 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/rndis/defconfig @@ -161,7 +161,6 @@ CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig index 77b72fd6da3..dab36f173a2 100644 --- a/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig +++ b/boards/arm/lc823450/lc823450-xgevk/configs/usb/defconfig @@ -109,7 +109,6 @@ CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_SYSTEM_USBMSC=y CONFIG_SYSTEM_USBMSC_DEVMINOR1=0 CONFIG_SYSTEM_USBMSC_DEVMINOR2=1 diff --git a/boards/arm/stm32/b-g474e-dpow1/src/stm32_smps.c b/boards/arm/stm32/b-g474e-dpow1/src/stm32_smps.c index 9d06a98c8b6..b2496a63d85 100644 --- a/boards/arm/stm32/b-g474e-dpow1/src/stm32_smps.c +++ b/boards/arm/stm32/b-g474e-dpow1/src/stm32_smps.c @@ -466,7 +466,7 @@ static int smps_start(struct smps_dev_s *dev) { pwrerr("ERROR: Can not achieve timc pwm " "freq=%" PRIu32 " if fclk=%" PRIu64 "\n", - (uint32_t)TIMC_PWM_FREQ, (uint64_t)fclk); + (uint32_t)TIMC_PWM_FREQ, fclk); ret = -EINVAL; goto errout; } @@ -483,7 +483,7 @@ static int smps_start(struct smps_dev_s *dev) { pwrerr("ERROR: Can not achieve timd pwm " "freq=%" PRIu32 " if fclk=%" PRIu64 "\n", - (uint32_t)TIMD_PWM_FREQ, (uint64_t)fclk); + (uint32_t)TIMD_PWM_FREQ, fclk); ret = -EINVAL; goto errout; } diff --git a/boards/arm/stm32/nucleo-f302r8/configs/can/defconfig b/boards/arm/stm32/nucleo-f302r8/configs/can/defconfig index aef827a25b3..def904eba3d 100644 --- a/boards/arm/stm32/nucleo-f302r8/configs/can/defconfig +++ b/boards/arm/stm32/nucleo-f302r8/configs/can/defconfig @@ -50,6 +50,5 @@ CONFIG_STM32_JTAG_SW_ENABLE=y CONFIG_STM32_PWR=y CONFIG_STM32_USART2=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=0 CONFIG_USART2_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32/olimexino-stm32/configs/can/defconfig b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig index 2dacd83148c..d02669c5502 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/can/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/can/defconfig @@ -92,7 +92,6 @@ CONFIG_STM32_TIM3_PARTIAL_REMAP=y CONFIG_STM32_USART1=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=12 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig index 8730ba5bd29..ce360b21b94 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/composite/defconfig @@ -116,7 +116,6 @@ CONFIG_STM32_USB=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_COMPOSITE=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=12 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig index 0b3b3bf0d44..7fac8d7932b 100644 --- a/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig +++ b/boards/arm/stm32/olimexino-stm32/configs/nsh/defconfig @@ -104,7 +104,6 @@ CONFIG_STM32_USART1=y CONFIG_STM32_USART2=y CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=12 CONFIG_USART1_RXBUFSIZE=32 CONFIG_USART1_SERIAL_CONSOLE=y diff --git a/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c b/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c index a78e0dcd468..8c42a9c23cb 100644 --- a/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c +++ b/boards/arm/stm32/stm32f334-disco/src/stm32_smps.c @@ -447,7 +447,7 @@ static int smps_start(struct smps_dev_s *dev) { pwrerr("ERROR: Can not achieve tima pwm " "freq=%" PRIu32 " if fclk=%" PRIu64 "\n", - (uint32_t)TIMA_PWM_FREQ, (uint64_t)fclk); + (uint32_t)TIMA_PWM_FREQ, fclk); ret = -EINVAL; goto errout; } @@ -464,7 +464,7 @@ static int smps_start(struct smps_dev_s *dev) { pwrerr("ERROR: Can not achieve timb pwm " "freq=%" PRIu32 " if fclk=%" PRIu64 "\n", - (uint32_t)TIMB_PWM_FREQ, (uint64_t)fclk); + (uint32_t)TIMB_PWM_FREQ, fclk); ret = -EINVAL; goto errout; } diff --git a/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig index df4e5da3840..553cc77d002 100644 --- a/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig +++ b/boards/arm/stm32/stm32f4discovery/configs/canard/defconfig @@ -47,7 +47,6 @@ CONFIG_STM32_PWR=y CONFIG_STM32_SPI1=y CONFIG_STM32_USART2=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_USART2_RXBUFSIZE=128 CONFIG_USART2_SERIAL_CONSOLE=y CONFIG_USART2_TXBUFSIZE=128 diff --git a/boards/arm64/a527/avaota-a1/configs/nsh/defconfig b/boards/arm64/a527/avaota-a1/configs/nsh/defconfig index 2a3ea4ff439..bb19b8e8c96 100644 --- a/boards/arm64/a527/avaota-a1/configs/nsh/defconfig +++ b/boards/arm64/a527/avaota-a1/configs/nsh/defconfig @@ -100,7 +100,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y diff --git a/boards/arm64/a64/pinephone/configs/lcd/defconfig b/boards/arm64/a64/pinephone/configs/lcd/defconfig index b41ef5838d6..fe7dcbb5b9a 100644 --- a/boards/arm64/a64/pinephone/configs/lcd/defconfig +++ b/boards/arm64/a64/pinephone/configs/lcd/defconfig @@ -56,7 +56,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm64/a64/pinephone/configs/lvgl/defconfig b/boards/arm64/a64/pinephone/configs/lvgl/defconfig index 3b4ea8b478b..0ef07654d03 100644 --- a/boards/arm64/a64/pinephone/configs/lvgl/defconfig +++ b/boards/arm64/a64/pinephone/configs/lvgl/defconfig @@ -74,7 +74,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm64/a64/pinephone/configs/nsh/defconfig b/boards/arm64/a64/pinephone/configs/nsh/defconfig index d0ab13e1872..6e0c3e871e6 100644 --- a/boards/arm64/a64/pinephone/configs/nsh/defconfig +++ b/boards/arm64/a64/pinephone/configs/nsh/defconfig @@ -55,7 +55,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm64/a64/pinephone/configs/sensor/defconfig b/boards/arm64/a64/pinephone/configs/sensor/defconfig index 4f37be269d7..3f47ffff447 100644 --- a/boards/arm64/a64/pinephone/configs/sensor/defconfig +++ b/boards/arm64/a64/pinephone/configs/sensor/defconfig @@ -60,7 +60,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm64/bcm2711/raspberrypi-4b/configs/cgol/defconfig b/boards/arm64/bcm2711/raspberrypi-4b/configs/cgol/defconfig index c2541e404d3..d035f7ec0dc 100644 --- a/boards/arm64/bcm2711/raspberrypi-4b/configs/cgol/defconfig +++ b/boards/arm64/bcm2711/raspberrypi-4b/configs/cgol/defconfig @@ -57,7 +57,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_USEC_PER_TICK=1000 CONFIG_USERLED=y diff --git a/boards/arm64/bcm2711/raspberrypi-4b/configs/coremark/defconfig b/boards/arm64/bcm2711/raspberrypi-4b/configs/coremark/defconfig index d8132365166..f0a578581d1 100644 --- a/boards/arm64/bcm2711/raspberrypi-4b/configs/coremark/defconfig +++ b/boards/arm64/bcm2711/raspberrypi-4b/configs/coremark/defconfig @@ -50,6 +50,5 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_READLINE=y -CONFIG_SYSTEM_TIME64=y CONFIG_USEC_PER_TICK=1000 CONFIG_USERLED=y diff --git a/boards/arm64/bcm2711/raspberrypi-4b/configs/fb/defconfig b/boards/arm64/bcm2711/raspberrypi-4b/configs/fb/defconfig index 59751ea74f0..e541de7ba6c 100644 --- a/boards/arm64/bcm2711/raspberrypi-4b/configs/fb/defconfig +++ b/boards/arm64/bcm2711/raspberrypi-4b/configs/fb/defconfig @@ -52,7 +52,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_USEC_PER_TICK=1000 CONFIG_USERLED=y diff --git a/boards/arm64/bcm2711/raspberrypi-4b/configs/lvgl/defconfig b/boards/arm64/bcm2711/raspberrypi-4b/configs/lvgl/defconfig index 15cb9dd21fb..e113198d882 100644 --- a/boards/arm64/bcm2711/raspberrypi-4b/configs/lvgl/defconfig +++ b/boards/arm64/bcm2711/raspberrypi-4b/configs/lvgl/defconfig @@ -61,7 +61,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_USEC_PER_TICK=1000 CONFIG_USERLED=y CONFIG_VIDEO_FB=y diff --git a/boards/arm64/bcm2711/raspberrypi-4b/configs/nsh/defconfig b/boards/arm64/bcm2711/raspberrypi-4b/configs/nsh/defconfig index 2be27f46112..1e204002e99 100644 --- a/boards/arm64/bcm2711/raspberrypi-4b/configs/nsh/defconfig +++ b/boards/arm64/bcm2711/raspberrypi-4b/configs/nsh/defconfig @@ -53,7 +53,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_USEC_PER_TICK=1000 diff --git a/boards/arm64/bcm2711/raspberrypi-4b/configs/ostest/defconfig b/boards/arm64/bcm2711/raspberrypi-4b/configs/ostest/defconfig index 3834e257aa3..a78275b19ad 100644 --- a/boards/arm64/bcm2711/raspberrypi-4b/configs/ostest/defconfig +++ b/boards/arm64/bcm2711/raspberrypi-4b/configs/ostest/defconfig @@ -49,7 +49,6 @@ CONFIG_START_MONTH=11 CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_READLINE=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_LOOPS=5 CONFIG_USEC_PER_TICK=1000 diff --git a/boards/arm64/bcm2711/raspberrypi-4b/configs/sd/defconfig b/boards/arm64/bcm2711/raspberrypi-4b/configs/sd/defconfig index 44e65724129..6ae41febc3a 100644 --- a/boards/arm64/bcm2711/raspberrypi-4b/configs/sd/defconfig +++ b/boards/arm64/bcm2711/raspberrypi-4b/configs/sd/defconfig @@ -70,7 +70,6 @@ CONFIG_SYSLOG_INTBUFFER=y CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SD_STRESS=y diff --git a/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest/defconfig b/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest/defconfig index 1b3f2331820..168dc7bf975 100644 --- a/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest/defconfig +++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest/defconfig @@ -54,7 +54,6 @@ CONFIG_SYSLOG_PROCESSID=y CONFIG_SYSLOG_PROCESS_NAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_BASE=0x9c090000 diff --git a/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest_smp/defconfig b/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest_smp/defconfig index d9c9cc00e0f..773349ed853 100644 --- a/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest_smp/defconfig +++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/citest_smp/defconfig @@ -54,7 +54,6 @@ CONFIG_SYSLOG_PROCESS_NAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y diff --git a/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh/defconfig b/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh/defconfig index df3fac0fde6..a8c96f21b0d 100644 --- a/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh/defconfig +++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh/defconfig @@ -54,7 +54,6 @@ CONFIG_SYSLOG_PROCESSID=y CONFIG_SYSLOG_PROCESS_NAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_BASE=0x9c090000 diff --git a/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh_smp/defconfig b/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh_smp/defconfig index ca05a63b073..033070feb94 100644 --- a/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh_smp/defconfig +++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/nsh_smp/defconfig @@ -56,7 +56,6 @@ CONFIG_SYSLOG_PROCESS_NAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y diff --git a/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh/defconfig b/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh/defconfig index 9e59d24629a..3a788a27b33 100644 --- a/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh/defconfig +++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh/defconfig @@ -63,7 +63,6 @@ CONFIG_SYSLOG_PROCESSID=y CONFIG_SYSLOG_PROCESS_NAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y diff --git a/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh_smp/defconfig b/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh_smp/defconfig index 116ccd08d7c..2dcebe9a1b7 100644 --- a/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh_smp/defconfig +++ b/boards/arm64/fvp-v8r/fvp-armv8r/configs/pnsh_smp/defconfig @@ -65,7 +65,6 @@ CONFIG_SYSLOG_PROCESS_NAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y diff --git a/boards/arm64/imx8/imx8qm-mek/configs/nsh/defconfig b/boards/arm64/imx8/imx8qm-mek/configs/nsh/defconfig index 7be578bad8a..d5107d92e5a 100644 --- a/boards/arm64/imx8/imx8qm-mek/configs/nsh/defconfig +++ b/boards/arm64/imx8/imx8qm-mek/configs/nsh/defconfig @@ -52,7 +52,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_SERIAL_CONSOLE=y diff --git a/boards/arm64/imx9/imx93-evk/configs/bootloader/defconfig b/boards/arm64/imx9/imx93-evk/configs/bootloader/defconfig index 1334a733c7c..75c82169d0e 100644 --- a/boards/arm64/imx9/imx93-evk/configs/bootloader/defconfig +++ b/boards/arm64/imx9/imx93-evk/configs/bootloader/defconfig @@ -120,6 +120,5 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm64/imx9/imx93-evk/configs/knsh/defconfig b/boards/arm64/imx9/imx93-evk/configs/knsh/defconfig index fbe97a26410..eb90f69198d 100644 --- a/boards/arm64/imx9/imx93-evk/configs/knsh/defconfig +++ b/boards/arm64/imx9/imx93-evk/configs/knsh/defconfig @@ -166,6 +166,5 @@ CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" CONFIG_SYSTEM_PING=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_TLS_LOG2_MAXSTACK=15 diff --git a/boards/arm64/imx9/imx93-evk/configs/koptee/defconfig b/boards/arm64/imx9/imx93-evk/configs/koptee/defconfig index 4cf697e75f2..18a8e405efb 100644 --- a/boards/arm64/imx9/imx93-evk/configs/koptee/defconfig +++ b/boards/arm64/imx9/imx93-evk/configs/koptee/defconfig @@ -171,6 +171,5 @@ CONFIG_SYSTEM_I2CTOOL=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" CONFIG_SYSTEM_PING=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=24 CONFIG_TLS_LOG2_MAXSTACK=15 diff --git a/boards/arm64/imx9/imx93-evk/configs/nsh/defconfig b/boards/arm64/imx9/imx93-evk/configs/nsh/defconfig index e624827cadf..a7bbeb876d3 100644 --- a/boards/arm64/imx9/imx93-evk/configs/nsh/defconfig +++ b/boards/arm64/imx9/imx93-evk/configs/nsh/defconfig @@ -107,6 +107,5 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SPITOOL=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm64/imx9/imx93-evk/configs/optee/defconfig b/boards/arm64/imx9/imx93-evk/configs/optee/defconfig index 96033d349a2..17663630086 100644 --- a/boards/arm64/imx9/imx93-evk/configs/optee/defconfig +++ b/boards/arm64/imx9/imx93-evk/configs/optee/defconfig @@ -105,4 +105,3 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y diff --git a/boards/arm64/imx9/imx95-a55-evk/configs/emmc/defconfig b/boards/arm64/imx9/imx95-a55-evk/configs/emmc/defconfig index 7dde565cc41..a519a761de8 100644 --- a/boards/arm64/imx9/imx95-a55-evk/configs/emmc/defconfig +++ b/boards/arm64/imx9/imx95-a55-evk/configs/emmc/defconfig @@ -75,6 +75,5 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm64/imx9/imx95-a55-evk/configs/nsh/defconfig b/boards/arm64/imx9/imx95-a55-evk/configs/nsh/defconfig index 3ee6ff9fa35..89c643468cf 100644 --- a/boards/arm64/imx9/imx95-a55-evk/configs/nsh/defconfig +++ b/boards/arm64/imx9/imx95-a55-evk/configs/nsh/defconfig @@ -62,6 +62,5 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig index 66c8a52ae94..0702bcc4749 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/citest/defconfig @@ -56,7 +56,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SETLOGMASK=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_KASAN=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/defconfig index 19889d26648..213b047905b 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/citest_smp/defconfig @@ -53,7 +53,6 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SETLOGMASK=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=16384 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/fastboot/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/fastboot/defconfig index 3b84dbcab3d..d73d4758121 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/fastboot/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/fastboot/defconfig @@ -102,7 +102,6 @@ CONFIG_SYSTEM_NXRECORDER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_POPEN=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig index f9a11164c19..c0f92f0d220 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/fb/defconfig @@ -69,7 +69,6 @@ CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_FDTDUMP=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/gdbstub/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/gdbstub/defconfig index 93a62e7025c..c3f725a61af 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/gdbstub/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/gdbstub/defconfig @@ -69,7 +69,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_GPROF=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/knsh/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/knsh/defconfig index 20f9f27d3fd..a4eb364ffaf 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/knsh/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/knsh/defconfig @@ -96,7 +96,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/mte/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/mte/defconfig index f44759c8ea6..1b7ef28de0f 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/mte/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/mte/defconfig @@ -65,7 +65,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_GPROF=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig index 34e9281a515..1f075e6fed4 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh/defconfig @@ -106,7 +106,6 @@ CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_NXRECORDER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig index 7f687ee47d3..7e6243f1065 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_hv/defconfig @@ -97,7 +97,6 @@ CONFIG_SYSTEM_NXPLAYER=y CONFIG_SYSTEM_NXRECORDER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig index 7ed8642c99a..f914b4df735 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp/defconfig @@ -96,7 +96,6 @@ CONFIG_SYSTEM_NXRECORDER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig index 755ebe35b3e..bc97cc7b674 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/netnsh_smp_hv/defconfig @@ -97,7 +97,6 @@ CONFIG_SYSTEM_NXRECORDER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/nsh/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/nsh/defconfig index 9a11093c1e9..c0c4cf8069b 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/nsh/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/nsh/defconfig @@ -65,7 +65,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_GPROF=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/nsh_fiq/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/nsh_fiq/defconfig index 8ba76bdfa43..dc310319e48 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/nsh_fiq/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/nsh_fiq/defconfig @@ -60,7 +60,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/nsh_gicv2/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/nsh_gicv2/defconfig index a5ae5397910..3f491cd8e9e 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/nsh_gicv2/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/nsh_gicv2/defconfig @@ -55,7 +55,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp/defconfig index 813e8aa0e4f..307125d9648 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp/defconfig @@ -71,7 +71,6 @@ CONFIG_SYSTEM_GCOV=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=16384 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp_tickless/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp_tickless/defconfig index 2bf39e46812..1da7968ef34 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp_tickless/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/nsh_smp_tickless/defconfig @@ -53,7 +53,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=16384 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/rpproxy/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/rpproxy/defconfig index 3189faed2ff..304beb7e1b3 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/rpproxy/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/rpproxy/defconfig @@ -110,7 +110,6 @@ CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_CUTERM=y CONFIG_SYSTEM_DUMPSTACK=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_UART1_BASE=0x9000000 CONFIG_UART1_IRQ=33 CONFIG_UART1_PL011=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/rpserver/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/rpserver/defconfig index 2516372d31e..c44322e4f39 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/rpserver/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/rpserver/defconfig @@ -111,7 +111,6 @@ CONFIG_SYSTEM_CUTERM=y CONFIG_SYSTEM_CUTERM_DEFAULT_DEVICE="/dev/ttyproxy" CONFIG_SYSTEM_DUMPSTACK=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_UART1_BASE=0x9000000 CONFIG_UART1_IRQ=33 CONFIG_UART1_PL011=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/sotest/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/sotest/defconfig index 48c18d5210b..400009d93ba 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/sotest/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/sotest/defconfig @@ -68,7 +68,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART1_BASE=0x9000000 diff --git a/boards/arm64/qemu/qemu-armv8a/configs/sw_tags/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/sw_tags/defconfig index 984fb0fc864..b1278a6541f 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/sw_tags/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/sw_tags/defconfig @@ -62,7 +62,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_KASAN=y CONFIG_TESTING_OSTEST=y diff --git a/boards/arm64/qemu/qemu-armv8a/configs/xedge_demo/defconfig b/boards/arm64/qemu/qemu-armv8a/configs/xedge_demo/defconfig index 68c4633b1d4..95be379c162 100644 --- a/boards/arm64/qemu/qemu-armv8a/configs/xedge_demo/defconfig +++ b/boards/arm64/qemu/qemu-armv8a/configs/xedge_demo/defconfig @@ -106,7 +106,6 @@ CONFIG_SYSTEM_NXRECORDER=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TASKSET=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_SMP=y diff --git a/boards/arm64/rk3399/nanopi_m4/configs/nsh/defconfig b/boards/arm64/rk3399/nanopi_m4/configs/nsh/defconfig index fcbb75e1dc8..cd9d6e9a5af 100644 --- a/boards/arm64/rk3399/nanopi_m4/configs/nsh/defconfig +++ b/boards/arm64/rk3399/nanopi_m4/configs/nsh/defconfig @@ -59,7 +59,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART2_BAUD=1500000 diff --git a/boards/arm64/rk3399/pinephonepro/configs/nsh/defconfig b/boards/arm64/rk3399/pinephonepro/configs/nsh/defconfig index c490398a7c8..c71dd3e0b8a 100644 --- a/boards/arm64/rk3399/pinephonepro/configs/nsh/defconfig +++ b/boards/arm64/rk3399/pinephonepro/configs/nsh/defconfig @@ -58,7 +58,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_USEC_PER_TICK=1000 diff --git a/boards/arm64/zynq-mpsoc/zcu111/configs/jtag/defconfig b/boards/arm64/zynq-mpsoc/zcu111/configs/jtag/defconfig index 1d054bd0561..a4e15d4ddcd 100644 --- a/boards/arm64/zynq-mpsoc/zcu111/configs/jtag/defconfig +++ b/boards/arm64/zynq-mpsoc/zcu111/configs/jtag/defconfig @@ -65,7 +65,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm64/zynq-mpsoc/zcu111/configs/netjtag/defconfig b/boards/arm64/zynq-mpsoc/zcu111/configs/netjtag/defconfig index fd7389d5e66..6509b22d8ce 100644 --- a/boards/arm64/zynq-mpsoc/zcu111/configs/netjtag/defconfig +++ b/boards/arm64/zynq-mpsoc/zcu111/configs/netjtag/defconfig @@ -97,7 +97,6 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm64/zynq-mpsoc/zcu111/configs/netnsh/defconfig b/boards/arm64/zynq-mpsoc/zcu111/configs/netnsh/defconfig index d4f3b29970b..fc05df39186 100644 --- a/boards/arm64/zynq-mpsoc/zcu111/configs/netnsh/defconfig +++ b/boards/arm64/zynq-mpsoc/zcu111/configs/netnsh/defconfig @@ -91,7 +91,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/arm64/zynq-mpsoc/zcu111/configs/nsh/defconfig b/boards/arm64/zynq-mpsoc/zcu111/configs/nsh/defconfig index 7a387d34159..176f15698e1 100644 --- a/boards/arm64/zynq-mpsoc/zcu111/configs/nsh/defconfig +++ b/boards/arm64/zynq-mpsoc/zcu111/configs/nsh/defconfig @@ -64,7 +64,6 @@ CONFIG_START_YEAR=2022 CONFIG_SYMTAB_ORDEREDBYNAME=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_SYSTEM=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/risc-v/c906/smartl-c906/configs/sotest/defconfig b/boards/risc-v/c906/smartl-c906/configs/sotest/defconfig index 800ff3aa6a7..9e5caac9e0d 100644 --- a/boards/risc-v/c906/smartl-c906/configs/sotest/defconfig +++ b/boards/risc-v/c906/smartl-c906/configs/sotest/defconfig @@ -59,7 +59,6 @@ CONFIG_START_DAY=7 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2021 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/risc-v/litex/arty_a7/configs/knsh-tickless/defconfig b/boards/risc-v/litex/arty_a7/configs/knsh-tickless/defconfig index 8f734427482..c45bab704f5 100644 --- a/boards/risc-v/litex/arty_a7/configs/knsh-tickless/defconfig +++ b/boards/risc-v/litex/arty_a7/configs/knsh-tickless/defconfig @@ -81,7 +81,6 @@ CONFIG_SYSLOG_TIMESTAMP=y CONFIG_SYSTEM_CLE=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_UART0_RXBUFSIZE=128 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig b/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig index eb81a2f9a9e..83a0ad53bfe 100644 --- a/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/hwtest/defconfig @@ -114,7 +114,6 @@ CONFIG_SYSTEM_COLOR_CLE=y CONFIG_SYSTEM_MDIO=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig index 60de58df5f3..069db7380ac 100644 --- a/boards/risc-v/mpfs/icicle/configs/knsh/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/knsh/defconfig @@ -98,7 +98,6 @@ CONFIG_START_YEAR=2021 CONFIG_SYSTEM_CLE_CMD_HISTORY=y CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_CXXTEST=y CONFIG_TLS_NELEM=4 CONFIG_UART1_SERIAL_CONSOLE=y diff --git a/boards/risc-v/mpfs/icicle/configs/nsh/defconfig b/boards/risc-v/mpfs/icicle/configs/nsh/defconfig index ef1553cbbc6..2be999dccb5 100644 --- a/boards/risc-v/mpfs/icicle/configs/nsh/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/nsh/defconfig @@ -62,7 +62,6 @@ CONFIG_START_MONTH=4 CONFIG_START_YEAR=2021 CONFIG_SYSTEM_CLE_CMD_HISTORY=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig b/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig index 37ab62086e7..4157f76c377 100644 --- a/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/opensbi/defconfig @@ -60,6 +60,5 @@ CONFIG_STACK_COLORATION=y CONFIG_START_MONTH=4 CONFIG_START_YEAR=2021 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/risc-v/mpfs/icicle/configs/pnsh/defconfig b/boards/risc-v/mpfs/icicle/configs/pnsh/defconfig index b05818d4184..0547f894477 100644 --- a/boards/risc-v/mpfs/icicle/configs/pnsh/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/pnsh/defconfig @@ -69,7 +69,6 @@ CONFIG_START_MONTH=4 CONFIG_START_YEAR=2021 CONFIG_SYSTEM_CLE_CMD_HISTORY=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig index e5ad790b501..48abe3e9ea7 100644 --- a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch1/defconfig @@ -92,6 +92,5 @@ CONFIG_STACK_COLORATION=y CONFIG_START_MONTH=4 CONFIG_START_YEAR=2021 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_UART1_SERIAL_CONSOLE=y diff --git a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig index 012d84a04c5..1d85850a767 100644 --- a/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/rpmsg-ch2/defconfig @@ -91,6 +91,5 @@ CONFIG_STACK_COLORATION=y CONFIG_START_MONTH=4 CONFIG_START_YEAR=2021 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_UART2_SERIAL_CONSOLE=y diff --git a/boards/risc-v/mpfs/icicle/configs/rpmsg-sbi/defconfig b/boards/risc-v/mpfs/icicle/configs/rpmsg-sbi/defconfig index a30310550d0..5f82b5ca466 100644 --- a/boards/risc-v/mpfs/icicle/configs/rpmsg-sbi/defconfig +++ b/boards/risc-v/mpfs/icicle/configs/rpmsg-sbi/defconfig @@ -69,6 +69,5 @@ CONFIG_STACK_COLORATION=y CONFIG_START_MONTH=4 CONFIG_START_YEAR=2021 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_UART0_SERIAL_CONSOLE=y diff --git a/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig b/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig index 01f66baea01..c395a2758b6 100644 --- a/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig +++ b/boards/risc-v/mpfs/m100pfsevp/configs/nsh/defconfig @@ -63,7 +63,6 @@ CONFIG_SYSLOG_COLOR_OUTPUT=y CONFIG_SYSTEM_CLE_CMD_HISTORY=y CONFIG_SYSTEM_COLOR_CLE=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=20 CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y diff --git a/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig b/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig index 2117caf6d91..90c9cb6b482 100644 --- a/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig +++ b/boards/risc-v/qemu-rv/rv-virt/configs/citest64/defconfig @@ -79,7 +79,6 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_POPEN=y CONFIG_SYSTEM_POPEN_STACKSIZE=3072 CONFIG_SYSTEM_SETLOGMASK=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_HEAP=y CONFIG_TESTING_OSTEST=y diff --git a/boards/sim/sim/sim/configs/matter/defconfig b/boards/sim/sim/sim/configs/matter/defconfig index 6af80c8d209..5d41be8ff1a 100644 --- a/boards/sim/sim/sim/configs/matter/defconfig +++ b/boards/sim/sim/sim/configs/matter/defconfig @@ -118,7 +118,6 @@ CONFIG_SYSTEM_PING6=y CONFIG_SYSTEM_PING6_STACKSIZE=4096 CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_PING_STACKSIZE=4096 -CONFIG_SYSTEM_TIME64=y CONFIG_TLS_NELEM=4 CONFIG_TLS_TASK_NELEM=4 CONFIG_UART_BTH4=y diff --git a/boards/sim/sim/sim/configs/ostest/defconfig b/boards/sim/sim/sim/configs/ostest/defconfig index 039e387bda1..823979e2aed 100644 --- a/boards/sim/sim/sim/configs/ostest/defconfig +++ b/boards/sim/sim/sim/configs/ostest/defconfig @@ -34,7 +34,6 @@ CONFIG_SIM_WALLTIME_SIGNAL=y CONFIG_START_DAY=27 CONFIG_START_MONTH=2 CONFIG_START_YEAR=2007 -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_LOOPS=5 CONFIG_TESTING_OSTEST_POWEROFF=y diff --git a/boards/sim/sim/sim/configs/rtptools/defconfig b/boards/sim/sim/sim/configs/rtptools/defconfig index 12e71d8a88b..4e73f76b988 100644 --- a/boards/sim/sim/sim/configs/rtptools/defconfig +++ b/boards/sim/sim/sim/configs/rtptools/defconfig @@ -103,7 +103,6 @@ CONFIG_SYSTEM_PING6=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TELNET_CLIENT=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=32 CONFIG_TELNET_TXBUFFER_SIZE=64 CONFIG_TLS_NCLEANUP=2 diff --git a/boards/sim/sim/sim/configs/tcpblaster/defconfig b/boards/sim/sim/sim/configs/tcpblaster/defconfig index 0308a5e9dee..b21851917af 100644 --- a/boards/sim/sim/sim/configs/tcpblaster/defconfig +++ b/boards/sim/sim/sim/configs/tcpblaster/defconfig @@ -102,7 +102,6 @@ CONFIG_SYSTEM_PING6=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_TELNET_CLIENT=y -CONFIG_SYSTEM_TIME64=y CONFIG_TASK_NAME_SIZE=32 CONFIG_TELNET_TXBUFFER_SIZE=64 CONFIG_TLS_NCLEANUP=2 diff --git a/boards/sim/sim/sim/configs/windows/defconfig b/boards/sim/sim/sim/configs/windows/defconfig index f734204fbec..43dedf3e25e 100644 --- a/boards/sim/sim/sim/configs/windows/defconfig +++ b/boards/sim/sim/sim/configs/windows/defconfig @@ -62,5 +62,4 @@ CONFIG_SIM_HOSTFS=y CONFIG_SIM_STACKSIZE_ADJUSTMENT=10240 CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y diff --git a/boards/sim/sim/sim/configs/windows64/defconfig b/boards/sim/sim/sim/configs/windows64/defconfig index 26a7968ad28..f4bfe5a1b65 100644 --- a/boards/sim/sim/sim/configs/windows64/defconfig +++ b/boards/sim/sim/sim/configs/windows64/defconfig @@ -61,5 +61,4 @@ CONFIG_SIM_HOSTFS=y CONFIG_SIM_STACKSIZE_ADJUSTMENT=10240 CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/configs/nsh/defconfig b/boards/tricore/tc397/a2g-tc397-5v-tft/configs/nsh/defconfig index 45dae69b73f..fe5e74cabec 100644 --- a/boards/tricore/tc397/a2g-tc397-5v-tft/configs/nsh/defconfig +++ b/boards/tricore/tc397/a2g-tc397-5v-tft/configs/nsh/defconfig @@ -55,4 +55,3 @@ CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_SCHED_EVENTS=y CONFIG_HRTIMER=y -CONFIG_SYSTEM_TIME64=y \ No newline at end of file diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/configs/nsh/defconfig b/boards/tricore/tc4da/triboard_tc4x9_com/configs/nsh/defconfig index 06a255ac82f..bc98db1f0cc 100644 --- a/boards/tricore/tc4da/triboard_tc4x9_com/configs/nsh/defconfig +++ b/boards/tricore/tc4da/triboard_tc4x9_com/configs/nsh/defconfig @@ -55,4 +55,3 @@ CONFIG_TESTING_GETPRIME=y CONFIG_TESTING_OSTEST=y CONFIG_UART0_SERIAL_CONSOLE=y CONFIG_SCHED_EVENTS=y -CONFIG_SYSTEM_TIME64=y diff --git a/boards/x86_64/qemu/qemu-intel64/configs/earlyfb/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/earlyfb/defconfig index c0aa44d8e45..1ce0f942b37 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/earlyfb/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/earlyfb/defconfig @@ -57,5 +57,4 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_CLE=y CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_USEC_PER_TICK=1 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/fb/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/fb/defconfig index 7d0635ec26e..d83a14e4564 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/fb/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/fb/defconfig @@ -65,7 +65,6 @@ CONFIG_START_DAY=3 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_USEC_PER_TICK=1 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/jumbo/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/jumbo/defconfig index 8304a6b9eb8..9529e78e60b 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/jumbo/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/jumbo/defconfig @@ -140,7 +140,6 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NXMBCLIENT=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_TCPDUMP=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_TESTING_SMP=y diff --git a/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs/defconfig index b9c40fb6080..ffa2d9cc29f 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs/defconfig @@ -80,7 +80,6 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y CONFIG_TESTING_OSTEST_STACKSIZE=16384 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs_pci/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs_pci/defconfig index 3b9793d9fcb..99dec6f4813 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs_pci/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/knsh_romfs_pci/defconfig @@ -85,7 +85,6 @@ CONFIG_START_YEAR=2011 CONFIG_SYSLOG_DEVPATH="/dev/S1" CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_NSH_PROGNAME="init" -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_FPUTESTDISABLE=y CONFIG_TESTING_OSTEST_STACKSIZE=16384 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/lvgl/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/lvgl/defconfig index b63e95cf7bb..14f4331fa3b 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/lvgl/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/lvgl/defconfig @@ -62,7 +62,6 @@ CONFIG_START_DAY=3 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_USEC_PER_TICK=1 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/nsh/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/nsh/defconfig index dea7aa3295f..770fa588fbd 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/nsh/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/nsh/defconfig @@ -56,7 +56,6 @@ CONFIG_START_DAY=3 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_USEC_PER_TICK=1 diff --git a/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci/defconfig index b212905677e..2afbc73360b 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci/defconfig @@ -59,5 +59,4 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSLOG_DEVPATH="/dev/S1" CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y diff --git a/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci_smp/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci_smp/defconfig index c9cabb9144e..12db1a147a3 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci_smp/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/nsh_pci_smp/defconfig @@ -63,7 +63,6 @@ CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 CONFIG_SYSLOG_DEVPATH="/dev/S1" CONFIG_SYSTEM_NSH=y -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_TESTING_SMP=y diff --git a/boards/x86_64/qemu/qemu-intel64/configs/ostest/defconfig b/boards/x86_64/qemu/qemu-intel64/configs/ostest/defconfig index 0bc21e0db04..71da13062aa 100644 --- a/boards/x86_64/qemu/qemu-intel64/configs/ostest/defconfig +++ b/boards/x86_64/qemu/qemu-intel64/configs/ostest/defconfig @@ -48,7 +48,6 @@ CONFIG_SIG_DEFAULT=y CONFIG_START_DAY=3 CONFIG_START_MONTH=3 CONFIG_START_YEAR=2011 -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TESTING_OSTEST_STACKSIZE=4194304 CONFIG_USEC_PER_TICK=1 diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig b/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig index be1838f78a6..85404bfaadc 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-devkit/configs/python/defconfig @@ -110,7 +110,6 @@ CONFIG_SYSTEM_NSH=y CONFIG_SYSTEM_PING=y CONFIG_SYSTEM_SYSTEM=y CONFIG_SYSTEM_SYSTEM_STACKSIZE=4096 -CONFIG_SYSTEM_TIME64=y CONFIG_TESTING_OSTEST=y CONFIG_TIMER=y CONFIG_TIMER_FD=y diff --git a/drivers/audio/audio_fake.c b/drivers/audio/audio_fake.c index 628093820d8..dd8ad907bfe 100644 --- a/drivers/audio/audio_fake.c +++ b/drivers/audio/audio_fake.c @@ -422,8 +422,8 @@ static int audio_fake_process_buffer(FAR struct audio_lowerhalf_s *dev, frame_time = ((int64_t)apb->nbytes * 1000 * 1000) / priv->scaler; - diff_time = (int64_t)tv2.tv_sec * 1000000 + tv2.tv_usec - - ((int64_t)tv1.tv_sec * 1000000 + tv1.tv_usec); + diff_time = tv2.tv_sec * 1000000 + tv2.tv_usec - + (tv1.tv_sec * 1000000 + tv1.tv_usec); if (diff_time >= frame_time) { diff --git a/drivers/note/noteram_driver.c b/drivers/note/noteram_driver.c index e9d6a43c5fc..e64a48e6d47 100644 --- a/drivers/note/noteram_driver.c +++ b/drivers/note/noteram_driver.c @@ -817,9 +817,9 @@ static int noteram_dump_header(FAR struct lib_outstream_s *s, int cpu = 0; #endif - ret = lib_sprintf(s, "%8s-%-3u [%d] %3" PRIu64 ".%09lu: ", + ret = lib_sprintf(s, "%8s-%-3u [%d] %3" PRIu64 ".%09ld: ", note_get_taskname(pid, buf, TASK_NAME_SIZE), - get_pid(pid), cpu, (uint64_t)ts.tv_sec, ts.tv_nsec); + get_pid(pid), cpu, ts.tv_sec, ts.tv_nsec); return ret; } diff --git a/drivers/note/notesnap_driver.c b/drivers/note/notesnap_driver.c index 441992fa152..47762ef0e45 100644 --- a/drivers/note/notesnap_driver.c +++ b/drivers/note/notesnap_driver.c @@ -398,13 +398,13 @@ void notesnap_dump_with_stream(FAR struct lib_outstream_s *stream) perf_convert(note->count, &time); lib_sprintf(stream, - "snapshoot: [%" PRIu64 ".%09u] " + "snapshoot: [%" PRIu64 ".%09ld] " #ifdef CONFIG_SMP "[CPU%d] " #endif "[%d] %-16s %#" PRIxPTR "\n", - (uint64_t)time.tv_sec, - (unsigned)time.tv_nsec, + time.tv_sec, + time.tv_nsec, #ifdef CONFIG_SMP note->cpu, #endif diff --git a/drivers/power/pm/pm_procfs.c b/drivers/power/pm/pm_procfs.c index 7487f0587e1..36b5f1095e8 100644 --- a/drivers/power/pm/pm_procfs.c +++ b/drivers/power/pm/pm_procfs.c @@ -50,19 +50,11 @@ #define PFHDR "CALLBACKS IDLE STANDBY SLEEP\n" #define WAHDR "DOMAIN%-2d STATE COUNT TIME\n" -#ifdef CONFIG_SYSTEM_TIME64 -# define STFMT "%-18s %8" PRIu64 "s %3" PRIu64 "%% %8" PRIu64 "s %3" \ - PRIu64 "%% %8" PRIu64 "s %3" PRIu64 "%%\n" -# define PFFMT "%-18p %8" PRIu64 "s %3" PRIu64 "%% %8" PRIu64 "s %3" \ - PRIu64 "%% %8" PRIu64 "s %3" PRIu64 "%%\n" -# define WAFMT "%-25s %-14s %-14" PRIu32 " %" PRIu64 "s\n" -#else -# define STFMT "%-18s %8" PRIu32 "s %3" PRIu32 "%% %8" PRIu32 "s %3" \ - PRIu32 "%% %8" PRIu32 "s %3" PRIu32 "%%\n" -# define PFFMT "%-18p %8" PRIu32 "s %3" PRIu32 "%% %8" PRIu32 "s %3" \ - PRIu32 "%% %8" PRIu32 "s %3" PRIu32 "%%\n" -# define WAFMT "%-25s %-14s %-14" PRIu32 " %" PRIu32 "s\n" -#endif +#define STFMT "%-18s %8" PRIu64 "s %3" PRIu64 "%% %8" PRIu64 "s %3" \ + PRIu64 "%% %8" PRIu64 "s %3" PRIu64 "%%\n" +#define PFFMT "%-18p %8" PRIu64 "s %3" PRIu64 "%% %8" PRIu64 "s %3" \ + PRIu64 "%% %8" PRIu64 "s %3" PRIu64 "%%\n" +#define WAFMT "%-25s %-14s %-14" PRIu32 " %" PRIu64 "s\n" /* Determines the size of an intermediate buffer that must be large enough * to handle the longest line generated by this logic (plus a couple of diff --git a/drivers/rpmsg/rpmsg_ping.c b/drivers/rpmsg/rpmsg_ping.c index 8e315ee89a1..e837e8bf94d 100644 --- a/drivers/rpmsg/rpmsg_ping.c +++ b/drivers/rpmsg/rpmsg_ping.c @@ -189,11 +189,7 @@ static void rpmsg_ping_logout(FAR const char *s, clock_t value) perf_convert(value, &ts); -#ifdef CONFIG_SYSTEM_TIME64 syslog(LOG_EMERG, "%s: %" PRIu64 " s, %ld ns\n", s, ts.tv_sec, ts.tv_nsec); -#else - syslog(LOG_EMERG, "%s: %" PRIu32 " s, %ld ns\n", s, ts.tv_sec, ts.tv_nsec); -#endif } static void rpmsg_ping_logout_rate(uint64_t len, clock_t avg) diff --git a/drivers/timers/arch_timer.c b/drivers/timers/arch_timer.c index be343dc154c..c3cf4f83d06 100644 --- a/drivers/timers/arch_timer.c +++ b/drivers/timers/arch_timer.c @@ -114,7 +114,7 @@ static uint64_t current_usec(void) } while (timebase != g_timer.timebase); - return TICK2USEC((uint64_t)timebase) + + return TICK2USEC(timebase) + (status.timeout - status.timeleft); } diff --git a/fs/procfs/fs_procfscritmon.c b/fs/procfs/fs_procfscritmon.c index ba743bc1104..e2681b48f38 100644 --- a/fs/procfs/fs_procfscritmon.c +++ b/fs/procfs/fs_procfscritmon.c @@ -330,7 +330,7 @@ static ssize_t critmon_read_cpu(FAR struct critmon_file_s *attr, } elapsed = clock() * CONFIG_USEC_PER_TICK; - rate = (uint64_t)(all_time.tv_sec * 1000000 + all_time.tv_nsec / 1000) * + rate = (all_time.tv_sec * 1000000 + all_time.tv_nsec / 1000) * 1000000 / elapsed; /* Generate output for all busywait time to enter csection(get spinlock) */ diff --git a/fs/procfs/fs_procfsuptime.c b/fs/procfs/fs_procfsuptime.c index 99b866e2f71..248c8dedb9d 100644 --- a/fs/procfs/fs_procfsuptime.c +++ b/fs/procfs/fs_procfsuptime.c @@ -195,11 +195,7 @@ static ssize_t uptime_read(FAR struct file *filep, FAR char *buffer, #if defined(CONFIG_HAVE_DOUBLE) && defined(CONFIG_LIBC_FLOATINGPOINT) double now; #else -# if defined(CONFIG_SYSTEM_TIME64) uint64_t sec; -# else - uint32_t sec; -# endif unsigned int remainder; unsigned int csec; #endif @@ -250,13 +246,8 @@ static ssize_t uptime_read(FAR struct file *filep, FAR char *buffer, /* Convert the seconds + hundredths of seconds to a string */ -#ifdef CONFIG_SYSTEM_TIME64 linesize = procfs_snprintf(attr->line, UPTIME_LINELEN, "%7" PRIu64 ".%02u\n", sec, csec); -#else - linesize = procfs_snprintf(attr->line, UPTIME_LINELEN, - "%7" PRIu32 ".%02u\n", sec, csec); -#endif #endif /* Save the linesize in case we are re-entered with f_pos > 0 */ diff --git a/include/inttypes.h b/include/inttypes.h index b0dedee7f5e..6111de0f8fa 100644 --- a/include/inttypes.h +++ b/include/inttypes.h @@ -338,36 +338,6 @@ #define SCNxOFF SCNx32 #endif -/* time_t */ - -#ifdef CONFIG_SYSTEM_TIME64 -#define PRIdTM PRId64 -#define PRIiTM PRIi64 -#define PRIoTM PRIo64 -#define PRIuTM PRIu64 -#define PRIxTM PRIx64 -#define PRIXTM PRIX64 - -#define SCNdTM SCNd64 -#define SCNiTM SCNi64 -#define SCNoTM SCNo64 -#define SCNuTM SCNu64 -#define SCNxTM SCNx64 -#else -#define PRIdTM PRId32 -#define PRIiTM PRIi32 -#define PRIoTM PRIo32 -#define PRIuTM PRIu32 -#define PRIxTM PRIx32 -#define PRIXTM PRIX32 - -#define SCNdTM SCNd32 -#define SCNiTM SCNi32 -#define SCNoTM SCNo32 -#define SCNuTM SCNu32 -#define SCNxTM SCNx32 -#endif - /**************************************************************************** * Type Definitions ****************************************************************************/ diff --git a/include/limits.h b/include/limits.h index 4cf26441614..df58833c20a 100644 --- a/include/limits.h +++ b/include/limits.h @@ -236,11 +236,7 @@ #define TIMER_MAX _POSIX_TIMER_MAX #define CLOCKRES_MIN _POSIX_CLOCKRES_MIN -#ifdef CONFIG_SYSTEM_TIME64 -# define CLOCK_MAX UINT64_MAX -#else -# define CLOCK_MAX UINT32_MAX -#endif +#define CLOCK_MAX UINT64_MAX /* Other invariant values */ diff --git a/include/nuttx/clock.h b/include/nuttx/clock.h index 3485e5568cb..f55b341ca60 100644 --- a/include/nuttx/clock.h +++ b/include/nuttx/clock.h @@ -225,8 +225,7 @@ #define NSEC2MSEC(nsec) div_const(nsec, (uint32_t)NSEC_PER_MSEC) -#if defined(CONFIG_DEBUG_SCHED) && defined(CONFIG_SYSTEM_TIME64) && \ - !defined(CONFIG_SCHED_TICKLESS) +#if defined(CONFIG_DEBUG_SCHED) && !defined(CONFIG_SCHED_TICKLESS) /* Initial system timer ticks value close to maximum 32-bit value, to test * 64-bit system-timer after going over 32-bit value. This is to make errors * of casting 64-bit system-timer to 32-bit variables more visible. @@ -307,11 +306,7 @@ struct cpuload_s * should be used only within the OS proper and not by portable applications. */ -#ifdef CONFIG_SYSTEM_TIME64 typedef int64_t sclock_t; -#else -typedef int32_t sclock_t; -#endif /**************************************************************************** * Public Data diff --git a/include/nuttx/fs/hostfs.h b/include/nuttx/fs/hostfs.h index fbf1e8bca18..fba49f3efbf 100644 --- a/include/nuttx/fs/hostfs.h +++ b/include/nuttx/fs/hostfs.h @@ -136,11 +136,7 @@ typedef int nuttx_fsid_t[2]; /* These must match the definition in include/time.h */ -# ifdef CONFIG_SYSTEM_TIME64 typedef uint64_t nuttx_time_t; -# else -typedef uint32_t nuttx_time_t; -# endif struct nuttx_timespec { diff --git a/include/sys/types.h b/include/sys/types.h index 51b190ae322..93a62d167ed 100644 --- a/include/sys/types.h +++ b/include/sys/types.h @@ -251,13 +251,8 @@ typedef uint16_t sa_family_t; * unsigned type is used to support the full range of the internal clock. */ -#ifdef CONFIG_SYSTEM_TIME64 typedef uint64_t clock_t; typedef uint64_t time_t; /* Holds time in seconds */ -#else -typedef uint32_t clock_t; -typedef uint32_t time_t; /* Holds time in seconds */ -#endif typedef int clockid_t; /* Identifies one time base source */ typedef FAR void *timer_t; /* Represents one POSIX timer */ diff --git a/libs/libc/wqueue/work_usrthread.c b/libs/libc/wqueue/work_usrthread.c index 80748b23482..f4a3663ab10 100644 --- a/libs/libc/wqueue/work_usrthread.c +++ b/libs/libc/wqueue/work_usrthread.c @@ -45,11 +45,7 @@ * Pre-processor Definitions ****************************************************************************/ -#ifdef CONFIG_SYSTEM_TIME64 -# define WORK_DELAY_MAX UINT64_MAX -#else -# define WORK_DELAY_MAX UINT32_MAX -#endif +#define WORK_DELAY_MAX UINT64_MAX /**************************************************************************** * Private Types diff --git a/sched/Kconfig b/sched/Kconfig index 8f07859d397..a2c6fbff12f 100644 --- a/sched/Kconfig +++ b/sched/Kconfig @@ -167,20 +167,6 @@ config SYSTEMTICK_HOOK endif # !SCHED_TICKLESS -config SYSTEM_TIME64 - bool "64-bit system clock" - default n - ---help--- - The system timer is incremented at the rate determined by - USEC_PER_TICK, typically at 100Hz. The count at any given time is - then the "uptime" in units of system timer ticks. By default, the - system time is 32-bits wide. Those defaults provide a range of about - 497 days which is probably a sufficient range for "uptime". - - However, if the system timer rate is significantly higher than 100Hz - and/or if a very long "uptime" is required, then this option can be - selected to support a 64-bit wide timer. - config ARCH_HAVE_ADJTIME bool default n @@ -272,7 +258,7 @@ config PREALLOC_TIMERS config PERF_OVERFLOW_CORRECTION bool "Compensate perf count overflow" - depends on SYSTEM_TIME64 && (ALARM_ARCH || TIMER_ARCH || ARCH_PERF_EVENTS) + depends on ALARM_ARCH || TIMER_ARCH || ARCH_PERF_EVENTS default n ---help--- If this option is enabled, then the perf event will be enabled @@ -2088,7 +2074,6 @@ config CUSTOM_SEMAPHORE_MAXVALUE config HRTIMER bool "High resolution timer support" - depends on SYSTEM_TIME64 default n ---help--- Enable to support high resolution timer
