diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-06 11:17:05 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-06 11:17:05 -0600 |
commit | f146a8370a95b488297c44a561badc474f158c00 (patch) | |
tree | a1146b32ebb443de464ab4a1854076482b242465 | |
parent | a4d7e282806939ce47853db9de0e80471b0e256f (diff) | |
download | px4-nuttx-f146a8370a95b488297c44a561badc474f158c00.tar.gz px4-nuttx-f146a8370a95b488297c44a561badc474f158c00.tar.bz2 px4-nuttx-f146a8370a95b488297c44a561badc474f158c00.zip |
Several fixes for errors introduced by last check-ins
-rw-r--r-- | apps/examples/adc/Makefile | 2 | ||||
-rw-r--r-- | apps/examples/hello/Kconfig | 9 | ||||
-rw-r--r-- | apps/examples/nrf24l01_term/Makefile | 10 | ||||
-rw-r--r-- | apps/examples/nsh/Kconfig | 8 | ||||
-rw-r--r-- | apps/examples/nsh/Makefile | 25 | ||||
-rw-r--r-- | nuttx/configs/sama5d4-ek/kernel/defconfig | 4 | ||||
-rw-r--r-- | nuttx/tools/cfgdefine.c | 5 |
7 files changed, 45 insertions, 18 deletions
diff --git a/apps/examples/adc/Makefile b/apps/examples/adc/Makefile index 14b83ffa6..5d1d89e1f 100644 --- a/apps/examples/adc/Makefile +++ b/apps/examples/adc/Makefile @@ -94,7 +94,7 @@ else install: endif -` + ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) diff --git a/apps/examples/hello/Kconfig b/apps/examples/hello/Kconfig index d697daa8a..13c68e874 100644 --- a/apps/examples/hello/Kconfig +++ b/apps/examples/hello/Kconfig @@ -10,4 +10,13 @@ config EXAMPLES_HELLO Enable the \"Hello, World!\" example if EXAMPLES_HELLO + +config EXAMPLES_HELLO_PROGNAME + string "Program name" + default "hello" + depends on BUILD_KERNEL + ---help--- + This is the name of the program that will be use when the NSH ELF + program is installed. + endif diff --git a/apps/examples/nrf24l01_term/Makefile b/apps/examples/nrf24l01_term/Makefile index 3f7f0f2ea..a9c1f4dab 100644 --- a/apps/examples/nrf24l01_term/Makefile +++ b/apps/examples/nrf24l01_term/Makefile @@ -83,10 +83,6 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -#ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) -$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) - ifeq ($(CONFIG_BUILD_KERNEL),y) $(INSTALL_DIR)/$(PROGNAME): $(OBJS) @echo "LD: $<" @@ -99,8 +95,12 @@ install: endif +#ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat -else +#else #context: #endif diff --git a/apps/examples/nsh/Kconfig b/apps/examples/nsh/Kconfig index bbb5ece01..a1848826b 100644 --- a/apps/examples/nsh/Kconfig +++ b/apps/examples/nsh/Kconfig @@ -13,6 +13,14 @@ config EXAMPLES_NSH if EXAMPLES_NSH +config EXAMPLES_NSH_PROGNAME + string "Program name" + default "nsh" + depends on BUILD_KERNEL + ---help--- + This is the name of the program that will be use when the NSH ELF + program is installed. + config EXAMPLES_NSH_CXXINITIALIZE bool "C++ Initialization" default n diff --git a/apps/examples/nsh/Makefile b/apps/examples/nsh/Makefile index f38d477fc..f16a40549 100644 --- a/apps/examples/nsh/Makefile +++ b/apps/examples/nsh/Makefile @@ -39,30 +39,33 @@ include $(APPDIR)/Make.defs # NuttShell (NSH) Example -ASRCS = -CSRCS = nsh_main.c +ASRCS = +CSRCS = nsh_main.c -AOBJS = $(ASRCS:.S=$(OBJEXT)) -COBJS = $(CSRCS:.c=$(OBJEXT)) +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) -SRCS = $(ASRCS) $(CSRCS) -OBJS = $(AOBJS) $(COBJS) +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BIN = ..\..\libapps$(LIBEXT) + BIN = ..\..\libapps$(LIBEXT) else ifeq ($(WINTOOL),y) - BIN = ..\\..\\libapps$(LIBEXT) + BIN = ..\\..\\libapps$(LIBEXT) else - BIN = ../../libapps$(LIBEXT) + BIN = ../../libapps$(LIBEXT) endif endif -ROOTDEPPATH = --dep-path . +CONFIG_NSH_PROGNAME ?= nsh$(EXEEXT) +PROGNAME = $(CONFIG_NSH_PROGNAME) + +ROOTDEPPATH = --dep-path . # Common build -VPATH = +VPATH = all: .built .PHONY: clean depend distclean diff --git a/nuttx/configs/sama5d4-ek/kernel/defconfig b/nuttx/configs/sama5d4-ek/kernel/defconfig index cfe1a5c51..001076f5b 100644 --- a/nuttx/configs/sama5d4-ek/kernel/defconfig +++ b/nuttx/configs/sama5d4-ek/kernel/defconfig @@ -744,7 +744,8 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024 # CONFIG_EXAMPLES_ELF is not set # CONFIG_EXAMPLES_FTPC is not set # CONFIG_EXAMPLES_FTPD is not set -# CONFIG_EXAMPLES_HELLO is not set +CONFIG_EXAMPLES_HELLO=y +CONFIG_EXAMPLES_HELLO_PROGNAME="hello" # CONFIG_EXAMPLES_HELLOXX is not set # CONFIG_EXAMPLES_JSON is not set # CONFIG_EXAMPLES_HIDKBD is not set @@ -755,6 +756,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024 # CONFIG_EXAMPLES_MOUNT is not set # CONFIG_EXAMPLES_NRF24L01TERM is not set CONFIG_EXAMPLES_NSH=y +CONFIG_EXAMPLES_NSH_PROGNAME="init" # CONFIG_EXAMPLES_NSH_CXXINITIALIZE is not set # CONFIG_EXAMPLES_NULL is not set # CONFIG_EXAMPLES_NX is not set diff --git a/nuttx/tools/cfgdefine.c b/nuttx/tools/cfgdefine.c index 7e0a82f37..c7be3e7bb 100644 --- a/nuttx/tools/cfgdefine.c +++ b/nuttx/tools/cfgdefine.c @@ -86,6 +86,11 @@ static const char *dequote_list[] = "CONFIG_NXWM_CALIBRATION_ICON", /* Name of bitmap image class */ "CONFIG_NXWM_HEXCALCULATOR_ICON", /* Name of bitmap image class */ + /* apps/ definitions */ + + "CONFIG_EXAMPLES_HELLO_PROGNAME", /* Name of installed hello example program */ + "CONFIG_EXAMPLES_NSH_PROGNAME", /* Name of installed NSH example program */ + NULL /* Marks the end of the list */ }; |