sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Squashed commit of the following:

Browse Source 
Author: anchao <anchao@pinecone.net>

     apps/, most main() function: Correct CONFIG_BUILD_LOADABLE usage
     Loadable apps/: Correct loadable symbol table generate
     apps/system/ubloxmodem:  Fix build break
     apps/examples/ostest: start restart/waitpid/user test from main loop
     apps/nshlib:  Expand reboot and poweroff commands to include a second, optional mode argument

    Author: Gregory Nutt <gnutt@nuttx.org>

     An attempt to fix build issues.  Does not work.
     apps/examples/ostest:  Fix some inappropriate renaming of static functions introduced with recent patches.
     apps/builtin/exec_builtin.c:  Fix a error introduced by recent comments.  Found in build testing.

    Author: anchao <anchao@pinecone.net>

     apps/builtin/exec_builtin.c:  Try posix_spawn if builtin apps do not have have an entry point.
     apps/Application.mk: introduce MODULE config to simplify tristate(m)
     apps/nsh:  Change the nuttx shell module type to tristate
     apps:  Add loadable application support
     script/mksymtab:  Generate symbol table name by default
     apps/builtin:  Allow loadable applications can register with apps/builtin.
This commit is contained in:
anchao 2018-08-23 11:06:15 -06:00 committed by Gregory Nutt
parent d7bdf06055
commit 220653f21c
327 changed files with 594 additions and 584 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Application.mk
View File

@ -37,8 +37,31 @@
include $(APPDIR)/Make.defs
# If this is an executable program (with MAINSRC), we must build it as a
# loadable module for the KERNEL build (always) or if the tristate module
# has the value "m"
ifneq ($(MAINSRC),)
ifneq ($(MODULE),)
ifeq ($(CONFIG_$(MODULE)),m)
BUILD_MODULE = y
endif
endif
endif
# Pass the definition to the C/C++ code via the CFLAGS/CXXFLAGS
ifeq ($(BUILD_MODULE),y)
CFLAGS += ${shell $(DEFINE) "$(CC)" BUILD_MODULE}
CXXFLAGS += ${shell $(DEFINE) "$(CC)" BUILD_MODULE}
endif
# File extensions
CXXEXT ?= .cxx
# Object files
AOBJS = $(ASRCS:.S=$(OBJEXT))
COBJS = $(CSRCS:.c=$(OBJEXT))
CXXOBJS = $(CXXSRCS:$(CXXEXT)=$(OBJEXT))
@ -52,10 +75,12 @@ endif
SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS) $(CXXOBJS)
ifneq ($(CONFIG_BUILD_KERNEL),y)
ifneq ($(BUILD_MODULE),y)
OBJS += $(MAINOBJ)
endif
# Module install directory
ifeq ($(WINTOOL),y)
BIN = "${shell cygpath -w $(APPDIR)$(DELIM)libapps$(LIBEXT)}"
INSTALL_DIR = "${shell cygpath -w $(BIN_DIR)}"
@ -68,6 +93,8 @@ ROOTDEPPATH = --dep-path .
VPATH =
# Targets follow
all: .built
.PHONY: clean preconfig depend distclean
.PRECIOUS: $(APPDIR)/libapps$(LIBEXT)
@ -89,18 +116,11 @@ $(MAINOBJ): %$(OBJEXT): %.c
$(call COMPILE, $<, $@)
endif
ifeq ($(LOADABLE),y)
.built: $(OBJS)
$(call ELFLD, $(APPNAME)_main, $(OBJS), $(APPNAME))
$(Q) mkdir -p $(BIN_DIR)
$(Q) install $(APPNAME) $(BIN_DIR)$(DELIM)$(APPNAME)
else
.built: $(OBJS)
$(call ARCHIVE, $(BIN), $(OBJS))
$(Q) touch $@
endif
ifeq ($(CONFIG_BUILD_KERNEL),y)
ifeq ($(BUILD_MODULE), y)
$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ)
@echo "LD: $(PROGNAME)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS)
@ -118,7 +138,7 @@ ifneq ($(APPNAME),)
ifneq ($(PRIORITY),)
ifneq ($(STACKSIZE),)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(BUILD_MODULE),,$(APPNAME)_main))
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else
@ -145,9 +165,6 @@ endif
depend: .depend
clean:
ifeq ($(LOADABLE),y)
$(call DELFILE, $(APPNAME))
endif
$(call DELFILE, .built)
$(call CLEAN)

42
Make.defs
View File

@ -43,46 +43,23 @@ DEPCONFIG = $(TOPDIR)$(DELIM).config
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
define REGISTER
$(Q) echo Register: $1
$(Q) echo { "$1", $2, $3, $4 }, > "$(BUILTIN_REGISTRY)$(DELIM)$4.bdat"
$(Q) echo int $4(int argc, char *argv[]); > "$(BUILTIN_REGISTRY)$(DELIM)$4.pdat"
$(Q) echo { "$1", $2, $3, $4 }, > "$(BUILTIN_REGISTRY)$(DELIM)$1.bdat"
$(Q) if [ ! -z $4 ]; then \
echo "int $4(int argc, char *argv[]);" > "$(BUILTIN_REGISTRY)$(DELIM)$1.pdat"; \
fi;
$(Q) touch $(BUILTIN_REGISTRY)$(DELIM).updated"
endef
else
define REGISTER
$(Q) echo "Register: $1"
$(Q) echo "{ \"$1\", $2, $3, $4 }," > "$(BUILTIN_REGISTRY)$(DELIM)$4.bdat"
$(Q) echo "int $4(int argc, char *argv[]);" > "$(BUILTIN_REGISTRY)$(DELIM)$4.pdat"
$(Q) echo "Register: $1 $4"
$(Q) echo "{ \"$1\", $2, $3, $4 }," > "$(BUILTIN_REGISTRY)$(DELIM)$1.bdat"
$(Q) if [ ! -z $4 ]; then \
echo "int $4(int argc, char *argv[]);" > "$(BUILTIN_REGISTRY)$(DELIM)$1.pdat"; \
fi;
$(Q) touch "$(BUILTIN_REGISTRY)$(DELIM).updated"
endef
endif
# COMPILE - a macro to compile a loadable app in C
ifeq ($(LOADABLE),y)
define COMPILE
@echo "CC) $1"
$(Q) $(CC) -c $(CELFFLAGS) -DLOADABLE_APP $1 -o $2
endef
endif
# COMPILEXX - a macro to compile a loadable app in C++
ifeq ($(LOADABLE),y)
define COMPILEXX
@echo "CXX: $1"
$(Q) $(CXX) -c $(CXXELFFLAGS) -DLOADABLE_APP $1 -o $2
endef
endif
# ELFLD - a macro to link loadable app
# Example: $(call ELFLD, entry point, in-file(s), out-file)
define ELFLD
@echo "LD: $3"
$(Q) $(LD) $(LDELFFLAGS) $2 -o $3
$(Q) chmod +x $3
endef
# Tools
#
# In a normal build, tools will reside in the nuttx/tools sub-directory and
@ -146,3 +123,4 @@ endif
CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)$(DELIM)include"}
CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)$(DELIM)include"}
LDLIBS = $(APPDIR)/libapps.a

35
Makefile
View File

@ -67,7 +67,8 @@ LIBPATH ?= $(TOPDIR)$(DELIM)staging
# The install path
BIN_DIR = $(APPDIR)$(DELIM)bin
EXE_DIR = $(APPDIR)$(DELIM)exe
BIN_DIR = $(EXE_DIR)$(DELIM)system$(DELIM)bin
# The final build target
@ -75,13 +76,13 @@ BIN = libapps$(LIBEXT)
# Symbol table for loadable apps.
SYMTABSRC = $(APPDIR)$(DELIM)symtab_apps.c
SYMTABOBJ = $(APPDIR)$(DELIM)symtab_apps$(OBJEXT)
SYMTABSRC = $(EXE_DIR)$(DELIM)symtab_apps.c
SYMTABOBJ = $(SYMTABSRC:.c=$(OBJEXT))
# Build targets
all: $(BIN)
.PHONY: import symtab install dirlinks context context_serialize clean_context context_rest .depdirs preconfig depend clean distclean
.PHONY: import install dirlinks context context_serialize clean_context context_rest .depdirs preconfig depend clean distclean
.PRECIOUS: libapps$(LIBEXT)
define MAKE_template
@ -102,29 +103,29 @@ $(foreach SDIR, $(CONFIGURED_APPS), $(eval $(call SDIR_template,$(SDIR),depend))
$(foreach SDIR, $(CLEANDIRS), $(eval $(call SDIR_template,$(SDIR),clean)))
$(foreach SDIR, $(CLEANDIRS), $(eval $(call SDIR_template,$(SDIR),distclean)))
make_symbols:
ifeq ($(CONFIG_SYSTEM_NSH_SYMTAB),y)
mkdir -p $(BIN_DIR)
$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(BIN_DIR) $(SYMTABSRC)
$(call COMPILE, $(SYMTABSRC), $(SYMTABOBJ))
$(call ARCHIVE, $(APPDIR)$(DELIM)$(BIN), $(SYMTABOBJ))
endif
ifeq ($(CONFIG_BUILD_LOADABLE),)
$(BIN): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
else
$(SYMTABSRC): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all)
$(Q) $(MAKE) install TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)"
$(Q) $(APPDIR)$(DELIM)tools$(DELIM)mksymtab.sh $(EXE_DIR)$(DELIM)system $(SYMTABSRC)
$(BIN): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all) make_symbols
$(SYMTABOBJ): %$(OBJEXT): %.c
$(call COMPILE, -fno-lto $<, $@)
$(BIN): $(SYMTABOBJ)
$(call ARCHIVE, $(BIN), $^)
endif
.install: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_install)
$(BIN_DIR):
mkdir -p $(BIN_DIR)
$(Q) mkdir -p $(BIN_DIR)
install: $(BIN_DIR) .install
.import: $(BIN) install
symtab: $(BIN_DIR)
$(Q) tools/mksymtab.sh $(BIN_DIR) $(APPDIR)$(DELIM)import/symtab.c
$(call MAKE_template,import,symtab)
import:
$(Q) $(MAKE) .import TOPDIR="$(APPDIR)$(DELIM)import"

24
builtin/exec_builtin.c
View File

@ -181,11 +181,27 @@ int exec_builtin(FAR const char *appname, FAR char * const *argv,
}
}
/* Start the built-in */
#ifdef CONFIG_LIBC_EXECFUNCS
/* A NULL entry point implies that the task is a loadable application */
if (builtin->main == NULL)
{
/* Load and execute the application. */
ret = posix_spawn(&pid, builtin->name, &file_actions,
&attr, (argv) ? &argv[1] : (FAR char * const *)NULL,
NULL);
}
else
#endif
{
/* Start the built-in */
ret = task_spawn(&pid, builtin->name, builtin->main, &file_actions,
&attr, (argv) ? &argv[1] : (FAR char * const *)NULL,
(FAR char * const *)NULL);
}
ret = task_spawn(&pid, builtin->name, builtin->main, &file_actions,
&attr, (argv) ? &argv[1] : (FAR char * const *)NULL,
(FAR char * const *)NULL);
if (ret != 0)
{
serr("ERROR: task_spawn failed: %d\n", ret);

6
examples/README.txt
View File

@ -79,7 +79,7 @@ examples/alarm
Configuration:
CONFIG_EXAMPLES_ALARM - Enable the RTC driver alarm test
CONFIG_EXAMPLES_ALARM_PROGNAME - If CONFIG_BUILD_KERNEL=y, then this is
CONFIG_EXAMPLES_ALARM_PROGNAME - If CONFIG_BUILD_LOADABLE=y, then this is
the name of the program that will be use when the NSH ELF program is
installed.
CONFIG_EXAMPLES_ALARM_PRIORITY - Alarm daemon priority
@ -435,7 +435,7 @@ examples/flash_test
* CONFIG_MTD_SMART=y - SMART block driver support
* CONFIG_NSH_BUILTIN_APPS=y - This example can only be built as an NSH
command
* CONFIG_BUILD_PROTECTED=n and CONFIG_BUILD_KERNEL=n- This test uses
* CONFIG_BUILD_PROTECTED=n and CONFIG_BUILD_LOADABLE=n- This test uses
internal OS interfaces and so is not available in the NUTTX kernel
builds
@ -1584,7 +1584,7 @@ examples/relays
relies on internal OS interfaces that are not normally available to a
user-space program. As a result, this example cannot be used if a
NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED
or CONFIG_BUILD_KERNEL).
or CONFIG_BUILD_LOADABLE).
examples/rfid_readuid
^^^^^^^^^^^^^^^^^^^^^

2
examples/adc/adc_main.c
View File

@ -228,7 +228,7 @@ static void parse_args(FAR struct adc_state_s *adc, int argc, FAR char **argv)
* Name: adc_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int adc_main(int argc, char *argv[])

2
examples/adxl372_test/Kconfig
View File

@ -14,7 +14,7 @@ if EXAMPLES_ADXL372_TEST
config EXAMPLES_ADXL372_TEST_PROGNAME
string "Program name"
default "ADXL372_test"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/adxl372_test/adxl372_test_main.c
View File

@ -387,7 +387,7 @@ quick_exit:
*
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int adxl372_test_main(int argc, FAR char *argv[])

2
examples/ajoystick/ajoy_main.c
View File

@ -376,7 +376,7 @@ static int ajoy_calibrate(int fd)
* ajoy_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int ajoy_main(int argc, char *argv[])

2
examples/alarm/Kconfig
View File

@ -15,7 +15,7 @@ if EXAMPLES_ALARM
config EXAMPLES_ALARM_PROGNAME
string "Program name"
default "alarm"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/alarm/alarm_main.c
View File

@ -208,7 +208,7 @@ static void show_usage(FAR const char *progname)
* alarm_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int alarm_main(int argc, FAR char *argv[])

2
examples/apa102/Kconfig
View File

@ -14,7 +14,7 @@ if EXAMPLES_APA102
config EXAMPLES_APA102_PROGNAME
string "Program name"
default "apa102"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/apa102/apa102_main.c
View File

@ -150,7 +150,7 @@ static struct apa102_ledstrip_s hsvtorgb(uint16_t h, uint8_t s, uint8_t v)
* apa102_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int apa102_main(int argc, char *argv[])

2
examples/apds9960/Kconfig
View File

@ -15,7 +15,7 @@ if EXAMPLES_APDS9960
config EXAMPLES_APDS9960_PROGNAME
string "APDS-9960 Test Program name"
default "apds9960"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/apds9960/apds9960_main.c
View File

@ -62,7 +62,7 @@
* apds9960_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int apds9960_main(int argc, char *argv[])

6
examples/bastest/Makefile
View File

@ -56,7 +56,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
ifneq ($(CONFIG_BUILD_KERNEL),y)
ifneq ($(CONFIG_BUILD_LOADABLE),y)
OBJS += $(MAINOBJ)
endif
@ -115,7 +115,7 @@ $(ROMFS_HDR) : $(ROMFS_IMG)
# Link and install the program binary
ifeq ($(CONFIG_BUILD_KERNEL),y)
ifeq ($(CONFIG_BUILD_LOADABLE),y)
$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ)
@echo "LD: $(PROGNAME)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS)
@ -132,7 +132,7 @@ endif
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main))
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else

2
examples/bastest/bastest_main.c
View File

@ -92,7 +92,7 @@
* bastest_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int bastest_main(int argc, char *argv[])

2
examples/bmp180/Kconfig
View File

@ -15,7 +15,7 @@ if EXAMPLES_BMP180
config EXAMPLES_BMP180_PROGNAME
string "Program name"
default "bmp180"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/bmp180/bmp180_main.c
View File

@ -50,7 +50,7 @@
* bmp180_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int bmp180_main(int argc, char *argv[])

6
examples/bridge/Makefile
View File

@ -55,7 +55,7 @@ TARG_MAINOBJ = $(MAINSRC:.c=$(OBJEXT))
TARG_SRCS = $(TARG_ASRCS) $(TARG_CSRCS) $(MAINSRC)
TARG_OBJS = $(TARG_AOBJS) $(TARG_COBJS)
ifneq ($(CONFIG_BUILD_KERNEL),y)
ifneq ($(CONFIG_BUILD_LOADABLE),y)
TARG_OBJS += $(TARG_MAINOBJ)
endif
@ -127,7 +127,7 @@ $(HOST_BIN2): bridge_config.h $(HOST_OBJS2)
.built: $(TARG_BIN) $(HOST_BIN1) $(HOST_BIN2)
@touch .built
ifeq ($(CONFIG_BUILD_KERNEL),y)
ifeq ($(CONFIG_BUILD_LOADABLE),y)
$(BIN_DIR)$(DELIM)$(TARG_PROGNAME): $(TARG_OBJS) $(TARG_MAINOBJ)
@echo "LD: $(TARG_PROGNAME)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(TARG_INSTALL_DIR)$(DELIM)$(TARG_PROGNAME) $(ARCHCRT0OBJ) $(TARG_MAINOBJ) $(LDLIBS)
@ -142,7 +142,7 @@ endif
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(TARG_APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(TARG_APPNAME),$(TARG_PRIORITY),$(TARG_STACKSIZE),$(TARG_APPNAME)_main)
$(call REGISTER,$(TARG_APPNAME),$(TARG_PRIORITY),$(TARG_STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(TARG_APPNAME)_main))
context: $(BUILTIN_REGISTRY)$(DELIM)$(TARG_APPNAME)_main.bdat
else

2
examples/bridge/bridge_main.c
View File

@ -681,7 +681,7 @@ errout_with_recvsd:
* bridge_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int bridge_main(int argc, char *argv[])

2
examples/buttons/Kconfig
View File

@ -15,7 +15,7 @@ if EXAMPLES_BUTTONS
config EXAMPLES_BUTTONS_PROGNAME
string "Program name"
default "buttons"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/buttons/buttons_main.c
View File

@ -391,7 +391,7 @@ errout:
* buttons_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int buttons_main(int argc, FAR char *argv[])

2
examples/calib_udelay/calib_udelay_main.c
View File

@ -219,7 +219,7 @@ static int linreg(FAR struct measurement_s *point, int num_points,
* calib_udelay_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int calib_udelay_main(int argc, char *argv[])

2
examples/can/can_main.c
View File

@ -156,7 +156,7 @@ static void show_usage(FAR const char *progname)
* Name: can_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int can_main(int argc, FAR char *argv[])

2
examples/canard/canard_main.c
View File

@ -508,7 +508,7 @@ errout_with_dev:
*
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int canard_main(int argc, FAR char *argv[])

6
examples/chat/Makefile
View File

@ -48,7 +48,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
ifneq ($(CONFIG_BUILD_KERNEL),y)
ifneq ($(CONFIG_BUILD_LOADABLE),y)
OBJS += $(MAINOBJ)
endif
@ -94,7 +94,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c
$(call ARCHIVE, $(BIN), $(OBJS))
$(Q) touch .built
ifeq ($(CONFIG_BUILD_KERNEL),y)
ifeq ($(CONFIG_BUILD_LOADABLE),y)
$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ)
@echo "LD: $(PROGNAME)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS)
@ -109,7 +109,7 @@ endif
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main))
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else

2
examples/chat/chat_main.c
View File

@ -321,7 +321,7 @@ static int chat_parse_args(FAR struct chat_app* priv)
*
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char** argv)
#else
int chat_main(int argc, FAR char** argv)

2
examples/configdata/configdata_main.c
View File

@ -622,7 +622,7 @@ static void configdata_cleardeleted(void)
* Name: configdata_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int configdata_main(int argc, char *argv[])

2
examples/cpuhog/cpuhog_main.c
View File

@ -96,7 +96,7 @@ static struct state_s
* Public Functions
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int cpuhog_main(int argc, char *argv[])

2
examples/dhcpd/target.c
View File

@ -89,7 +89,7 @@
* Name: dhcpd_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int dhcpd_main(int argc, char *argv[])

2
examples/discover/discover_main.c
View File

@ -84,7 +84,7 @@
* discover_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int discover_main(int argc, char *argv[])

2
examples/djoystick/djoy_main.c
View File

@ -140,7 +140,7 @@ static void show_joystick(djoy_buttonset_t oldset, djoy_buttonset_t newset)
* djoy_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int djoy_main(int argc, char *argv[])

2
examples/dsptest/Kconfig
View File

@ -14,7 +14,7 @@ if EXAMPLES_DSPTEST
config EXAMPLES_DSPTEST_PROGNAME
string "Program name"
default "dsptest"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/dsptest/dsptest_main.c
View File

@ -79,7 +79,7 @@
* dsptest_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int dsptest_main(int argc, char *argv[])

4
examples/elf/Makefile
View File

@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
ifneq ($(CONFIG_BUILD_KERNEL),y)
ifneq ($(CONFIG_BUILD_LOADABLE),y)
OBJS += $(MAINOBJ)
endif
@ -102,7 +102,7 @@ really_build: $(OBJS)
@$(MAKE) -C tests TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV)
@$(MAKE) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" really_build
ifeq ($(CONFIG_BUILD_KERNEL),y)
ifeq ($(CONFIG_BUILD_LOADABLE),y)
$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ)
@echo "LD: $(PROGNAME)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS)

2
examples/elf/elf_main.c
View File

@ -237,7 +237,7 @@ static inline void testheader(FAR const char *progname)
* Name: elf_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int elf_main(int argc, char *argv[])

2
examples/fb/Kconfig
View File

@ -28,7 +28,7 @@ config EXAMPLES_FB_DEFAULTFB
config EXAMPLES_FB_PROGNAME
string "Program name"
default "fb"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/fb/fb_main.c
View File

@ -284,7 +284,7 @@ static void draw_rect(FAR struct fb_state_s *state,
* fb_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int fb_main(int argc, char *argv[])

2
examples/fboverlay/Kconfig
View File

@ -15,7 +15,7 @@ if EXAMPLES_FBOVERLAY
config EXAMPLES_FBOVERLAY_PROGNAME
string "Program name"
default "fboverlay"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/fboverlay/fboverlay_main.c
View File

@ -1010,7 +1010,7 @@ static void usage(const char * progname)
*
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int fboverlay_main(int argc, char *argv[])

2
examples/flash_test/Kconfig
View File

@ -6,7 +6,7 @@
config EXAMPLES_FLASH_TEST
bool "SMART FLASH block device test"
default n
depends on (!BUILD_PROTECTED && !BUILD_KERNEL) && MTD_SMART && NSH_BUILTIN_APPS
depends on (!BUILD_PROTECTED && !BUILD_LOADABLE) && MTD_SMART && NSH_BUILTIN_APPS
---help---
This logic performs a SMART flash block device test. This test
performs a sector allocate, read, write, free and garbage collection

2
examples/flash_test/flash_test.c
View File

@ -61,7 +61,7 @@
* Public Functions
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int flash_test_main(int argc, char *argv[])

4
examples/flowc/Kconfig
View File

@ -54,7 +54,7 @@ config EXAMPLES_FLOWC_PROGNAME1
string "Target1 program name"
default "receiver" if !EXAMPLES_FLOWC_SENDER1
default "sender" if EXAMPLES_FLOWC_SENDER1
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the Target1 program that will be use when the
NSH ELF program is installed.
@ -83,7 +83,7 @@ config EXAMPLES_FLOWC_PROGNAME2
string "Target2 program name"
default "receiver" if !EXAMPLES_FLOWC_RECEIVER2
default "sender" if EXAMPLES_FLOWC_RECEIVER2
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the Target2 program that will be use when the
NSH ELF program is installed.

8
examples/flowc/Makefile
View File

@ -100,7 +100,7 @@ endif
TARG_SRCS = $(TARG1_CRCS) $(TARG1_MAINSRC) $(TARG2_CSRCS) $(TARG2_MAINSRC)
TARG_OBJS = $(TARG1_COBJS) $(TARG2_COBJS)
ifneq ($(CONFIG_BUILD_KERNEL),y)
ifneq ($(CONFIG_BUILD_LOADABLE),y)
TARG_OBJS += $(TARG1_MAINOBJ) $(TARG2_MAINOBJ)
endif
@ -180,7 +180,7 @@ endif
.built: config.h $(TARG_BIN) $(HOST_BIN)
$(Q) touch .built
ifeq ($(CONFIG_BUILD_KERNEL),y)
ifeq ($(CONFIG_BUILD_LOADABLE),y)
$(BIN_DIR)$(DELIM)$(PROGNAME1): $(OBJS) $(TARG1_MAINOBJ)
@echo "LD: $(PROGNAME1)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME1) $(ARCHCRT0OBJ) $(TARG1_MAINOBJ) $(LDLIBS)
@ -195,11 +195,11 @@ endif
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(MAINNAME1))
$(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(if $(CONFIG_BUILD_LOADABLE),,$(MAINNAME1)))
ifeq ($(CONFIG_EXAMPLES_FLOWC_TARGET2),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(MAINNAME2))
$(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(if $(CONFIG_BUILD_LOADABLE),,$(MAINNAME2)))
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat \
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat

2
examples/flowc/flowc_target1.c
View File

@ -48,7 +48,7 @@
* flowc1_main
****************************************************************************/
#if defined(CONFIG_BUILD_KERNEL)
#if defined(CONFIG_BUILD_LOADABLE)
int main(int argc, FAR char *argv[])
#elif defined(CONFIG_EXAMPLES_FLOWC_TARGET2)
int flowc1_main(int argc, char *argv[])

2
examples/flowc/flowc_target2.c
View File

@ -48,7 +48,7 @@
* flowc2_main
****************************************************************************/
#if defined(CONFIG_BUILD_KERNEL)
#if defined(CONFIG_BUILD_LOADABLE)
int main(int argc, FAR char *argv[])
#else
int flowc2_main(int argc, char *argv[])

2
examples/fstest/fstest_main.c
View File

@ -752,7 +752,7 @@ static int fstest_directory(void)
* Name: fstest_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int fstest_main(int argc, char *argv[])

2
examples/ft80x/Kconfig
View File

@ -36,7 +36,7 @@ config EXAMPLES_FT80X_EXCLUDE_BITMAPS
config EXAMPLES_FT80X_PROGNAME
string "FT80x program name"
default "ft80x"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/ft80x/ft80x_main.c
View File

@ -288,7 +288,7 @@ static int ft80x_example(int fd, FAR struct ft80x_dlbuffer_s *buffer,
* ft80x_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int ft80x_main(int argc, char *argv[])

2
examples/ftpc/ftpc_main.c
View File

@ -365,7 +365,7 @@ int ftpc_parse(SESSION handle, char *cmdline)
* Public Functions
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int ftpc_main(int argc, char **argv, char **envp)

8
examples/ftpd/Makefile
View File

@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
ifneq ($(CONFIG_BUILD_KERNEL),y)
ifneq ($(CONFIG_BUILD_LOADABLE),y)
OBJS += $(MAINOBJ)
endif
@ -94,7 +94,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c
$(call ARCHIVE, $(BIN), $(OBJS))
@touch .built
ifeq ($(CONFIG_BUILD_KERNEL),y)
ifeq ($(CONFIG_BUILD_LOADABLE),y)
$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ)
@echo "LD: $(PROGNAME)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS)
@ -109,10 +109,10 @@ endif
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)ftpd_start.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,ftpd_start,SCHED_PRIORITY_DEFAULT,$(CONFIG_EXAMPLES_FTPD_STACKSIZE),ftpd_main)
$(call REGISTER,ftpd_start,SCHED_PRIORITY_DEFAULT,$(CONFIG_EXAMPLES_FTPD_STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,ftpd_main))
$(BUILTIN_REGISTRY)$(DELIM)ftpd_stop.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,ftpd_stop,SCHED_PRIORITY_DEFAULT,$(CONFIG_EXAMPLES_FTPD_STACKSIZE),ftpd_stop)
$(call REGISTER,ftpd_stop,SCHED_PRIORITY_DEFAULT,$(CONFIG_EXAMPLES_FTPD_STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,ftpd_stop))
context: $(BUILTIN_REGISTRY)$(DELIM)ftpd_start.bdat $(BUILTIN_REGISTRY)$(DELIM)ftpd_stop.bdat
else

2
examples/ftpd/ftpd_main.c
View File

@ -247,7 +247,7 @@ int ftpd_daemon(int s_argc, char **s_argv)
* Name: ftpd_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int ftpd_main(int s_argc, char **s_argv)

2
examples/gpio/Kconfig
View File

@ -15,7 +15,7 @@ if EXAMPLES_GPIO
config EXAMPLES_GPIO_PROGNAME
string "Program name"
default "gpio"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/gpio/gpio_main.c
View File

@ -73,7 +73,7 @@ static void show_usage(FAR const char *progname)
* gpio_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int gpio_main(int argc, char *argv[])

2
examples/gps/Kconfig
View File

@ -15,7 +15,7 @@ if EXAMPLES_GPS
config EXAMPLES_GPS_PROGNAME
string "Program name"
default "gps"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/gps/gps_main.c
View File

@ -54,7 +54,7 @@
* gps_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int gps_main(int argc, char *argv[])

2
examples/hello/Kconfig
View File

@ -14,7 +14,7 @@ if EXAMPLES_HELLO
config EXAMPLES_HELLO_PROGNAME
string "Program name"
default "hello"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

6
examples/hello/Makefile
View File

@ -42,12 +42,8 @@ CONFIG_EXAMPLES_HELLO_STACKSIZE ?= 2048
APPNAME = hello
ifeq ($(CONFIG_EXAMPLES_HELLO),m)
LOADABLE = y
else
PRIORITY = $(CONFIG_EXAMPLES_HELLO_PRIORITY)
STACKSIZE = $(CONFIG_EXAMPLES_HELLO_STACKSIZE)
endif
# Hello, World! Example
@ -58,4 +54,6 @@ MAINSRC = hello_main.c
CONFIG_EXAMPLES_HELLO_PROGNAME ?= hello$(EXEEXT)
PROGNAME = $(CONFIG_EXAMPLES_HELLO_PROGNAME)
MODULE = EXAMPLES_HELLO
include $(APPDIR)/Application.mk

2
examples/hello/hello_main.c
View File

@ -48,7 +48,7 @@
* hello_main
****************************************************************************/
#if defined (CONFIG_BUILD_KERNEL) || defined (LOADABLE_APP)
#if defined (CONFIG_BUILD_LOADABLE)
int main(int argc, FAR char *argv[])
#else
int hello_main(int argc, char *argv[])

6
examples/helloxx/Makefile
View File

@ -49,11 +49,9 @@ PROGNAME = $(CONFIG_EXAMPLES_HELLOXX_PROGNAME)
APPNAME = helloxx
ifeq ($(CONFIG_EXAMPLES_HELLOXX),m)
LOADABLE = y
else
PRIORITY = SCHED_PRIORITY_DEFAULT
STACKSIZE = 2048
endif
MODULE = EXAMPLES_HELLOXX
include $(APPDIR)/Application.mk

2
examples/helloxx/helloxx_main.cxx
View File

@ -127,7 +127,7 @@ static CHelloWorld g_HelloWorld;
extern "C"
{
#if defined (CONFIG_BUILD_KERNEL) || defined (LOADABLE_APP)
#if defined (CONFIG_BUILD_LOADABLE)
int main(int argc, FAR char *argv[])
#else
int helloxx_main(int argc, char *argv[])

2
examples/hidkbd/Kconfig
View File

@ -14,7 +14,7 @@ if EXAMPLES_HIDKBD
config EXAMPLES_HIDKBD_PROGNAME
string "Program name"
default "hidkbd"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the Nettest
program is installed.

2
examples/hidkbd/hidkbd_main.c
View File

@ -200,7 +200,7 @@ static void hidkbd_decode(FAR char *buffer, ssize_t nbytes)
* Name: hidkbd_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int hidkbd_main(int argc, char *argv[])

2
examples/i2schar/Kconfig
View File

@ -78,7 +78,7 @@ config EXAMPLES_I2SCHAR_BUFSIZE
config EXAMPLES_I2SCHAR_DEVINIT
bool "Architecture-specific device initialization"
default 256
depends on !BUILD_PROTECTED && !BUILD_KERNEL
depends on !BUILD_PROTECTED && !BUILD_LOADABLE
---help---
Define if architecture-specific I2S device initialize is available.
If defined, the platform specific code must provide a function

2
examples/i2schar/i2schar_main.c
View File

@ -236,7 +236,7 @@ static void parse_args(FAR struct i2schar_state_s *i2schar, int argc, FAR char *
* Name: i2schar_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int i2schar_main(int argc, char *argv[])

2
examples/i2sloop/i2sloop_main.c
View File

@ -73,7 +73,7 @@ static void _signal_handler(int number)
* Name: i2sloop_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int i2sloop_main(int argc, char *argv[])

2
examples/igmp/igmp.c
View File

@ -83,7 +83,7 @@
* igmp_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int igmp_main(int argc, char *argv[])

2
examples/ina219/Kconfig
View File

@ -14,7 +14,7 @@ if EXAMPLES_INA219
config EXAMPLES_INA219_PROGNAME
string "Program name"
default "ina219"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/ina219/ina219_main.c
View File

@ -51,7 +51,7 @@
* ina219_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int ina219_main(int argc, char *argv[])

2
examples/ipforward/Kconfig
View File

@ -30,7 +30,7 @@ endchoice # L3 Protocol
config EXAMPLES_IPFORWARD_PROGNAME
string "IP forwarding rogram name"
default "ipfwd"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/ipforward/ipforward.c
View File

@ -760,7 +760,7 @@ static FAR void *ipfwd_sender(FAR void *arg)
* Name: fstest_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int ipfwd_main(int argc, char *argv[])

2
examples/json/json_main.c
View File

@ -237,7 +237,7 @@ static void create_objects(void)
*
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int json_main(int argc, const char *argv[])

2
examples/leds/Kconfig
View File

@ -15,7 +15,7 @@ if EXAMPLES_LEDS
config EXAMPLES_LEDS_PROGNAME
string "Program name"
default "leds"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/leds/leds_main.c
View File

@ -191,7 +191,7 @@ errout:
* leds_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int leds_main(int argc, FAR char *argv[])

2
examples/lis3dsh_reader/Kconfig
View File

@ -16,7 +16,7 @@ if EXAMPLES_LIS3DSH_READER
config EXAMPLES_LIS3DSH_READER_PROGNAME
string "Program name"
default "lis3dsh_reader"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/lis3dsh_reader/lis3dsh_reader_main.c
View File

@ -52,7 +52,7 @@
* lis3dsh_reader_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int lis3dsh_reader_main(int argc, FAR char *argv[])

2
examples/lsm330spi_test/Kconfig
View File

@ -14,7 +14,7 @@ if EXAMPLES_LSM330SPI_TEST
config EXAMPLES_LSM330SPI_TEST_PROGNAME
string "Program name"
default "lsm330spi_test"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/lsm330spi_test/lsm330spi_test_main.c
View File

@ -623,7 +623,7 @@ quick_exit:
*
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int lsm330spi_test_main(int argc, FAR char *argv[])

2
examples/lvgldemo/lvgldemo.c
View File

@ -141,7 +141,7 @@ static FAR void *tick_func(void *data)
*
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int lvgldemo_main(int argc, char *argv[])

2
examples/max31855/Kconfig
View File

@ -14,7 +14,7 @@ if EXAMPLES_MAX31855
config EXAMPLES_MAX31855_PROGNAME
string "Program name"
default "max31855"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/max31855/max31855_main.c
View File

@ -49,7 +49,7 @@
* Public Functions
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int max31855_main(int argc, char *argv[])

2
examples/media/Kconfig
View File

@ -65,7 +65,7 @@ config EXAMPLES_MEDIA_BLOCKSIZE
config EXAMPLES_MEDIA_PROGNAME
string "Program name"
default "media"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/media/media_main.c
View File

@ -124,7 +124,7 @@ static void get_blocksize(int fd, FAR struct media_info_s *info)
* media_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int media_main(int argc, FAR char *argv[])

2
examples/mm/mm_main.c
View File

@ -287,7 +287,7 @@ static void do_frees(void **mem, const int *size, const int *seq, int n)
* Name: mm_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int mm_main(int argc, char *argv[])

2
examples/modbus/modbus_main.c
View File

@ -359,7 +359,7 @@ static void modbus_showusage(FAR const char *progname, int exitcode)
*
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int modbus_main(int argc, char *argv[])

4
examples/module/Kconfig
View File

@ -128,7 +128,7 @@ config EXAMPLES_MODULE_NOSTRIP
config EXAMPLES_MODULE_LIBC
bool "Link with LIBC"
default n
depends on !BUILD_KERNEL && EXPERIMENTAL
depends on !BUILD_LOADABLE && EXPERIMENTAL
---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
@ -147,6 +147,6 @@ config EXAMPLES_MODULE_LIBC
config EXAMPLES_MODULE_LIBGCC
bool "Link with LIBGCC"
default n
depends on !BUILD_KERNEL && EXPERIMENTAL
depends on !BUILD_LOADABLE && EXPERIMENTAL
endif

6
examples/module/Makefile
View File

@ -64,7 +64,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
ifneq ($(CONFIG_BUILD_KERNEL),y)
ifneq ($(CONFIG_BUILD_LOADABLE),y)
OBJS += $(MAINOBJ)
endif
@ -116,7 +116,7 @@ really_build: $(OBJS)
@$(MAKE) -C drivers TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV)
@$(MAKE) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" really_build
ifeq ($(CONFIG_BUILD_KERNEL),y)
ifeq ($(CONFIG_BUILD_LOADABLE),y)
$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ)
@echo "LD: $(PROGNAME)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ)
@ -131,7 +131,7 @@ endif
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main))
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else

2
examples/module/module_main.c
View File

@ -147,7 +147,7 @@ extern const int g_mod_nexports;
* Name: module_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int module_main(int argc, char *argv[])

2
examples/mount/mount_main.c
View File

@ -571,7 +571,7 @@ static void succeed_stat(const char *path)
* Name: mount_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int mount_main(int argc, char *argv[])

2
examples/mtdpart/Kconfig
View File

@ -6,7 +6,7 @@
config EXAMPLES_MTDPART
bool "MTD partition test"
default n
depends on MTD_PARTITION && !BUILD_PROTECTED && !BUILD_KERNEL
depends on MTD_PARTITION && !BUILD_PROTECTED && !BUILD_LOADABLE
---help---
Enable the MTD partition test example.

2
examples/mtdpart/mtdpart_main.c
View File

@ -136,7 +136,7 @@ extern FAR struct mtd_dev_s *mtdpart_archinitialize(void);
* Name: mtdpart_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int mtdpart_main(int argc, char *argv[])

4
examples/mtdrwb/Kconfig
View File

@ -6,7 +6,7 @@
config EXAMPLES_MTDRWB
bool "MTD R/W buffer test"
default n
depends on (MTD_WRBUFFER || MTD_READAHEAD) && !BUILD_PROTECTED && !BUILD_KERNEL
depends on (MTD_WRBUFFER || MTD_READAHEAD) && !BUILD_PROTECTED && !BUILD_LOADABLE
---help---
Enable the MTD R/W buffer test example.
@ -18,7 +18,7 @@ if EXAMPLES_MTDRWB
config EXAMPLES_MTDRWB_PROGNAME
string "Program name"
default "mtdrwb"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the NSH ELF
program is installed.

2
examples/mtdrwb/mtdrwb_main.c
View File

@ -132,7 +132,7 @@ extern FAR struct mtd_dev_s *mtdrwb_archinitialize(void);
* Name: mtdrwb_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int mtdrwb_main(int argc, char *argv[])

2
examples/netloop/lo_main.c
View File

@ -249,7 +249,7 @@ errout_with_socket:
* Name: netloop_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int netloop_main(int argc, char *argv[])

2
examples/netpkt/netpkt_main.c
View File

@ -129,7 +129,7 @@ static void netpkt_usage(void)
* Name: netpkt_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int netpkt_main(int argc, char **argv)

6
examples/nettest/Kconfig
View File

@ -23,7 +23,7 @@ config EXAMPLES_NETTEST_SENDSIZE
config EXAMPLES_NETTEST_PROGNAME1
string "Target1 program name"
default "nettest"
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the program that will be use when the Nettest
program is installed.
@ -72,7 +72,7 @@ config EXAMPLES_NETTEST_PROGNAME2
string "Target2 program name"
default "tcpserver" if !EXAMPLES_NETTEST_SERVER2
default "tcpclient" if EXAMPLES_NETTEST_SERVER2
depends on BUILD_KERNEL
depends on BUILD_LOADABLE
---help---
This is the name of the Target2 program that will be use when the
NSH ELF program is installed.
@ -132,7 +132,7 @@ config EXAMPLES_NETTEST_INIT
bool "Initialize network"
default n if NSH_BUILTIN_APPS
default y if !NSH_BUILTIN_APPS
depends on !BUILD_KERNEL && !EXAMPLES_NETTEST_LOOPBACK
depends on !BUILD_LOADABLE && !EXAMPLES_NETTEST_LOOPBACK
---help---
Include logic to initialize the network. This should not be done if
the network is already initialized when nettest runs. This is

8
examples/nettest/Makefile
View File

@ -118,7 +118,7 @@ endif
TARG_SRCS = $(TARG1_CRCS) $(TARG1_MAINSRC) $(TARG2_CSRCS) $(TARG2_MAINSRC) $(TARGCMN_CSRCS)
TARG_OBJS = $(TARG1_COBJS) $(TARG2_COBJS) $(TARGCMN_COBJS)
ifneq ($(CONFIG_BUILD_KERNEL),y)
ifneq ($(CONFIG_BUILD_LOADABLE),y)
TARG_OBJS += $(TARG1_MAINOBJ) $(TARG2_MAINOBJ)
endif
@ -214,7 +214,7 @@ endif
$(call ARCHIVE, $(TARG_BIN), $(TARG_OBJS))
$(Q) touch .built
ifeq ($(CONFIG_BUILD_KERNEL),y)
ifeq ($(CONFIG_BUILD_LOADABLE),y)
$(BIN_DIR)$(DELIM)$(PROGNAME1): $(OBJS) $(TARG1_MAINOBJ)
@echo "LD: $(PROGNAME1)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME1) $(ARCHCRT0OBJ) $(TARG1_MAINOBJ) $(LDLIBS)
@ -229,11 +229,11 @@ endif
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(MAINNAME1))
$(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(if $(CONFIG_BUILD_LOADABLE),,$(MAINNAME1)))
ifeq ($(CONFIG_EXAMPLES_NETTEST_TARGET2),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(MAINNAME2))
$(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(if $(CONFIG_BUILD_LOADABLE),,$(MAINNAME2)))
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat \
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat

2
examples/nettest/nettest_target1.c
View File

@ -69,7 +69,7 @@ static int server_child(int argc, char *argv[])
* nettest_main
****************************************************************************/
#if defined(CONFIG_BUILD_KERNEL)
#if defined(CONFIG_BUILD_LOADABLE)
int main(int argc, FAR char *argv[])
#elif defined(CONFIG_EXAMPLES_NETTEST_TARGET2)
int nettest1_main(int argc, char *argv[])

2
examples/nettest/nettest_target2.c
View File

@ -45,7 +45,7 @@
* nettest_main
****************************************************************************/
#ifdef CONFIG_BUILD_KERNEL
#ifdef BUILD_MODULE
int main(int argc, FAR char *argv[])
#else
int nettest2_main(int argc, char *argv[])

Some files were not shown because too many files have changed in this diff Show More