You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2024/03/09 03:52:37 UTC
(nuttx) 03/03: arch/intel64: move timer frequency configuration to common files
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 0fe777abd486ece2f025e3ba10f4b696eb585a63
Author: p-szafonimateusz <p-...@xiaomi.com>
AuthorDate: Fri Mar 1 10:38:34 2024 +0100
arch/intel64: move timer frequency configuration to common files
this logic can be common for intel64 chips
Signed-off-by: p-szafonimateusz <p-...@xiaomi.com>
---
arch/x86_64/src/intel64/CMakeLists.txt | 1 +
arch/x86_64/src/intel64/Make.defs | 2 +-
.../src/qemu_freq.c => arch/x86_64/src/intel64/intel64_freq.c | 2 +-
boards/x86_64/intel64/qemu-intel64/src/CMakeLists.txt | 2 +-
boards/x86_64/intel64/qemu-intel64/src/Makefile | 2 +-
5 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/x86_64/src/intel64/CMakeLists.txt b/arch/x86_64/src/intel64/CMakeLists.txt
index 4ad7f3e9f5..f36f46f06e 100644
--- a/arch/x86_64/src/intel64/CMakeLists.txt
+++ b/arch/x86_64/src/intel64/CMakeLists.txt
@@ -37,6 +37,7 @@ set(SRCS
intel64_sigdeliver.c
intel64_usestack.c
intel64_systemreset.c
+ intel64_freq.c
intel64_start.c
intel64_handlers.c
intel64_idle.c
diff --git a/arch/x86_64/src/intel64/Make.defs b/arch/x86_64/src/intel64/Make.defs
index 80b1ffd8f5..5e3b4f3b8e 100644
--- a/arch/x86_64/src/intel64/Make.defs
+++ b/arch/x86_64/src/intel64/Make.defs
@@ -34,7 +34,7 @@ CMN_CSRCS += intel64_map_region.c intel64_regdump.c intel64_releasestack.c
CMN_CSRCS += intel64_rtc.c intel64_restore_auxstate.c intel64_savestate.c
CMN_CSRCS += intel64_stackframe.c intel64_schedulesigaction.c
CMN_CSRCS += intel64_sigdeliver.c intel64_usestack.c x86_64_tcbinfo.c
-CMN_CSRCS += intel64_systemreset.c
+CMN_CSRCS += intel64_systemreset.c intel64_freq.c
# Required Intel64 files
diff --git a/boards/x86_64/intel64/qemu-intel64/src/qemu_freq.c b/arch/x86_64/src/intel64/intel64_freq.c
similarity index 98%
rename from boards/x86_64/intel64/qemu-intel64/src/qemu_freq.c
rename to arch/x86_64/src/intel64/intel64_freq.c
index 1a8c6a2eff..421daaa6ea 100644
--- a/boards/x86_64/intel64/qemu-intel64/src/qemu_freq.c
+++ b/arch/x86_64/src/intel64/intel64_freq.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * boards/x86_64/intel64/qemu-intel64/src/qemu_freq.c
+ * arch/x86_64/src/intel64/intel64_freq.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
diff --git a/boards/x86_64/intel64/qemu-intel64/src/CMakeLists.txt b/boards/x86_64/intel64/qemu-intel64/src/CMakeLists.txt
index 84bd010323..9ea53ac0f9 100644
--- a/boards/x86_64/intel64/qemu-intel64/src/CMakeLists.txt
+++ b/boards/x86_64/intel64/qemu-intel64/src/CMakeLists.txt
@@ -18,7 +18,7 @@
#
# ##############################################################################
-set(SRCS qemu_boot.c qemu_bringup.c qemu_freq.c qemu_net.c)
+set(SRCS qemu_boot.c qemu_bringup.c qemu_net.c)
if(CONFIG_BOARDCTL)
list(APPEND SRCS qemu_appinit.c)
diff --git a/boards/x86_64/intel64/qemu-intel64/src/Makefile b/boards/x86_64/intel64/qemu-intel64/src/Makefile
index 837b79079a..41d7c4b173 100644
--- a/boards/x86_64/intel64/qemu-intel64/src/Makefile
+++ b/boards/x86_64/intel64/qemu-intel64/src/Makefile
@@ -20,7 +20,7 @@
include $(TOPDIR)/Make.defs
-CSRCS = qemu_boot.c qemu_bringup.c qemu_freq.c qemu_net.c
+CSRCS = qemu_boot.c qemu_bringup.c qemu_net.c
ifeq ($(CONFIG_BOARDCTL),y)
CSRCS += qemu_appinit.c