You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/04/29 18:16:28 UTC
[incubator-nuttx] branch master updated: Kconfig: Refine BUILD_FLAT,
BUILD_PROTECTED and BUILD_KERNEL usage
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new ddda00e Kconfig: Refine BUILD_FLAT, BUILD_PROTECTED and BUILD_KERNEL usage
ddda00e is described below
commit ddda00ea65daeed705db0b3e3262db97bd80719e
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Wed Apr 29 22:52:26 2020 +0800
Kconfig: Refine BUILD_FLAT, BUILD_PROTECTED and BUILD_KERNEL usage
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
Kconfig | 1 -
libs/libc/builtin/Kconfig | 2 +-
libs/libc/dlfcn/Kconfig | 3 ---
libs/libc/wqueue/Kconfig | 2 +-
mm/Kconfig | 2 +-
sched/Kconfig | 8 ++++----
6 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/Kconfig b/Kconfig
index d20c362..a9e4cb0 100644
--- a/Kconfig
+++ b/Kconfig
@@ -229,7 +229,6 @@ endchoice # Build configuration
config BUILD_2PASS
bool "Two pass build"
default n
- depends on !BUILD_KERNEL
---help---
Enables the two pass build options.
diff --git a/libs/libc/builtin/Kconfig b/libs/libc/builtin/Kconfig
index b2939a6..ad94ced 100644
--- a/libs/libc/builtin/Kconfig
+++ b/libs/libc/builtin/Kconfig
@@ -6,7 +6,7 @@
config BUILTIN
bool "Support Builtin Applications"
default n
- depends on !BUILD_KERNEL || EXPERIMENTAL
+ depends on !BUILD_KERNEL
---help---
Enable support for builtin applications. This features assigns a string
name to an application and in addition if FS_BINFS is defined, retaining
diff --git a/libs/libc/dlfcn/Kconfig b/libs/libc/dlfcn/Kconfig
index fd4b3b3..79a351f 100644
--- a/libs/libc/dlfcn/Kconfig
+++ b/libs/libc/dlfcn/Kconfig
@@ -10,12 +10,9 @@ config LIBC_DLFCN
default n
select LIBC_MODLIB if !BUILD_FLAT
select MODULE if BUILD_FLAT
- depends on EXPERIMENTAL || !BUILD_KERNEL
---help---
Enabled support for user-space shared libraries.
- A work in progress, hence, marked EXPERIMENTAL
-
if LIBC_DLFCN
config LDPATH_INITIAL
diff --git a/libs/libc/wqueue/Kconfig b/libs/libc/wqueue/Kconfig
index 1fd1bfe..b9afc34 100644
--- a/libs/libc/wqueue/Kconfig
+++ b/libs/libc/wqueue/Kconfig
@@ -4,7 +4,7 @@
#
menu "User Work Queue Support"
- depends on BUILD_PROTECTED || BUILD_KERNEL
+ depends on !BUILD_FLAT
config LIB_USRWORK
bool "User mode worker thread"
diff --git a/mm/Kconfig b/mm/Kconfig
index 02caa03..e4b8170 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -6,7 +6,7 @@
config MM_KERNEL_HEAP
bool "Support a protected, kernel heap"
default y
- depends on BUILD_PROTECTED || BUILD_KERNEL
+ depends on !BUILD_FLAT
---help---
Partition heap memory into two parts: (1) a protected, kernel-mode
heap accessible only by the NuttX kernel, and (2) an unprotected
diff --git a/sched/Kconfig b/sched/Kconfig
index 1753286..9367a59 100644
--- a/sched/Kconfig
+++ b/sched/Kconfig
@@ -341,8 +341,8 @@ endif # SMP
choice
prompt "Initialization Task"
default INIT_ENTRYPOINT if !BUILD_KERNEL
- default INIT_FILEPATH if BUILD_KERNEL && !BINFMT_DISABLE
- default INIT_NONE if BUILD_KERNEL && BINFMT_DISABLE
+ default INIT_FILEPATH if !BINFMT_DISABLE
+ default INIT_NONE if BINFMT_DISABLE
config INIT_NONE
bool "None"
@@ -388,7 +388,7 @@ config INIT_SYMTAB
string "Symbol table"
default "NULL" if !EXECFUNCS_HAVE_SYMTAB
default EXECFUNCS_SYMTAB_ARRAY if EXECFUNCS_HAVE_SYMTAB
- depends on !BUILD_PROTECTED && !BUILD_KERNEL
+ depends on BUILD_FLAT
---help---
The name of other global array that holds the exported symbol table.
The special string "NULL" may be provided if there is no symbol
@@ -402,7 +402,7 @@ config INIT_NEXPORTS
string "Symbol table size"
default "0" if !EXECFUNCS_HAVE_SYMTAB
default EXECFUNCS_NSYMBOLS_VAR if EXECFUNCS_HAVE_SYMTAB
- depends on !BUILD_PROTECTED && !BUILD_KERNEL
+ depends on BUILD_FLAT
---help---
The size of the symbol table. NOTE that is is logically a numeric
value but is represent by a string. That allows you to put