diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-05 11:25:34 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-05 11:25:34 -0600 |
| commit | 4786d0438effecde73585fefaa6cec4921f70b3c (patch) | |
| tree | 7f20c57dbd38a446a833f2e59e5c994b1bc6bae6 | |
| parent | 46e70207ede819e3855c0b605c57d04c849bfd31 (diff) | |
| download | nuttx-4786d0438effecde73585fefaa6cec4921f70b3c.tar.gz nuttx-4786d0438effecde73585fefaa6cec4921f70b3c.tar.bz2 nuttx-4786d0438effecde73585fefaa6cec4921f70b3c.zip | |
Copy more logic from nuttx/tools/Config.mk into the Make.defs file. Plus trivial related changes
| -rw-r--r-- | apps/Makefile | 8 | ||||
| -rw-r--r-- | apps/examples/elf/Kconfig | 3 | ||||
| -rw-r--r-- | nuttx/configs/sama5d4-ek/kernel/defconfig | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/apps/Makefile b/apps/Makefile index b8d73f995..0ad9596d6 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -35,17 +35,17 @@ # ############################################################################ --include $(TOPDIR)/Make.defs - APPDIR = ${shell pwd} +TOPDIR ?= $(APPDIR)/import + +-include $(TOPDIR)/Make.defs # Application Directories # CONFIGURED_APPS is the list of all configured built-in directories/built # action. # SUBDIRS is the list of all directories containing Makefiles. It is used -# only for cleaning. builtin must always be the first in the list. This -# list can be extended by the .config file as well. +# only for cleaning. builtin must always be the first in the list. CONFIGURED_APPS = SUBDIRS = examples graphics interpreters modbus builtin import nshlib diff --git a/apps/examples/elf/Kconfig b/apps/examples/elf/Kconfig index 87b74dd80..be967324a 100644 --- a/apps/examples/elf/Kconfig +++ b/apps/examples/elf/Kconfig @@ -14,7 +14,7 @@ if EXAMPLES_ELF config EXAMPLES_ELF_SYSCALL bool "Link with SYSCALL library" default n - depends on LIB_SYSCALL + depends on LIB_SYSCALL && !BUILD_KERNEL ---help--- Link with the SYCALL library. By default, all undefined symbols must be provided via a symbol table. But if this option is @@ -26,6 +26,7 @@ config EXAMPLES_ELF_SYSCALL config EXAMPLES_ELF_LIBC bool "Link with LIBC" default n + depends on !BUILD_KERNEL ---help--- Link with the C library (and also math library if it was built). By default, all undefined symbols must be provided via a symbol diff --git a/nuttx/configs/sama5d4-ek/kernel/defconfig b/nuttx/configs/sama5d4-ek/kernel/defconfig index 1df0c099f..dea5111de 100644 --- a/nuttx/configs/sama5d4-ek/kernel/defconfig +++ b/nuttx/configs/sama5d4-ek/kernel/defconfig @@ -740,8 +740,6 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024 # CONFIG_EXAMPLES_CXXTEST is not set # CONFIG_EXAMPLES_DHCPD is not set CONFIG_EXAMPLES_ELF=y -CONFIG_EXAMPLES_ELF_SYSCALL=y -# CONFIG_EXAMPLES_ELF_LIBC is not set CONFIG_EXAMPLES_ELF_DEVMINOR=0 CONFIG_EXAMPLES_ELF_DEVPATH="/dev/ram0" # CONFIG_EXAMPLES_FTPC is not set |