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 2025/01/02 15:13:13 UTC

(nuttx) branch master updated: arch/qemu-armv7a: kernel mode cmake support

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


The following commit(s) were added to refs/heads/master by this push:
     new 6fb12b0284 arch/qemu-armv7a: kernel mode cmake support
6fb12b0284 is described below

commit 6fb12b0284adeb79c368e2ee72a1194ee2bcf929
Author: Yanfeng Liu <p-...@xiaomi.com>
AuthorDate: Thu Jan 2 18:02:55 2025 +0800

    arch/qemu-armv7a: kernel mode cmake support
    
    This allows to build kernel mode NuttX with cmake.
    
    Signed-off-by: Yanfeng Liu <p-...@xiaomi.com>
---
 arch/arm/src/CMakeLists.txt      | 2 +-
 arch/arm/src/qemu/CMakeLists.txt | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/arch/arm/src/CMakeLists.txt b/arch/arm/src/CMakeLists.txt
index e176d04c5c..4f9ff8d089 100644
--- a/arch/arm/src/CMakeLists.txt
+++ b/arch/arm/src/CMakeLists.txt
@@ -29,7 +29,7 @@ add_subdirectory(common)
 target_include_directories(arch BEFORE PUBLIC ${NUTTX_CHIP_ABS_DIR} common
                                               ${ARCH_SUBDIR})
 
-if(NOT CONFIG_BUILD_FLAT)
+if(CONFIG_BUILD_PROTECTED)
   target_include_directories(arch_interface BEFORE PUBLIC ${NUTTX_CHIP_ABS_DIR}
                                                           common ${ARCH_SUBDIR})
 endif()
diff --git a/arch/arm/src/qemu/CMakeLists.txt b/arch/arm/src/qemu/CMakeLists.txt
index 4784d64ccd..3c6b52b4b3 100644
--- a/arch/arm/src/qemu/CMakeLists.txt
+++ b/arch/arm/src/qemu/CMakeLists.txt
@@ -30,4 +30,8 @@ if(CONFIG_ARCH_IDLE_CUSTOM)
   list(APPEND SRCS qemu_idle.c)
 endif()
 
+if(CONFIG_BUILD_KERNEL)
+  list(APPEND SRCS qemu_pgalloc.c)
+endif()
+
 target_sources(arch PRIVATE ${SRCS})