You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/05/19 20:23:08 UTC
[incubator-nuttx] 02/04: boards/sim: Remove the unnecessary CONFIG_SIM_M32
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 1067b6afc991e60e4ae5c0a19a1086394d028bbc
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun May 15 11:32:44 2022 +0800
boards/sim: Remove the unnecessary CONFIG_SIM_M32
to enable build on macOS
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
boards/sim/sim/sim/configs/elf/defconfig | 1 -
boards/sim/sim/sim/configs/foc/defconfig | 1 -
boards/sim/sim/sim/configs/loadable/defconfig | 1 -
tools/ci/testlist/sim-01.dat | 5 +++--
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/boards/sim/sim/sim/configs/elf/defconfig b/boards/sim/sim/sim/configs/elf/defconfig
index c0e1d425bc..5c5f80727d 100644
--- a/boards/sim/sim/sim/configs/elf/defconfig
+++ b/boards/sim/sim/sim/configs/elf/defconfig
@@ -50,7 +50,6 @@ CONFIG_READLINE_TABCOMPLETION=y
CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
-CONFIG_SIM_M32=y
CONFIG_START_MONTH=6
CONFIG_START_YEAR=2008
CONFIG_SYSTEM_NSH=y
diff --git a/boards/sim/sim/sim/configs/foc/defconfig b/boards/sim/sim/sim/configs/foc/defconfig
index 167e2aa974..5c8bbbbeb0 100644
--- a/boards/sim/sim/sim/configs/foc/defconfig
+++ b/boards/sim/sim/sim/configs/foc/defconfig
@@ -84,7 +84,6 @@ CONFIG_SCHED_HPWORK=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_SPORADIC=y
CONFIG_SCHED_WAITPID=y
-CONFIG_SIM_M32=y
CONFIG_START_MONTH=6
CONFIG_START_YEAR=2008
CONFIG_SYSLOG_CONSOLE=y
diff --git a/boards/sim/sim/sim/configs/loadable/defconfig b/boards/sim/sim/sim/configs/loadable/defconfig
index 08287e76de..a4b698f682 100644
--- a/boards/sim/sim/sim/configs/loadable/defconfig
+++ b/boards/sim/sim/sim/configs/loadable/defconfig
@@ -47,7 +47,6 @@ CONFIG_SCHED_HAVE_PARENT=y
CONFIG_SCHED_ONEXIT=y
CONFIG_SCHED_WAITPID=y
CONFIG_SIM_HOSTFS=y
-CONFIG_SIM_M32=y
CONFIG_START_MONTH=6
CONFIG_START_YEAR=2008
CONFIG_SYSTEM_NSH=m
diff --git a/tools/ci/testlist/sim-01.dat b/tools/ci/testlist/sim-01.dat
index 6e98281dc3..c8f9298512 100644
--- a/tools/ci/testlist/sim-01.dat
+++ b/tools/ci/testlist/sim-01.dat
@@ -6,10 +6,11 @@
# clang doesn't -fsanitize=kernel-address
-Darwin,sim:kasan
-# macOS doesn't support 32bit(CONFIG_SIM_M32=y) anymore
+# macOS doesn't support ELF loading
-Darwin,sim:elf
--Darwin,sim:foc
-Darwin,sim:loadable
+
+# macOS doesn't support 32bit(CONFIG_SIM_M32=y) anymore
-Darwin,sim:module32
# Do not build Linux configs