diff --git a/Application.mk b/Application.mk index 616a8ed05..153c662f7 100644 --- a/Application.mk +++ b/Application.mk @@ -37,20 +37,6 @@ include $(APPDIR)/Make.defs -ifneq ($(MAINSRC),) - ifneq ($(MODULE),) - ifeq ($(CONFIG_$(MODULE)), m) - BUILD_MODULE = y - endif - endif - - ifeq ($(BUILD_MODULE),) - ifeq ($(CONFIG_BUILD_LOADABLE),y) - BUILD_MODULE = y - endif - endif -endif - CXXEXT ?= .cxx AOBJS = $(ASRCS:.S=$(OBJEXT)) @@ -66,7 +52,7 @@ endif SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) $(CXXOBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -78,10 +64,6 @@ else INSTALL_DIR = $(BIN_DIR) endif -ifeq ($(BUILD_MODULE),y) - LDLIBS += $(BIN) -endif - ROOTDEPPATH = --dep-path . VPATH = @@ -107,11 +89,18 @@ $(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 ($(BUILD_MODULE), y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -129,7 +118,7 @@ ifneq ($(APPNAME),) ifneq ($(PRIORITY),) ifneq ($(STACKSIZE),) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(BUILD_MODULE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else @@ -156,6 +145,9 @@ endif depend: .depend clean: +ifeq ($(LOADABLE),y) + $(call DELFILE, $(APPNAME)) +endif $(call DELFILE, .built) $(call CLEAN) diff --git a/Make.defs b/Make.defs index 2716f6100..482f503c7 100644 --- a/Make.defs +++ b/Make.defs @@ -43,23 +43,46 @@ DEPCONFIG = $(TOPDIR)$(DELIM).config ifeq ($(CONFIG_WINDOWS_NATIVE),y) define REGISTER $(Q) echo Register: $1 - $(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) echo { "$1", $2, $3, $4 }, > "$(BUILTIN_REGISTRY)$(DELIM)$4.bdat" + $(Q) echo int $4(int argc, char *argv[]); > "$(BUILTIN_REGISTRY)$(DELIM)$4.pdat" $(Q) touch $(BUILTIN_REGISTRY)$(DELIM).updated" endef else define REGISTER - $(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) 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) 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 diff --git a/Makefile b/Makefile index 867639a49..7b450807e 100644 --- a/Makefile +++ b/Makefile @@ -67,8 +67,7 @@ LIBPATH ?= $(TOPDIR)$(DELIM)staging # The install path -EXE_DIR = $(APPDIR)$(DELIM)exe -BIN_DIR = $(EXE_DIR)$(DELIM)system$(DELIM)bin +BIN_DIR = $(APPDIR)$(DELIM)bin # The final build target @@ -76,13 +75,13 @@ BIN = libapps$(LIBEXT) # Symbol table for loadable apps. -SYMTABSRC = $(EXE_DIR)$(DELIM)symtab_apps.c -SYMTABOBJ = $(SYMTABSRC:.c=$(OBJEXT)) +SYMTABSRC = $(APPDIR)$(DELIM)symtab_apps.c +SYMTABOBJ = $(APPDIR)$(DELIM)symtab_apps$(OBJEXT) # Build targets all: $(BIN) -.PHONY: import install dirlinks context context_serialize clean_context context_rest .depdirs preconfig depend clean distclean +.PHONY: import symtab install dirlinks context context_serialize clean_context context_rest .depdirs preconfig depend clean distclean .PRECIOUS: libapps$(LIBEXT) define MAKE_template @@ -103,29 +102,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))) -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) - -$(SYMTABOBJ): %$(OBJEXT): %.c - $(call COMPILE, -fno-lto $<, $@) - -$(BIN): $(SYMTABOBJ) - $(call ARCHIVE, $(BIN), $^) +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 +$(BIN): $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_all) make_symbols + .install: $(foreach SDIR, $(CONFIGURED_APPS), $(SDIR)_install) $(BIN_DIR): - $(Q) mkdir -p $(BIN_DIR) + 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" diff --git a/builtin/exec_builtin.c b/builtin/exec_builtin.c index df35e58eb..ad0883653 100644 --- a/builtin/exec_builtin.c +++ b/builtin/exec_builtin.c @@ -183,19 +183,9 @@ int exec_builtin(FAR const char *appname, FAR char * const *argv, /* Start the built-in */ - if (builtin->main) - { - ret = task_spawn(&pid, builtin->name, builtin->main, &file_actions, - &attr, (argv) ? &argv[1] : (FAR char * const *)NULL, - (FAR char * const *)NULL); - } - else - { - ret = posix_spawn(&pid, builtin->name, &file_actions, - &attr, (argv) ? &argv[1] : (FAR char * const *)NULL, - 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); diff --git a/examples/README.txt b/examples/README.txt index 022c6b692..6a65075e8 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -79,7 +79,7 @@ examples/alarm Configuration: CONFIG_EXAMPLES_ALARM - Enable the RTC driver alarm test - CONFIG_EXAMPLES_ALARM_PROGNAME - If CONFIG_BUILD_LOADABLE=y, then this is + CONFIG_EXAMPLES_ALARM_PROGNAME - If CONFIG_BUILD_KERNEL=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_LOADABLE=n- This test uses + * CONFIG_BUILD_PROTECTED=n and CONFIG_BUILD_KERNEL=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_LOADABLE). + or CONFIG_BUILD_KERNEL). examples/rfid_readuid ^^^^^^^^^^^^^^^^^^^^^ diff --git a/examples/adc/adc_main.c b/examples/adc/adc_main.c index 21fcda3a8..f35546cad 100644 --- a/examples/adc/adc_main.c +++ b/examples/adc/adc_main.c @@ -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_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int adc_main(int argc, char *argv[]) diff --git a/examples/adxl372_test/Kconfig b/examples/adxl372_test/Kconfig index 8cc935914..3ab10e941 100644 --- a/examples/adxl372_test/Kconfig +++ b/examples/adxl372_test/Kconfig @@ -14,7 +14,7 @@ if EXAMPLES_ADXL372_TEST config EXAMPLES_ADXL372_TEST_PROGNAME string "Program name" default "ADXL372_test" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/adxl372_test/adxl372_test_main.c b/examples/adxl372_test/adxl372_test_main.c index a059b13a5..155b5dfcc 100644 --- a/examples/adxl372_test/adxl372_test_main.c +++ b/examples/adxl372_test/adxl372_test_main.c @@ -387,7 +387,7 @@ quick_exit: * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int adxl372_test_main(int argc, FAR char *argv[]) diff --git a/examples/ajoystick/ajoy_main.c b/examples/ajoystick/ajoy_main.c index 422199695..7d90037c6 100644 --- a/examples/ajoystick/ajoy_main.c +++ b/examples/ajoystick/ajoy_main.c @@ -376,7 +376,7 @@ static int ajoy_calibrate(int fd) * ajoy_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int ajoy_main(int argc, char *argv[]) diff --git a/examples/alarm/Kconfig b/examples/alarm/Kconfig index ceb4af2cc..47b6d9a66 100644 --- a/examples/alarm/Kconfig +++ b/examples/alarm/Kconfig @@ -15,7 +15,7 @@ if EXAMPLES_ALARM config EXAMPLES_ALARM_PROGNAME string "Program name" default "alarm" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/alarm/alarm_main.c b/examples/alarm/alarm_main.c index 7118f5b3c..b50600277 100644 --- a/examples/alarm/alarm_main.c +++ b/examples/alarm/alarm_main.c @@ -208,7 +208,7 @@ static void show_usage(FAR const char *progname) * alarm_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int alarm_main(int argc, FAR char *argv[]) diff --git a/examples/apa102/Kconfig b/examples/apa102/Kconfig index 862af1231..520251f4a 100644 --- a/examples/apa102/Kconfig +++ b/examples/apa102/Kconfig @@ -14,7 +14,7 @@ if EXAMPLES_APA102 config EXAMPLES_APA102_PROGNAME string "Program name" default "apa102" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/apa102/apa102_main.c b/examples/apa102/apa102_main.c index 477738032..98bcbdfb7 100644 --- a/examples/apa102/apa102_main.c +++ b/examples/apa102/apa102_main.c @@ -150,7 +150,7 @@ static struct apa102_ledstrip_s hsvtorgb(uint16_t h, uint8_t s, uint8_t v) * apa102_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int apa102_main(int argc, char *argv[]) diff --git a/examples/apds9960/Kconfig b/examples/apds9960/Kconfig index 0ca2d14e3..865228917 100644 --- a/examples/apds9960/Kconfig +++ b/examples/apds9960/Kconfig @@ -15,7 +15,7 @@ if EXAMPLES_APDS9960 config EXAMPLES_APDS9960_PROGNAME string "APDS-9960 Test Program name" default "apds9960" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/apds9960/apds9960_main.c b/examples/apds9960/apds9960_main.c index bf22129f5..b65de6300 100644 --- a/examples/apds9960/apds9960_main.c +++ b/examples/apds9960/apds9960_main.c @@ -62,7 +62,7 @@ * apds9960_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int apds9960_main(int argc, char *argv[]) diff --git a/examples/bastest/Makefile b/examples/bastest/Makefile index 89022a3e9..7d268f08a 100644 --- a/examples/bastest/Makefile +++ b/examples/bastest/Makefile @@ -56,7 +56,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -115,7 +115,7 @@ $(ROMFS_HDR) : $(ROMFS_IMG) # Link and install the program binary -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),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),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/examples/bastest/bastest_main.c b/examples/bastest/bastest_main.c index 6a1e92019..e42b404fc 100644 --- a/examples/bastest/bastest_main.c +++ b/examples/bastest/bastest_main.c @@ -92,7 +92,7 @@ * bastest_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int bastest_main(int argc, char *argv[]) diff --git a/examples/bmp180/Kconfig b/examples/bmp180/Kconfig index b45163fc8..4686e214f 100644 --- a/examples/bmp180/Kconfig +++ b/examples/bmp180/Kconfig @@ -15,7 +15,7 @@ if EXAMPLES_BMP180 config EXAMPLES_BMP180_PROGNAME string "Program name" default "bmp180" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/bmp180/bmp180_main.c b/examples/bmp180/bmp180_main.c index 35baec435..8cdf0bbb9 100644 --- a/examples/bmp180/bmp180_main.c +++ b/examples/bmp180/bmp180_main.c @@ -50,7 +50,7 @@ * bmp180_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int bmp180_main(int argc, char *argv[]) diff --git a/examples/bridge/Makefile b/examples/bridge/Makefile index dfbe43e33..c07a6a067 100644 --- a/examples/bridge/Makefile +++ b/examples/bridge/Makefile @@ -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_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),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_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),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),$(if $(CONFIG_BUILD_LOADABLE),,$(TARG_APPNAME)_main)) + $(call REGISTER,$(TARG_APPNAME),$(TARG_PRIORITY),$(TARG_STACKSIZE),$(TARG_APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(TARG_APPNAME)_main.bdat else diff --git a/examples/bridge/bridge_main.c b/examples/bridge/bridge_main.c index f4a10205b..18d05df0d 100644 --- a/examples/bridge/bridge_main.c +++ b/examples/bridge/bridge_main.c @@ -681,7 +681,7 @@ errout_with_recvsd: * bridge_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int bridge_main(int argc, char *argv[]) diff --git a/examples/buttons/Kconfig b/examples/buttons/Kconfig index 467f6c573..32a9e5aed 100644 --- a/examples/buttons/Kconfig +++ b/examples/buttons/Kconfig @@ -15,7 +15,7 @@ if EXAMPLES_BUTTONS config EXAMPLES_BUTTONS_PROGNAME string "Program name" default "buttons" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/buttons/buttons_main.c b/examples/buttons/buttons_main.c index b217314d1..19401a555 100644 --- a/examples/buttons/buttons_main.c +++ b/examples/buttons/buttons_main.c @@ -391,7 +391,7 @@ errout: * buttons_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int buttons_main(int argc, FAR char *argv[]) diff --git a/examples/calib_udelay/calib_udelay_main.c b/examples/calib_udelay/calib_udelay_main.c index a6a1b1056..3fb08afbc 100644 --- a/examples/calib_udelay/calib_udelay_main.c +++ b/examples/calib_udelay/calib_udelay_main.c @@ -219,7 +219,7 @@ static int linreg(FAR struct measurement_s *point, int num_points, * calib_udelay_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int calib_udelay_main(int argc, char *argv[]) diff --git a/examples/can/can_main.c b/examples/can/can_main.c index a2d05cd5b..cc326ac5b 100644 --- a/examples/can/can_main.c +++ b/examples/can/can_main.c @@ -156,7 +156,7 @@ static void show_usage(FAR const char *progname) * Name: can_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int can_main(int argc, FAR char *argv[]) diff --git a/examples/canard/canard_main.c b/examples/canard/canard_main.c index e4da975b6..5d001fc7d 100644 --- a/examples/canard/canard_main.c +++ b/examples/canard/canard_main.c @@ -508,7 +508,7 @@ errout_with_dev: * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int canard_main(int argc, FAR char *argv[]) diff --git a/examples/chat/Makefile b/examples/chat/Makefile index 323fe3ace..54909640c 100644 --- a/examples/chat/Makefile +++ b/examples/chat/Makefile @@ -48,7 +48,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -94,7 +94,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),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),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/examples/chat/chat_main.c b/examples/chat/chat_main.c index 38ca27224..1388ec30c 100644 --- a/examples/chat/chat_main.c +++ b/examples/chat/chat_main.c @@ -321,7 +321,7 @@ static int chat_parse_args(FAR struct chat_app* priv) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char** argv) #else int chat_main(int argc, FAR char** argv) diff --git a/examples/configdata/configdata_main.c b/examples/configdata/configdata_main.c index cdd49a783..6531627bc 100644 --- a/examples/configdata/configdata_main.c +++ b/examples/configdata/configdata_main.c @@ -622,7 +622,7 @@ static void configdata_cleardeleted(void) * Name: configdata_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int configdata_main(int argc, char *argv[]) diff --git a/examples/cpuhog/cpuhog_main.c b/examples/cpuhog/cpuhog_main.c index 07457cc87..4adc8b2b2 100644 --- a/examples/cpuhog/cpuhog_main.c +++ b/examples/cpuhog/cpuhog_main.c @@ -96,7 +96,7 @@ static struct state_s * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int cpuhog_main(int argc, char *argv[]) diff --git a/examples/dhcpd/target.c b/examples/dhcpd/target.c index a1954b475..f834043c2 100644 --- a/examples/dhcpd/target.c +++ b/examples/dhcpd/target.c @@ -89,7 +89,7 @@ * Name: dhcpd_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int dhcpd_main(int argc, char *argv[]) diff --git a/examples/discover/discover_main.c b/examples/discover/discover_main.c index 7281a6a4d..ec0f87ab8 100644 --- a/examples/discover/discover_main.c +++ b/examples/discover/discover_main.c @@ -84,7 +84,7 @@ * discover_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int discover_main(int argc, char *argv[]) diff --git a/examples/djoystick/djoy_main.c b/examples/djoystick/djoy_main.c index 3eca0fbcc..21813ba0b 100644 --- a/examples/djoystick/djoy_main.c +++ b/examples/djoystick/djoy_main.c @@ -140,7 +140,7 @@ static void show_joystick(djoy_buttonset_t oldset, djoy_buttonset_t newset) * djoy_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int djoy_main(int argc, char *argv[]) diff --git a/examples/dsptest/Kconfig b/examples/dsptest/Kconfig index 80698d009..eaaf73df1 100644 --- a/examples/dsptest/Kconfig +++ b/examples/dsptest/Kconfig @@ -14,7 +14,7 @@ if EXAMPLES_DSPTEST config EXAMPLES_DSPTEST_PROGNAME string "Program name" default "dsptest" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/dsptest/dsptest_main.c b/examples/dsptest/dsptest_main.c index e01ba9d02..db2fc4e03 100644 --- a/examples/dsptest/dsptest_main.c +++ b/examples/dsptest/dsptest_main.c @@ -79,7 +79,7 @@ * dsptest_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int dsptest_main(int argc, char *argv[]) diff --git a/examples/elf/Makefile b/examples/elf/Makefile index 1188219f2..43bb5eead 100644 --- a/examples/elf/Makefile +++ b/examples/elf/Makefile @@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),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_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) diff --git a/examples/elf/elf_main.c b/examples/elf/elf_main.c index 9bbfe20d5..a689de3fd 100644 --- a/examples/elf/elf_main.c +++ b/examples/elf/elf_main.c @@ -237,7 +237,7 @@ static inline void testheader(FAR const char *progname) * Name: elf_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int elf_main(int argc, char *argv[]) diff --git a/examples/fb/Kconfig b/examples/fb/Kconfig index d18f746f2..d99487bd8 100644 --- a/examples/fb/Kconfig +++ b/examples/fb/Kconfig @@ -28,7 +28,7 @@ config EXAMPLES_FB_DEFAULTFB config EXAMPLES_FB_PROGNAME string "Program name" default "fb" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/fb/fb_main.c b/examples/fb/fb_main.c index f0ce54e1e..976d17784 100644 --- a/examples/fb/fb_main.c +++ b/examples/fb/fb_main.c @@ -284,7 +284,7 @@ static void draw_rect(FAR struct fb_state_s *state, * fb_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int fb_main(int argc, char *argv[]) diff --git a/examples/fboverlay/Kconfig b/examples/fboverlay/Kconfig index f2e94909a..c796e700a 100644 --- a/examples/fboverlay/Kconfig +++ b/examples/fboverlay/Kconfig @@ -15,7 +15,7 @@ if EXAMPLES_FBOVERLAY config EXAMPLES_FBOVERLAY_PROGNAME string "Program name" default "fboverlay" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/fboverlay/fboverlay_main.c b/examples/fboverlay/fboverlay_main.c index 948afbbd8..0969baea3 100644 --- a/examples/fboverlay/fboverlay_main.c +++ b/examples/fboverlay/fboverlay_main.c @@ -1010,7 +1010,7 @@ static void usage(const char * progname) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int fboverlay_main(int argc, char *argv[]) diff --git a/examples/flash_test/Kconfig b/examples/flash_test/Kconfig index dcfc6e55d..3c58572ea 100644 --- a/examples/flash_test/Kconfig +++ b/examples/flash_test/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_FLASH_TEST bool "SMART FLASH block device test" default n - depends on (!BUILD_PROTECTED && !BUILD_LOADABLE) && MTD_SMART && NSH_BUILTIN_APPS + depends on (!BUILD_PROTECTED && !BUILD_KERNEL) && 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 diff --git a/examples/flash_test/flash_test.c b/examples/flash_test/flash_test.c index ffbcacffb..7614e759a 100644 --- a/examples/flash_test/flash_test.c +++ b/examples/flash_test/flash_test.c @@ -61,7 +61,7 @@ * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int flash_test_main(int argc, char *argv[]) diff --git a/examples/flowc/Kconfig b/examples/flowc/Kconfig index a3cbba3be..5049dfebf 100644 --- a/examples/flowc/Kconfig +++ b/examples/flowc/Kconfig @@ -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_LOADABLE + depends on BUILD_KERNEL ---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_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the Target2 program that will be use when the NSH ELF program is installed. diff --git a/examples/flowc/Makefile b/examples/flowc/Makefile index 769eda52f..170f31a11 100644 --- a/examples/flowc/Makefile +++ b/examples/flowc/Makefile @@ -100,7 +100,7 @@ endif TARG_SRCS = $(TARG1_CRCS) $(TARG1_MAINSRC) $(TARG2_CSRCS) $(TARG2_MAINSRC) TARG_OBJS = $(TARG1_COBJS) $(TARG2_COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),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_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),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),$(if $(CONFIG_BUILD_LOADABLE),,$(MAINNAME1))) + $(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(MAINNAME1)) ifeq ($(CONFIG_EXAMPLES_FLOWC_TARGET2),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(if $(CONFIG_BUILD_LOADABLE),,$(MAINNAME2))) + $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(MAINNAME2)) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat \ $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat diff --git a/examples/flowc/flowc_target1.c b/examples/flowc/flowc_target1.c index f9b72b9a4..d77f612f2 100644 --- a/examples/flowc/flowc_target1.c +++ b/examples/flowc/flowc_target1.c @@ -48,7 +48,7 @@ * flowc1_main ****************************************************************************/ -#if defined(CONFIG_BUILD_LOADABLE) +#if defined(CONFIG_BUILD_KERNEL) int main(int argc, FAR char *argv[]) #elif defined(CONFIG_EXAMPLES_FLOWC_TARGET2) int flowc1_main(int argc, char *argv[]) diff --git a/examples/flowc/flowc_target2.c b/examples/flowc/flowc_target2.c index 97ac8e492..dea669ec9 100644 --- a/examples/flowc/flowc_target2.c +++ b/examples/flowc/flowc_target2.c @@ -48,7 +48,7 @@ * flowc2_main ****************************************************************************/ -#if defined(CONFIG_BUILD_LOADABLE) +#if defined(CONFIG_BUILD_KERNEL) int main(int argc, FAR char *argv[]) #else int flowc2_main(int argc, char *argv[]) diff --git a/examples/fstest/fstest_main.c b/examples/fstest/fstest_main.c index 85221a576..c86b8f062 100644 --- a/examples/fstest/fstest_main.c +++ b/examples/fstest/fstest_main.c @@ -752,7 +752,7 @@ static int fstest_directory(void) * Name: fstest_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int fstest_main(int argc, char *argv[]) diff --git a/examples/ft80x/Kconfig b/examples/ft80x/Kconfig index 6604dfd2f..d289266d1 100644 --- a/examples/ft80x/Kconfig +++ b/examples/ft80x/Kconfig @@ -36,7 +36,7 @@ config EXAMPLES_FT80X_EXCLUDE_BITMAPS config EXAMPLES_FT80X_PROGNAME string "FT80x program name" default "ft80x" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/ft80x/ft80x_main.c b/examples/ft80x/ft80x_main.c index 93f971a85..50955fba6 100644 --- a/examples/ft80x/ft80x_main.c +++ b/examples/ft80x/ft80x_main.c @@ -288,7 +288,7 @@ static int ft80x_example(int fd, FAR struct ft80x_dlbuffer_s *buffer, * ft80x_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int ft80x_main(int argc, char *argv[]) diff --git a/examples/ftpc/ftpc_main.c b/examples/ftpc/ftpc_main.c index 131b40d63..2bd26fb3b 100644 --- a/examples/ftpc/ftpc_main.c +++ b/examples/ftpc/ftpc_main.c @@ -365,7 +365,7 @@ int ftpc_parse(SESSION handle, char *cmdline) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int ftpc_main(int argc, char **argv, char **envp) diff --git a/examples/ftpd/Makefile b/examples/ftpd/Makefile index c4605a380..b141f0279 100644 --- a/examples/ftpd/Makefile +++ b/examples/ftpd/Makefile @@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -94,7 +94,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),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),$(if $(CONFIG_BUILD_LOADABLE),,ftpd_main)) + $(call REGISTER,ftpd_start,SCHED_PRIORITY_DEFAULT,$(CONFIG_EXAMPLES_FTPD_STACKSIZE),ftpd_main) $(BUILTIN_REGISTRY)$(DELIM)ftpd_stop.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,ftpd_stop,SCHED_PRIORITY_DEFAULT,$(CONFIG_EXAMPLES_FTPD_STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,ftpd_stop)) + $(call REGISTER,ftpd_stop,SCHED_PRIORITY_DEFAULT,$(CONFIG_EXAMPLES_FTPD_STACKSIZE),ftpd_stop) context: $(BUILTIN_REGISTRY)$(DELIM)ftpd_start.bdat $(BUILTIN_REGISTRY)$(DELIM)ftpd_stop.bdat else diff --git a/examples/ftpd/ftpd_main.c b/examples/ftpd/ftpd_main.c index 7682d0021..e2b9acea4 100644 --- a/examples/ftpd/ftpd_main.c +++ b/examples/ftpd/ftpd_main.c @@ -247,7 +247,7 @@ int ftpd_daemon(int s_argc, char **s_argv) * Name: ftpd_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int ftpd_main(int s_argc, char **s_argv) diff --git a/examples/gpio/Kconfig b/examples/gpio/Kconfig index d5fffdcad..1e0d8b5f1 100644 --- a/examples/gpio/Kconfig +++ b/examples/gpio/Kconfig @@ -15,7 +15,7 @@ if EXAMPLES_GPIO config EXAMPLES_GPIO_PROGNAME string "Program name" default "gpio" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/gpio/gpio_main.c b/examples/gpio/gpio_main.c index 8b2aa8790..f864ded9a 100644 --- a/examples/gpio/gpio_main.c +++ b/examples/gpio/gpio_main.c @@ -73,7 +73,7 @@ static void show_usage(FAR const char *progname) * gpio_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int gpio_main(int argc, char *argv[]) diff --git a/examples/gps/Kconfig b/examples/gps/Kconfig index 5b2bd1ea6..0ef776911 100644 --- a/examples/gps/Kconfig +++ b/examples/gps/Kconfig @@ -15,7 +15,7 @@ if EXAMPLES_GPS config EXAMPLES_GPS_PROGNAME string "Program name" default "gps" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/gps/gps_main.c b/examples/gps/gps_main.c index 8ba7c0439..cbbc20109 100644 --- a/examples/gps/gps_main.c +++ b/examples/gps/gps_main.c @@ -54,7 +54,7 @@ * gps_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int gps_main(int argc, char *argv[]) diff --git a/examples/hello/Kconfig b/examples/hello/Kconfig index 02330f74c..ae46e5918 100644 --- a/examples/hello/Kconfig +++ b/examples/hello/Kconfig @@ -14,7 +14,7 @@ if EXAMPLES_HELLO config EXAMPLES_HELLO_PROGNAME string "Program name" default "hello" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/hello/Makefile b/examples/hello/Makefile index 2bc97dced..f7b1c0cf9 100644 --- a/examples/hello/Makefile +++ b/examples/hello/Makefile @@ -42,8 +42,12 @@ 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 diff --git a/examples/hello/hello_main.c b/examples/hello/hello_main.c index a33d3bde7..8a3d5bcec 100644 --- a/examples/hello/hello_main.c +++ b/examples/hello/hello_main.c @@ -48,7 +48,7 @@ * hello_main ****************************************************************************/ -#if defined (CONFIG_BUILD_LOADABLE) +#if defined (CONFIG_BUILD_KERNEL) || defined (LOADABLE_APP) int main(int argc, FAR char *argv[]) #else int hello_main(int argc, char *argv[]) diff --git a/examples/helloxx/Makefile b/examples/helloxx/Makefile index 6bb097f0d..fe69e14ee 100644 --- a/examples/helloxx/Makefile +++ b/examples/helloxx/Makefile @@ -49,7 +49,11 @@ PROGNAME = $(CONFIG_EXAMPLES_HELLOXX_PROGNAME) APPNAME = helloxx +ifeq ($(CONFIG_EXAMPLES_HELLOXX),m) +LOADABLE = y +else PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +endif include $(APPDIR)/Application.mk diff --git a/examples/helloxx/helloxx_main.cxx b/examples/helloxx/helloxx_main.cxx index e8754804e..62991d34d 100644 --- a/examples/helloxx/helloxx_main.cxx +++ b/examples/helloxx/helloxx_main.cxx @@ -127,7 +127,7 @@ static CHelloWorld g_HelloWorld; extern "C" { -#if defined (CONFIG_BUILD_LOADABLE) +#if defined (CONFIG_BUILD_KERNEL) || defined (LOADABLE_APP) int main(int argc, FAR char *argv[]) #else int helloxx_main(int argc, char *argv[]) diff --git a/examples/hidkbd/Kconfig b/examples/hidkbd/Kconfig index d8a267c41..c48ca98fe 100644 --- a/examples/hidkbd/Kconfig +++ b/examples/hidkbd/Kconfig @@ -14,7 +14,7 @@ if EXAMPLES_HIDKBD config EXAMPLES_HIDKBD_PROGNAME string "Program name" default "hidkbd" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the Nettest program is installed. diff --git a/examples/hidkbd/hidkbd_main.c b/examples/hidkbd/hidkbd_main.c index 369bc3f85..d3dc8f787 100644 --- a/examples/hidkbd/hidkbd_main.c +++ b/examples/hidkbd/hidkbd_main.c @@ -200,7 +200,7 @@ static void hidkbd_decode(FAR char *buffer, ssize_t nbytes) * Name: hidkbd_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int hidkbd_main(int argc, char *argv[]) diff --git a/examples/i2schar/Kconfig b/examples/i2schar/Kconfig index 157218708..853c9d2f5 100644 --- a/examples/i2schar/Kconfig +++ b/examples/i2schar/Kconfig @@ -78,7 +78,7 @@ config EXAMPLES_I2SCHAR_BUFSIZE config EXAMPLES_I2SCHAR_DEVINIT bool "Architecture-specific device initialization" default 256 - depends on !BUILD_PROTECTED && !BUILD_LOADABLE + depends on !BUILD_PROTECTED && !BUILD_KERNEL ---help--- Define if architecture-specific I2S device initialize is available. If defined, the platform specific code must provide a function diff --git a/examples/i2schar/i2schar_main.c b/examples/i2schar/i2schar_main.c index bf87fa6bd..fe98a4275 100644 --- a/examples/i2schar/i2schar_main.c +++ b/examples/i2schar/i2schar_main.c @@ -236,7 +236,7 @@ static void parse_args(FAR struct i2schar_state_s *i2schar, int argc, FAR char * * Name: i2schar_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int i2schar_main(int argc, char *argv[]) diff --git a/examples/i2sloop/i2sloop_main.c b/examples/i2sloop/i2sloop_main.c index 973f96d77..4728c1507 100644 --- a/examples/i2sloop/i2sloop_main.c +++ b/examples/i2sloop/i2sloop_main.c @@ -73,7 +73,7 @@ static void _signal_handler(int number) * Name: i2sloop_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int i2sloop_main(int argc, char *argv[]) diff --git a/examples/igmp/igmp.c b/examples/igmp/igmp.c index 9426fac2a..9829b291f 100644 --- a/examples/igmp/igmp.c +++ b/examples/igmp/igmp.c @@ -83,7 +83,7 @@ * igmp_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int igmp_main(int argc, char *argv[]) diff --git a/examples/ina219/Kconfig b/examples/ina219/Kconfig index 17ac70361..c882fe588 100644 --- a/examples/ina219/Kconfig +++ b/examples/ina219/Kconfig @@ -14,7 +14,7 @@ if EXAMPLES_INA219 config EXAMPLES_INA219_PROGNAME string "Program name" default "ina219" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/ina219/ina219_main.c b/examples/ina219/ina219_main.c index d9c71f17e..0b81bcaa2 100644 --- a/examples/ina219/ina219_main.c +++ b/examples/ina219/ina219_main.c @@ -51,7 +51,7 @@ * ina219_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int ina219_main(int argc, char *argv[]) diff --git a/examples/ipforward/Kconfig b/examples/ipforward/Kconfig index aa9ec6ae0..d896041e3 100644 --- a/examples/ipforward/Kconfig +++ b/examples/ipforward/Kconfig @@ -30,7 +30,7 @@ endchoice # L3 Protocol config EXAMPLES_IPFORWARD_PROGNAME string "IP forwarding rogram name" default "ipfwd" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/ipforward/ipforward.c b/examples/ipforward/ipforward.c index e26deae22..150d1b478 100644 --- a/examples/ipforward/ipforward.c +++ b/examples/ipforward/ipforward.c @@ -760,7 +760,7 @@ static FAR void *ipfwd_sender(FAR void *arg) * Name: fstest_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int ipfwd_main(int argc, char *argv[]) diff --git a/examples/json/json_main.c b/examples/json/json_main.c index d3a7e1cae..3eff2e67f 100644 --- a/examples/json/json_main.c +++ b/examples/json/json_main.c @@ -237,7 +237,7 @@ static void create_objects(void) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int json_main(int argc, const char *argv[]) diff --git a/examples/leds/Kconfig b/examples/leds/Kconfig index 56627ab3d..630c34601 100644 --- a/examples/leds/Kconfig +++ b/examples/leds/Kconfig @@ -15,7 +15,7 @@ if EXAMPLES_LEDS config EXAMPLES_LEDS_PROGNAME string "Program name" default "leds" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/leds/leds_main.c b/examples/leds/leds_main.c index 37cd74db5..b8f51e015 100644 --- a/examples/leds/leds_main.c +++ b/examples/leds/leds_main.c @@ -191,7 +191,7 @@ errout: * leds_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int leds_main(int argc, FAR char *argv[]) diff --git a/examples/lis3dsh_reader/Kconfig b/examples/lis3dsh_reader/Kconfig index 8ebb11cc1..dd2ff8940 100755 --- a/examples/lis3dsh_reader/Kconfig +++ b/examples/lis3dsh_reader/Kconfig @@ -16,7 +16,7 @@ if EXAMPLES_LIS3DSH_READER config EXAMPLES_LIS3DSH_READER_PROGNAME string "Program name" default "lis3dsh_reader" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/lis3dsh_reader/lis3dsh_reader_main.c b/examples/lis3dsh_reader/lis3dsh_reader_main.c index 8f265c18d..ef253c297 100644 --- a/examples/lis3dsh_reader/lis3dsh_reader_main.c +++ b/examples/lis3dsh_reader/lis3dsh_reader_main.c @@ -52,7 +52,7 @@ * lis3dsh_reader_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int lis3dsh_reader_main(int argc, FAR char *argv[]) diff --git a/examples/lsm330spi_test/Kconfig b/examples/lsm330spi_test/Kconfig index 905f16753..0abc6b4d5 100644 --- a/examples/lsm330spi_test/Kconfig +++ b/examples/lsm330spi_test/Kconfig @@ -14,7 +14,7 @@ if EXAMPLES_LSM330SPI_TEST config EXAMPLES_LSM330SPI_TEST_PROGNAME string "Program name" default "lsm330spi_test" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/lsm330spi_test/lsm330spi_test_main.c b/examples/lsm330spi_test/lsm330spi_test_main.c index 9725361fe..e68bfb873 100644 --- a/examples/lsm330spi_test/lsm330spi_test_main.c +++ b/examples/lsm330spi_test/lsm330spi_test_main.c @@ -623,7 +623,7 @@ quick_exit: * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int lsm330spi_test_main(int argc, FAR char *argv[]) diff --git a/examples/lvgldemo/lvgldemo.c b/examples/lvgldemo/lvgldemo.c index 55bf9c6f3..e41023f03 100644 --- a/examples/lvgldemo/lvgldemo.c +++ b/examples/lvgldemo/lvgldemo.c @@ -141,7 +141,7 @@ static FAR void *tick_func(void *data) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int lvgldemo_main(int argc, char *argv[]) diff --git a/examples/max31855/Kconfig b/examples/max31855/Kconfig index da2c7e327..f04c4f716 100644 --- a/examples/max31855/Kconfig +++ b/examples/max31855/Kconfig @@ -14,7 +14,7 @@ if EXAMPLES_MAX31855 config EXAMPLES_MAX31855_PROGNAME string "Program name" default "max31855" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/max31855/max31855_main.c b/examples/max31855/max31855_main.c index e15feab53..45a74e834 100644 --- a/examples/max31855/max31855_main.c +++ b/examples/max31855/max31855_main.c @@ -49,7 +49,7 @@ * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int max31855_main(int argc, char *argv[]) diff --git a/examples/media/Kconfig b/examples/media/Kconfig index ef0ded5d7..e3cea02c0 100644 --- a/examples/media/Kconfig +++ b/examples/media/Kconfig @@ -65,7 +65,7 @@ config EXAMPLES_MEDIA_BLOCKSIZE config EXAMPLES_MEDIA_PROGNAME string "Program name" default "media" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/media/media_main.c b/examples/media/media_main.c index 49ef27a78..acf401763 100644 --- a/examples/media/media_main.c +++ b/examples/media/media_main.c @@ -124,7 +124,7 @@ static void get_blocksize(int fd, FAR struct media_info_s *info) * media_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int media_main(int argc, FAR char *argv[]) diff --git a/examples/mm/mm_main.c b/examples/mm/mm_main.c index 9d443a60e..40ddc7618 100644 --- a/examples/mm/mm_main.c +++ b/examples/mm/mm_main.c @@ -287,7 +287,7 @@ static void do_frees(void **mem, const int *size, const int *seq, int n) * Name: mm_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int mm_main(int argc, char *argv[]) diff --git a/examples/modbus/modbus_main.c b/examples/modbus/modbus_main.c index a6eadb661..f328b4db1 100644 --- a/examples/modbus/modbus_main.c +++ b/examples/modbus/modbus_main.c @@ -359,7 +359,7 @@ static void modbus_showusage(FAR const char *progname, int exitcode) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int modbus_main(int argc, char *argv[]) diff --git a/examples/module/Kconfig b/examples/module/Kconfig index 3dc7e272d..e99f602d1 100644 --- a/examples/module/Kconfig +++ b/examples/module/Kconfig @@ -128,7 +128,7 @@ config EXAMPLES_MODULE_NOSTRIP config EXAMPLES_MODULE_LIBC bool "Link with LIBC" default n - depends on !BUILD_LOADABLE && EXPERIMENTAL + depends on !BUILD_KERNEL && 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_LOADABLE && EXPERIMENTAL + depends on !BUILD_KERNEL && EXPERIMENTAL endif diff --git a/examples/module/Makefile b/examples/module/Makefile index c98691d37..ecb65d380 100644 --- a/examples/module/Makefile +++ b/examples/module/Makefile @@ -64,7 +64,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),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_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -131,7 +131,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/examples/module/module_main.c b/examples/module/module_main.c index dd5eb0fee..d536a85bf 100644 --- a/examples/module/module_main.c +++ b/examples/module/module_main.c @@ -147,7 +147,7 @@ extern const int g_mod_nexports; * Name: module_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int module_main(int argc, char *argv[]) diff --git a/examples/mount/mount_main.c b/examples/mount/mount_main.c index d5e9a175f..e0e2520a2 100644 --- a/examples/mount/mount_main.c +++ b/examples/mount/mount_main.c @@ -571,7 +571,7 @@ static void succeed_stat(const char *path) * Name: mount_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int mount_main(int argc, char *argv[]) diff --git a/examples/mtdpart/Kconfig b/examples/mtdpart/Kconfig index 893c53677..9b1e228f2 100644 --- a/examples/mtdpart/Kconfig +++ b/examples/mtdpart/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_MTDPART bool "MTD partition test" default n - depends on MTD_PARTITION && !BUILD_PROTECTED && !BUILD_LOADABLE + depends on MTD_PARTITION && !BUILD_PROTECTED && !BUILD_KERNEL ---help--- Enable the MTD partition test example. diff --git a/examples/mtdpart/mtdpart_main.c b/examples/mtdpart/mtdpart_main.c index 41cf3de22..8eb7bb89c 100644 --- a/examples/mtdpart/mtdpart_main.c +++ b/examples/mtdpart/mtdpart_main.c @@ -136,7 +136,7 @@ extern FAR struct mtd_dev_s *mtdpart_archinitialize(void); * Name: mtdpart_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int mtdpart_main(int argc, char *argv[]) diff --git a/examples/mtdrwb/Kconfig b/examples/mtdrwb/Kconfig index d23d615ff..03b3f4ace 100644 --- a/examples/mtdrwb/Kconfig +++ b/examples/mtdrwb/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_MTDRWB bool "MTD R/W buffer test" default n - depends on (MTD_WRBUFFER || MTD_READAHEAD) && !BUILD_PROTECTED && !BUILD_LOADABLE + depends on (MTD_WRBUFFER || MTD_READAHEAD) && !BUILD_PROTECTED && !BUILD_KERNEL ---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_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/mtdrwb/mtdrwb_main.c b/examples/mtdrwb/mtdrwb_main.c index 459169903..d7f68a265 100644 --- a/examples/mtdrwb/mtdrwb_main.c +++ b/examples/mtdrwb/mtdrwb_main.c @@ -132,7 +132,7 @@ extern FAR struct mtd_dev_s *mtdrwb_archinitialize(void); * Name: mtdrwb_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int mtdrwb_main(int argc, char *argv[]) diff --git a/examples/netloop/lo_main.c b/examples/netloop/lo_main.c index 26fc80d19..f01965154 100644 --- a/examples/netloop/lo_main.c +++ b/examples/netloop/lo_main.c @@ -249,7 +249,7 @@ errout_with_socket: * Name: netloop_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int netloop_main(int argc, char *argv[]) diff --git a/examples/netpkt/netpkt_main.c b/examples/netpkt/netpkt_main.c index c04bced8e..c52d5bbe4 100644 --- a/examples/netpkt/netpkt_main.c +++ b/examples/netpkt/netpkt_main.c @@ -129,7 +129,7 @@ static void netpkt_usage(void) * Name: netpkt_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int netpkt_main(int argc, char **argv) diff --git a/examples/nettest/Kconfig b/examples/nettest/Kconfig index 3ea5d8d3c..f103b99d4 100644 --- a/examples/nettest/Kconfig +++ b/examples/nettest/Kconfig @@ -23,7 +23,7 @@ config EXAMPLES_NETTEST_SENDSIZE config EXAMPLES_NETTEST_PROGNAME1 string "Target1 program name" default "nettest" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---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_LOADABLE + depends on BUILD_KERNEL ---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_LOADABLE && !EXAMPLES_NETTEST_LOOPBACK + depends on !BUILD_KERNEL && !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 diff --git a/examples/nettest/Makefile b/examples/nettest/Makefile index fabd7c5ce..f456ac2ce 100644 --- a/examples/nettest/Makefile +++ b/examples/nettest/Makefile @@ -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_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),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_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),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),$(if $(CONFIG_BUILD_LOADABLE),,$(MAINNAME1))) + $(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(MAINNAME1)) ifeq ($(CONFIG_EXAMPLES_NETTEST_TARGET2),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(if $(CONFIG_BUILD_LOADABLE),,$(MAINNAME2))) + $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(MAINNAME2)) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat \ $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat diff --git a/examples/nettest/nettest_target1.c b/examples/nettest/nettest_target1.c index 2c74c44ae..2d6076708 100644 --- a/examples/nettest/nettest_target1.c +++ b/examples/nettest/nettest_target1.c @@ -69,7 +69,7 @@ static int server_child(int argc, char *argv[]) * nettest_main ****************************************************************************/ -#if defined(CONFIG_BUILD_LOADABLE) +#if defined(CONFIG_BUILD_KERNEL) int main(int argc, FAR char *argv[]) #elif defined(CONFIG_EXAMPLES_NETTEST_TARGET2) int nettest1_main(int argc, char *argv[]) diff --git a/examples/nettest/nettest_target2.c b/examples/nettest/nettest_target2.c index ce6ada3c0..277b1e1df 100644 --- a/examples/nettest/nettest_target2.c +++ b/examples/nettest/nettest_target2.c @@ -45,7 +45,7 @@ * nettest_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int nettest2_main(int argc, char *argv[]) diff --git a/examples/nrf24l01_term/nrf24l01_term.c b/examples/nrf24l01_term/nrf24l01_term.c index ec5d5ab0a..2620e9885 100644 --- a/examples/nrf24l01_term/nrf24l01_term.c +++ b/examples/nrf24l01_term/nrf24l01_term.c @@ -260,7 +260,7 @@ void usage(void) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int nrf24l01_term_main(int argc, char *argv[]) diff --git a/examples/null/null_main.c b/examples/null/null_main.c index 8a4874b11..60e44af09 100644 --- a/examples/null/null_main.c +++ b/examples/null/null_main.c @@ -63,7 +63,7 @@ * Name: null_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, char *argv[]) #else int null_main(int argc, char *argv[]) diff --git a/examples/nunchuck/nunchuck_main.c b/examples/nunchuck/nunchuck_main.c index 5edc8daa4..63d96d9ac 100644 --- a/examples/nunchuck/nunchuck_main.c +++ b/examples/nunchuck/nunchuck_main.c @@ -379,7 +379,7 @@ static int nunchuck_calibrate(int fd) * nunchuck_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int nunchuck_main(int argc, char *argv[]) diff --git a/examples/nx/nx_main.c b/examples/nx/nx_main.c index 5e74e4ab3..cf6775eea 100644 --- a/examples/nx/nx_main.c +++ b/examples/nx/nx_main.c @@ -514,7 +514,7 @@ static int nxeg_initialize(void) * Name: nx_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int nx_main(int argc, char *argv[]) diff --git a/examples/nxdemo/nxdemo_main.c b/examples/nxdemo/nxdemo_main.c index b1ba2b60c..741f17037 100644 --- a/examples/nxdemo/nxdemo_main.c +++ b/examples/nxdemo/nxdemo_main.c @@ -205,7 +205,7 @@ static inline int nxdemo_initialize(void) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int nxdemo_main(int argc, char *argv[]) diff --git a/examples/nxffs/nxffs_main.c b/examples/nxffs/nxffs_main.c index 4807db176..5e501ce16 100644 --- a/examples/nxffs/nxffs_main.c +++ b/examples/nxffs/nxffs_main.c @@ -783,7 +783,7 @@ static int nxffs_directory(void) * Name: nxffs_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int nxffs_main(int argc, char *argv[]) diff --git a/examples/nxflat/Kconfig b/examples/nxflat/Kconfig index f1e48c825..963a26d8e 100644 --- a/examples/nxflat/Kconfig +++ b/examples/nxflat/Kconfig @@ -7,7 +7,7 @@ config EXAMPLES_NXFLAT bool "NXFLAT example" default n select LIBC_EXECFUNCS - depends on NXFLAT && !BUILD_LOADABLE + depends on NXFLAT && !BUILD_KERNEL ---help--- Enable the NXFLAT example diff --git a/examples/nxflat/Makefile b/examples/nxflat/Makefile index 647a20d13..2ec8772d2 100644 --- a/examples/nxflat/Makefile +++ b/examples/nxflat/Makefile @@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -96,7 +96,7 @@ headers: $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) diff --git a/examples/nxflat/nxflat_main.c b/examples/nxflat/nxflat_main.c index 4af306852..d2fa4631a 100644 --- a/examples/nxflat/nxflat_main.c +++ b/examples/nxflat/nxflat_main.c @@ -156,7 +156,7 @@ static inline void testheader(FAR const char *progname) * Name: nxflat_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int nxflat_main(int argc, char *argv[]) diff --git a/examples/nxhello/Kconfig b/examples/nxhello/Kconfig index 14e38aa3f..8d69cdd73 100644 --- a/examples/nxhello/Kconfig +++ b/examples/nxhello/Kconfig @@ -16,7 +16,7 @@ if EXAMPLES_NXHELLO config EXAMPLES_NXHELLO_PROGNAME string "NX Hello Program name" default "nxhello" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/nxhello/nxhello_main.c b/examples/nxhello/nxhello_main.c index 9c7d44ddb..5d2286fe0 100644 --- a/examples/nxhello/nxhello_main.c +++ b/examples/nxhello/nxhello_main.c @@ -179,7 +179,7 @@ static inline int nxhello_initialize(void) * Name: nxhello_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int nxhello_main(int argc, char *argv[]) diff --git a/examples/nximage/Kconfig b/examples/nximage/Kconfig index fc6c47dc3..76e006581 100644 --- a/examples/nximage/Kconfig +++ b/examples/nximage/Kconfig @@ -16,7 +16,7 @@ if EXAMPLES_NXIMAGE config EXAMPLES_NXIMAGE_PROGNAME string "NX Image Program name" default "nxhello" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/nximage/nximage_main.c b/examples/nximage/nximage_main.c index 24ce5cc3a..453b71950 100644 --- a/examples/nximage/nximage_main.c +++ b/examples/nximage/nximage_main.c @@ -187,7 +187,7 @@ static inline int nximage_initialize(void) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int nximage_main(int argc, char *argv[]) diff --git a/examples/nxlines/Kconfig b/examples/nxlines/Kconfig index 25b3e030c..60c47920d 100644 --- a/examples/nxlines/Kconfig +++ b/examples/nxlines/Kconfig @@ -16,7 +16,7 @@ if EXAMPLES_NXLINES config EXAMPLES_NXLINES_PROGNAME string "NX lines program name" default "nxhello" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/nxlines/nxlines_main.c b/examples/nxlines/nxlines_main.c index b2daca533..694c0cb55 100644 --- a/examples/nxlines/nxlines_main.c +++ b/examples/nxlines/nxlines_main.c @@ -204,7 +204,7 @@ static inline int nxlines_initialize(void) * Name: nxlines_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int nxlines_main(int argc, char *argv[]) diff --git a/examples/nxterm/nxterm_main.c b/examples/nxterm/nxterm_main.c index ed05d1791..f420ffd7e 100644 --- a/examples/nxterm/nxterm_main.c +++ b/examples/nxterm/nxterm_main.c @@ -221,7 +221,7 @@ static int nxterm_task(int argc, char **argv) * Name: nxterm_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int nxterm_main(int argc, char **argv) diff --git a/examples/nxtext/nxtext_main.c b/examples/nxtext/nxtext_main.c index 2a164843e..dc1600c36 100644 --- a/examples/nxtext/nxtext_main.c +++ b/examples/nxtext/nxtext_main.c @@ -262,7 +262,7 @@ static int nxtext_initialize(void) * Name: nxtext_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int nxtext_main(int argc, char **argv) diff --git a/examples/obd2/obd2_main.c b/examples/obd2/obd2_main.c index cec6daa02..52195252a 100644 --- a/examples/obd2/obd2_main.c +++ b/examples/obd2/obd2_main.c @@ -52,7 +52,7 @@ * obd2_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int obd2_main(int argc, char *argv[]) diff --git a/examples/oneshot/Kconfig b/examples/oneshot/Kconfig index d18d16955..31e696a22 100644 --- a/examples/oneshot/Kconfig +++ b/examples/oneshot/Kconfig @@ -57,7 +57,7 @@ config EXAMPLES_ONESHOT_PRIORITY config EXAMPLES_ONESHOT_PROGNAME string "Oneshot timer program name" default "oneshot" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/oneshot/oneshot_main.c b/examples/oneshot/oneshot_main.c index ee94a8928..613b01a0d 100644 --- a/examples/oneshot/oneshot_main.c +++ b/examples/oneshot/oneshot_main.c @@ -106,7 +106,7 @@ static void show_usage(FAR const char *progname) * Name: oneshot_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int oneshot_main(int argc, char *argv[]) diff --git a/examples/ostest/ostest_main.c b/examples/ostest/ostest_main.c index 1514564f1..79d4de913 100644 --- a/examples/ostest/ostest_main.c +++ b/examples/ostest/ostest_main.c @@ -217,7 +217,7 @@ static void show_environment(bool var1_valid, bool var2_valid, bool var3_valid) * Name: user_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else static int user_main(int argc, char *argv[]) @@ -581,7 +581,7 @@ static void stdio_test(void) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL /**************************************************************************** int main(int argc, FAR char **argv) * ostest_main diff --git a/examples/ostest/restart.c b/examples/ostest/restart.c index 61c04a140..1201db948 100644 --- a/examples/ostest/restart.c +++ b/examples/ostest/restart.c @@ -79,7 +79,7 @@ static bool g_restarted; * Private Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else static int restart_main(int argc, char *argv[]) diff --git a/examples/ostest/waitpid.c b/examples/ostest/waitpid.c index 2527c9ea3..687f50ca2 100644 --- a/examples/ostest/waitpid.c +++ b/examples/ostest/waitpid.c @@ -67,7 +67,7 @@ static int g_waitpids[NCHILDREN]; * Priviate Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else static int waitpid_main(int argc, char *argv[]) diff --git a/examples/pashello/pashello.c b/examples/pashello/pashello.c index c0261e9af..344ba242e 100644 --- a/examples/pashello/pashello.c +++ b/examples/pashello/pashello.c @@ -75,7 +75,7 @@ * pashello_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int pashello_main(int argc, FAR char *argv[]) diff --git a/examples/pca9635/Kconfig b/examples/pca9635/Kconfig index db3f08226..78b48a341 100644 --- a/examples/pca9635/Kconfig +++ b/examples/pca9635/Kconfig @@ -14,7 +14,7 @@ if EXAMPLES_PCA9635 config EXAMPLES_PCA9635_PROGNAME string "Program name" default "pca9635" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/pca9635/pca9635_main.c b/examples/pca9635/pca9635_main.c index 477c9eba9..42ab4d914 100644 --- a/examples/pca9635/pca9635_main.c +++ b/examples/pca9635/pca9635_main.c @@ -66,7 +66,7 @@ * pca9635_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int pca9635_main(int argc, char *argv[]) diff --git a/examples/pdcurses/Makefile b/examples/pdcurses/Makefile index b874f3cc5..3f83cf019 100644 --- a/examples/pdcurses/Makefile +++ b/examples/pdcurses/Makefile @@ -85,7 +85,7 @@ MAINOBJS = $(CHARSETMAINOBJ) $(FIREWORKMAINOBJ) $(NEWDEMOMAINOBJ) $(PANELMAINOBJ SRCS = $(ASRCS) $(CSRCS) $(CXXSRCS) $(MAINSRCS) OBJS = $(AOBJS) $(COBJS) $(CXXOBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJS) endif @@ -121,7 +121,7 @@ $(MAINOBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch $@ -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(CHARSETNAME): $(OBJS) $(CHARSETMAINOBJ) @echo "LD: $(CHARSETNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(CHARSETNAME) $(ARCHCRT0OBJ) $(CHARSETMAINOBJ) $(LDLIBS) @@ -176,31 +176,31 @@ preconfig: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(CHARSETNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(CHARSETNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(CHARSETNAME)_main)) + $(call REGISTER,$(CHARSETNAME),$(PRIORITY),$(STACKSIZE),$(CHARSETNAME)_main) $(BUILTIN_REGISTRY)$(DELIM)$(FIREWORKNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(FIREWORKNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(FIREWORKNAME)_main)) + $(call REGISTER,$(FIREWORKNAME),$(PRIORITY),$(STACKSIZE),$(FIREWORKNAME)_main) $(BUILTIN_REGISTRY)$(DELIM)$(NEWDEMONAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(NEWDEMONAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(NEWDEMONAME)_main)) + $(call REGISTER,$(NEWDEMONAME),$(PRIORITY),$(STACKSIZE),$(NEWDEMONAME)_main) $(BUILTIN_REGISTRY)$(DELIM)$(PANELNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(PANELNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(PANELNAME)_main)) + $(call REGISTER,$(PANELNAME),$(PRIORITY),$(STACKSIZE),$(PANELNAME)_main) $(BUILTIN_REGISTRY)$(DELIM)$(RAINNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(RAINNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(RAINNAME)_main)) + $(call REGISTER,$(RAINNAME),$(PRIORITY),$(STACKSIZE),$(RAINNAME)_main) $(BUILTIN_REGISTRY)$(DELIM)$(TESTCURSNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(TESTCURSNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(TESTCURSNAME)_main)) + $(call REGISTER,$(TESTCURSNAME),$(PRIORITY),$(STACKSIZE),$(TESTCURSNAME)_main) $(BUILTIN_REGISTRY)$(DELIM)$(TUINAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(TUINAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(TUINAME)_main)) + $(call REGISTER,$(TUINAME),$(PRIORITY),$(STACKSIZE),$(TUINAME)_main) $(BUILTIN_REGISTRY)$(DELIM)$(WORMNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(WORMNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(WORMNAME)_main)) + $(call REGISTER,$(WORMNAME),$(PRIORITY),$(STACKSIZE),$(WORMNAME)_main) $(BUILTIN_REGISTRY)$(DELIM)$(XMASNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(XMASNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(XMASNAME)_main)) + $(call REGISTER,$(XMASNAME),$(PRIORITY),$(STACKSIZE),$(XMASNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(CHARSETNAME)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(FIREWORKNAME)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(NEWDEMONAME)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(PANELNAME)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(RAINNAME)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(TESTCURSNAME)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(TUINAME)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(WORMNAME)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(XMASNAME)_main.bdat else diff --git a/examples/pdcurses/charset_main.c b/examples/pdcurses/charset_main.c index 8ffe8bd10..6defc67e8 100644 --- a/examples/pdcurses/charset_main.c +++ b/examples/pdcurses/charset_main.c @@ -61,7 +61,7 @@ static short color_table[] = * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int charset_main(int argc, char *argv[]) diff --git a/examples/pdcurses/firework_main.c b/examples/pdcurses/firework_main.c index 7c7ae539e..469646540 100644 --- a/examples/pdcurses/firework_main.c +++ b/examples/pdcurses/firework_main.c @@ -143,7 +143,7 @@ static void explode(int row, int col) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int firework_main(int argc, char *argv[]) diff --git a/examples/pdcurses/newdemo_main.c b/examples/pdcurses/newdemo_main.c index a7738691f..03a19dfaf 100644 --- a/examples/pdcurses/newdemo_main.c +++ b/examples/pdcurses/newdemo_main.c @@ -296,7 +296,7 @@ static int bouncing_balls(WINDOW *win) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int newdemo_main(int argc, char *argv[]) diff --git a/examples/pdcurses/panel_main.c b/examples/pdcurses/panel_main.c index d13b4e5e2..58d0b5164 100644 --- a/examples/pdcurses/panel_main.c +++ b/examples/pdcurses/panel_main.c @@ -163,7 +163,7 @@ static void fill_panel(PANEL *pan) } } -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int panel_main(int argc, char *argv[]) diff --git a/examples/pdcurses/rain_main.c b/examples/pdcurses/rain_main.c index c4ba7cb88..c328156d8 100644 --- a/examples/pdcurses/rain_main.c +++ b/examples/pdcurses/rain_main.c @@ -75,7 +75,7 @@ static int next_j(int j) return j; } -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int rain_main(int argc, char *argv[]) diff --git a/examples/pdcurses/testcurs_main.c b/examples/pdcurses/testcurs_main.c index 5eef045a7..1adfed9dd 100644 --- a/examples/pdcurses/testcurs_main.c +++ b/examples/pdcurses/testcurs_main.c @@ -1198,7 +1198,7 @@ void display_menu(int old_option, int new_option) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int testcurs_main(int argc, char *argv[]) diff --git a/examples/pdcurses/tui_main.c b/examples/pdcurses/tui_main.c index 3fd5ef1c7..67fcb3a79 100644 --- a/examples/pdcurses/tui_main.c +++ b/examples/pdcurses/tui_main.c @@ -281,7 +281,7 @@ static void subsub(void) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int tui_main(int argc, char *argv[]) diff --git a/examples/pdcurses/worm_main.c b/examples/pdcurses/worm_main.c index d692b2dbd..9f527a9ea 100644 --- a/examples/pdcurses/worm_main.c +++ b/examples/pdcurses/worm_main.c @@ -602,7 +602,7 @@ static void cleanup(void) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int worm_main(int argc, char *argv[]) diff --git a/examples/pdcurses/xmas_main.c b/examples/pdcurses/xmas_main.c index c3d788a05..961bc5d55 100644 --- a/examples/pdcurses/xmas_main.c +++ b/examples/pdcurses/xmas_main.c @@ -783,7 +783,7 @@ static void reindeer(void) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int xmas_main(int argc, char *argv[]) diff --git a/examples/pf_ieee802154/Kconfig b/examples/pf_ieee802154/Kconfig index 2a12b452c..9d7485172 100644 --- a/examples/pf_ieee802154/Kconfig +++ b/examples/pf_ieee802154/Kconfig @@ -15,7 +15,7 @@ if EXAMPLES_PFIEEE802154 config EXAMPLES_PFIEEE802154_PROGNAME1 string "Target1 program name" default "pfserver" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the Target1 program that will be use when the NSH ELF program is installed. @@ -31,7 +31,7 @@ config EXAMPLES_PFIEEE802154_STACKSIZE1 config EXAMPLES_PFIEEE802154_PROGNAME2 string "Target2 program name" default "pfclient" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the Target2 program that will be use when the NSH ELF program is installed. diff --git a/examples/pf_ieee802154/Makefile b/examples/pf_ieee802154/Makefile index ab122dfa2..b30a6e976 100644 --- a/examples/pf_ieee802154/Makefile +++ b/examples/pf_ieee802154/Makefile @@ -120,7 +120,7 @@ $(BIN): $(OBJS) $(MAINOBJS) .built: $(BIN) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME1): $(OBJS) $(TARG1_MAINOBJ) @echo "LD: $(PROGNAME1)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME1) $(ARCHCRT0OBJ) $(TARG1_MAINOBJ) $(LDLIBS) @@ -140,10 +140,10 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(if $(CONFIG_BUILD_LOADABLE),,$(MAINNAME1))) + $(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(MAINNAME1)) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(if $(CONFIG_BUILD_LOADABLE),,$(MAINNAME2))) + $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(MAINNAME2)) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat \ $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat diff --git a/examples/pf_ieee802154/pf_client.c b/examples/pf_ieee802154/pf_client.c index a9f50e7cb..068293df5 100644 --- a/examples/pf_ieee802154/pf_client.c +++ b/examples/pf_ieee802154/pf_client.c @@ -108,7 +108,7 @@ static inline void fill_buffer(unsigned char *buf, int offset) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int pfclient_main(int argc, char *argv[]) diff --git a/examples/pf_ieee802154/pf_server.c b/examples/pf_ieee802154/pf_server.c index 8f444ee2c..f7e39214a 100644 --- a/examples/pf_ieee802154/pf_server.c +++ b/examples/pf_ieee802154/pf_server.c @@ -84,7 +84,7 @@ static inline int check_buffer(unsigned char *buf) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int pfserver_main(int argc, char *argv[]) diff --git a/examples/pipe/pipe_main.c b/examples/pipe/pipe_main.c index 0d8824e42..168e313cb 100644 --- a/examples/pipe/pipe_main.c +++ b/examples/pipe/pipe_main.c @@ -56,7 +56,7 @@ * Name: pipe_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int pipe_main(int argc, char *argv[]) diff --git a/examples/poll/Makefile b/examples/poll/Makefile index 368d3c46c..28d2a312c 100644 --- a/examples/poll/Makefile +++ b/examples/poll/Makefile @@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -93,7 +93,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) diff --git a/examples/poll/poll_main.c b/examples/poll/poll_main.c index fb0c38563..6fb166afd 100644 --- a/examples/poll/poll_main.c +++ b/examples/poll/poll_main.c @@ -77,7 +77,7 @@ * Name: poll_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int poll_main(int argc, char *argv[]) diff --git a/examples/popen/Kconfig b/examples/popen/Kconfig index b43e1ee9f..5551c5a84 100644 --- a/examples/popen/Kconfig +++ b/examples/popen/Kconfig @@ -15,7 +15,7 @@ if EXAMPLES_POPEN config EXAMPLES_POPEN_PROGNAME string "Program name" default "popen" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/popen/popen_main.c b/examples/popen/popen_main.c index 75917f55c..baf1ab348 100644 --- a/examples/popen/popen_main.c +++ b/examples/popen/popen_main.c @@ -52,7 +52,7 @@ * Name: popen_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int popen_main(int argc, char *argv[]) diff --git a/examples/posix_spawn/Makefile b/examples/posix_spawn/Makefile index c7c6b9ba6..a01b9747c 100644 --- a/examples/posix_spawn/Makefile +++ b/examples/posix_spawn/Makefile @@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -101,7 +101,7 @@ build: @$(MAKE) -C filesystem TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) @$(MAKE) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" build_lib -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) diff --git a/examples/posix_spawn/spawn_main.c b/examples/posix_spawn/spawn_main.c index 31ed387c2..289227fad 100644 --- a/examples/posix_spawn/spawn_main.c +++ b/examples/posix_spawn/spawn_main.c @@ -230,7 +230,7 @@ static inline void testheader(FAR const char *progname) * Name: spawn_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int spawn_main(int argc, char *argv[]) diff --git a/examples/powermonitor/powermonitor_main.c b/examples/powermonitor/powermonitor_main.c index a7b5cbcdb..4767ef35e 100644 --- a/examples/powermonitor/powermonitor_main.c +++ b/examples/powermonitor/powermonitor_main.c @@ -62,7 +62,7 @@ * Public Functions ******************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, char *argv[]) #else int powermonitor_main(int argc, char *argv[]) diff --git a/examples/pty_test/Kconfig b/examples/pty_test/Kconfig index f6b61f5fb..0f2a823c6 100644 --- a/examples/pty_test/Kconfig +++ b/examples/pty_test/Kconfig @@ -16,7 +16,7 @@ if EXAMPLES_PTYTEST config EXAMPLES_PTYTEST_PROGNAME string "Program name" default "pts" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/pty_test/pty_test.c b/examples/pty_test/pty_test.c index b003cadd2..9469f78d0 100644 --- a/examples/pty_test/pty_test.c +++ b/examples/pty_test/pty_test.c @@ -252,7 +252,7 @@ static void serial_out(struct term_pair_s *tp) * Name: pty_test_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int pty_test_main(int argc, char *argv[]) diff --git a/examples/pwm/pwm_main.c b/examples/pwm/pwm_main.c index c069695ad..76619b924 100644 --- a/examples/pwm/pwm_main.c +++ b/examples/pwm/pwm_main.c @@ -396,7 +396,7 @@ static void parse_args(FAR struct pwm_state_s *pwm, int argc, FAR char **argv) * Name: pwm_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int pwm_main(int argc, char *argv[]) diff --git a/examples/qencoder/qe_main.c b/examples/qencoder/qe_main.c index 9ac3438a8..39ff05861 100644 --- a/examples/qencoder/qe_main.c +++ b/examples/qencoder/qe_main.c @@ -238,7 +238,7 @@ static void parse_args(int argc, FAR char **argv) * Name: qe_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int qe_main(int argc, FAR char *argv[]) diff --git a/examples/random/random_main.c b/examples/random/random_main.c index aa33c2d7e..f3d6cbffe 100644 --- a/examples/random/random_main.c +++ b/examples/random/random_main.c @@ -77,7 +77,7 @@ * rand_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int rand_main(int argc, char *argv[]) diff --git a/examples/relays/relays_main.c b/examples/relays/relays_main.c index 06c91e4c9..af1f7bf41 100644 --- a/examples/relays/relays_main.c +++ b/examples/relays/relays_main.c @@ -85,7 +85,7 @@ * Name: relays_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int relays_main(int argc, char *argv[]) diff --git a/examples/rfid_readuid/Kconfig b/examples/rfid_readuid/Kconfig index 612d480a5..b822e3909 100644 --- a/examples/rfid_readuid/Kconfig +++ b/examples/rfid_readuid/Kconfig @@ -14,7 +14,7 @@ if EXAMPLES_RFID_READUID config EXAMPLES_RFID_READUID_PROGNAME string "Program name" default "rfid_readuid" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/rfid_readuid/rfid_readuid.c b/examples/rfid_readuid/rfid_readuid.c index 360165ae8..f48d7f627 100644 --- a/examples/rfid_readuid/rfid_readuid.c +++ b/examples/rfid_readuid/rfid_readuid.c @@ -67,7 +67,7 @@ * rfid_readuid_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int rfid_readuid_main(int argc, char *argv[]) diff --git a/examples/rgbled/Kconfig b/examples/rgbled/Kconfig index fd38b7af0..a868f797f 100644 --- a/examples/rgbled/Kconfig +++ b/examples/rgbled/Kconfig @@ -18,7 +18,7 @@ config EXAMPLES_RGBLED_DEVNAME config EXAMPLES_RGBLED_PROGNAME string "Program name" default "rgbled" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/rgbled/rgbled.c b/examples/rgbled/rgbled.c index 36bef9751..11cb57496 100644 --- a/examples/rgbled/rgbled.c +++ b/examples/rgbled/rgbled.c @@ -59,7 +59,7 @@ * rgbled_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int rgbled_main(int argc, char *argv[]) diff --git a/examples/romfs/Makefile b/examples/romfs/Makefile index 4a595a4f1..b91b86082 100644 --- a/examples/romfs/Makefile +++ b/examples/romfs/Makefile @@ -56,7 +56,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -115,7 +115,7 @@ romfs_testdir.h : testdir.img $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -130,7 +130,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/examples/romfs/romfs_main.c b/examples/romfs/romfs_main.c index ed1609ca2..ab0bd85ef 100644 --- a/examples/romfs/romfs_main.c +++ b/examples/romfs/romfs_main.c @@ -456,7 +456,7 @@ static void checkdirectories(struct node_s *entry) * Name: romfs_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int romfs_main(int argc, char *argv[]) diff --git a/examples/sendmail/sendmail_main.c b/examples/sendmail/sendmail_main.c index 0c61f4263..7e57231a9 100644 --- a/examples/sendmail/sendmail_main.c +++ b/examples/sendmail/sendmail_main.c @@ -106,7 +106,7 @@ static const char g_msg_body[] = CONFIG_EXAMPLES_SENDMAIL_BODY "\r\n"; * Name: sendmail_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int sendmail_main(int argc, char *argv[]) diff --git a/examples/serialblaster/serialblaster_main.c b/examples/serialblaster/serialblaster_main.c index fbc230e3c..7ca5ebe8a 100644 --- a/examples/serialblaster/serialblaster_main.c +++ b/examples/serialblaster/serialblaster_main.c @@ -67,7 +67,7 @@ static const char s[] = "abcdefghijklmnopqrstuvwxyz"; * serialblaster_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int serialblaster_main(int argc, char *argv[]) diff --git a/examples/serialrx/serialrx_main.c b/examples/serialrx/serialrx_main.c index 43a291951..e34931703 100644 --- a/examples/serialrx/serialrx_main.c +++ b/examples/serialrx/serialrx_main.c @@ -65,7 +65,7 @@ * serialrx_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int serialrx_main(int argc, char *argv[]) diff --git a/examples/serloop/serloop_main.c b/examples/serloop/serloop_main.c index 3175662b9..b8d11dd42 100644 --- a/examples/serloop/serloop_main.c +++ b/examples/serloop/serloop_main.c @@ -59,7 +59,7 @@ * serloop_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int serloop_main(int argc, char *argv[]) diff --git a/examples/slcd/slcd_main.c b/examples/slcd/slcd_main.c index bd3a35e37..70a91950b 100644 --- a/examples/slcd/slcd_main.c +++ b/examples/slcd/slcd_main.c @@ -246,7 +246,7 @@ static void slcd_puts(FAR struct lib_outstream_s *outstream, * slcd_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int slcd_main(int argc, char *argv[]) diff --git a/examples/smart/smart_main.c b/examples/smart/smart_main.c index 572eb7a29..56df54d73 100644 --- a/examples/smart/smart_main.c +++ b/examples/smart/smart_main.c @@ -791,7 +791,7 @@ static int smart_directory(void) * Name: smart_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int smart_main(int argc, char *argv[]) diff --git a/examples/smart_test/smart_test.c b/examples/smart_test/smart_test.c index 9b9f2d016..b343e50bf 100644 --- a/examples/smart_test/smart_test.c +++ b/examples/smart_test/smart_test.c @@ -586,7 +586,7 @@ static void smart_usage(void) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int smart_test_main(int argc, char *argv[]) diff --git a/examples/smp/Kconfig b/examples/smp/Kconfig index a3eb0ff4b..c38fb38c2 100644 --- a/examples/smp/Kconfig +++ b/examples/smp/Kconfig @@ -24,7 +24,7 @@ config EXAMPLES_SMP_NBARRIER_THREADS config EXAMPLES_SMP_PROGNAME string "Program name" default "smp" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/smp/smp_main.c b/examples/smp/smp_main.c index 1731b2723..8ed0f942b 100644 --- a/examples/smp/smp_main.c +++ b/examples/smp/smp_main.c @@ -217,7 +217,7 @@ static pthread_addr_t barrier_thread(pthread_addr_t parameter) * smp_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int smp_main(int argc, char *argv[]) diff --git a/examples/sotest/Kconfig b/examples/sotest/Kconfig index c2a2958cb..b2a647003 100644 --- a/examples/sotest/Kconfig +++ b/examples/sotest/Kconfig @@ -67,7 +67,7 @@ endif # !EXAMPLES_SOTEST_BUILTINFS config EXAMPLES_SOTEST_LIBC bool "Link with LIBC" default n - depends on !BUILD_LOADABLE && EXPERIMENTAL + depends on !BUILD_KERNEL && 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 @@ -86,6 +86,6 @@ config EXAMPLES_SOTEST_LIBC config EXAMPLES_SOTEST_LIBGCC bool "Link with LIBGCC" default n - depends on !BUILD_LOADABLE && EXPERIMENTAL + depends on !BUILD_KERNEL && EXPERIMENTAL endif diff --git a/examples/sotest/Makefile b/examples/sotest/Makefile index 0575016f3..7ae4ebd4a 100644 --- a/examples/sotest/Makefile +++ b/examples/sotest/Makefile @@ -60,7 +60,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -112,7 +112,7 @@ really_build: $(OBJS) @$(MAKE) -C lib TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) @$(MAKE) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" really_build -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -127,7 +127,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/examples/sotest/sotest_main.c b/examples/sotest/sotest_main.c index a2264b68b..19811b623 100644 --- a/examples/sotest/sotest_main.c +++ b/examples/sotest/sotest_main.c @@ -110,7 +110,7 @@ extern const int g_sot_nexports; * Name: sotest_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int sotest_main(int argc, char *argv[]) diff --git a/examples/stat/Kconfig b/examples/stat/Kconfig index b5a101d08..a3364fc01 100644 --- a/examples/stat/Kconfig +++ b/examples/stat/Kconfig @@ -14,7 +14,7 @@ if EXAMPLES_STAT config EXAMPLES_STAT_PROGNAME string "Program name" default "stat" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/stat/stat_main.c b/examples/stat/stat_main.c index b7298d161..3f413a95c 100644 --- a/examples/stat/stat_main.c +++ b/examples/stat/stat_main.c @@ -208,7 +208,7 @@ static void dump_statfs(FAR struct statfs *buf) * stat_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int stat_main(int argc, char *argv[]) diff --git a/examples/system/Kconfig b/examples/system/Kconfig index ad5f1d207..e41bc082c 100644 --- a/examples/system/Kconfig +++ b/examples/system/Kconfig @@ -15,7 +15,7 @@ if EXAMPLES_SYSTEM config EXAMPLES_SYSTEM_PROGNAME string "Program name" default "system" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/system/system_main.c b/examples/system/system_main.c index 98fdcffc1..2247ee18d 100644 --- a/examples/system/system_main.c +++ b/examples/system/system_main.c @@ -46,7 +46,7 @@ * Name: system_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int system_main(int argc, char *argv[]) diff --git a/examples/tcpblaster/Kconfig b/examples/tcpblaster/Kconfig index 7bd87f56a..90b85ef89 100644 --- a/examples/tcpblaster/Kconfig +++ b/examples/tcpblaster/Kconfig @@ -124,7 +124,7 @@ config EXAMPLES_TCPBLASTER_INIT bool "Initialize network" default n if NSH_BUILTIN_APPS default y if !NSH_BUILTIN_APPS - depends on !BUILD_LOADABLE && !EXAMPLES_TCPBLASTER_LOOPBACK + depends on !BUILD_KERNEL && !EXAMPLES_TCPBLASTER_LOOPBACK ---help--- Include logic to initialize the network. This should not be done if the network is already initialized when tcpblaster runs. This is diff --git a/examples/tcpblaster/Makefile b/examples/tcpblaster/Makefile index 4aad15a41..9553cc0a5 100644 --- a/examples/tcpblaster/Makefile +++ b/examples/tcpblaster/Makefile @@ -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_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) TARG_OBJS += $(TARG1_MAINOBJ) $(TARG2_MAINOBJ) endif @@ -211,7 +211,7 @@ endif $(call ARCHIVE, $(TARG_BIN), $(TARG_OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME1): $(OBJS) $(TARG1_MAINOBJ) @echo "LD: $(PROGNAME1)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME1) $(ARCHCRT0OBJ) $(TARG1_MAINOBJ) $(LDLIBS) @@ -226,11 +226,11 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(if $(CONFIG_BUILD_LOADABLE),,$(MAINNAME1))) + $(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(MAINNAME1)) ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_TARGET2),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(if $(CONFIG_BUILD_LOADABLE),,$(MAINNAME2))) + $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(MAINNAME2)) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat \ $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat diff --git a/examples/tcpblaster/tcpblaster_target1.c b/examples/tcpblaster/tcpblaster_target1.c index 6af107275..098c4ecfb 100644 --- a/examples/tcpblaster/tcpblaster_target1.c +++ b/examples/tcpblaster/tcpblaster_target1.c @@ -69,7 +69,7 @@ static int server_child(int argc, char *argv[]) * tcpblaster_main ****************************************************************************/ -#if defined(CONFIG_BUILD_LOADABLE) +#if defined(CONFIG_BUILD_KERNEL) int main(int argc, FAR char *argv[]) #elif defined(CONFIG_EXAMPLES_TCPBLASTER_TARGET2) int tcpblaster1_main(int argc, char *argv[]) diff --git a/examples/tcpblaster/tcpblaster_target2.c b/examples/tcpblaster/tcpblaster_target2.c index 0a6bf6e44..4db4f66e8 100644 --- a/examples/tcpblaster/tcpblaster_target2.c +++ b/examples/tcpblaster/tcpblaster_target2.c @@ -45,7 +45,7 @@ * tcpblaster_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int tcpblaster2_main(int argc, char *argv[]) diff --git a/examples/tcpecho/tcpecho_main.c b/examples/tcpecho/tcpecho_main.c index 9d2e0eb77..be65a2e5e 100644 --- a/examples/tcpecho/tcpecho_main.c +++ b/examples/tcpecho/tcpecho_main.c @@ -369,7 +369,7 @@ static int tcpecho_server(void) * tcpecho_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int tcpecho_main(int argc, char *argv[]) diff --git a/examples/telnetd/telnetd.c b/examples/telnetd/telnetd.c index b09c6d945..cc03c70f4 100644 --- a/examples/telnetd/telnetd.c +++ b/examples/telnetd/telnetd.c @@ -226,7 +226,7 @@ static void telnetd_netinit(void) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int telnetd_main(int argc, char *argv[]) diff --git a/examples/thttpd/Makefile b/examples/thttpd/Makefile index 172620442..b76d61ab8 100644 --- a/examples/thttpd/Makefile +++ b/examples/thttpd/Makefile @@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -104,7 +104,7 @@ headers: @$(CONTENT_MAKE) binaries TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) diff --git a/examples/thttpd/content/Makefile.binfs b/examples/thttpd/content/Makefile.binfs index 6a530396e..204608c07 100644 --- a/examples/thttpd/content/Makefile.binfs +++ b/examples/thttpd/content/Makefile.binfs @@ -120,10 +120,10 @@ binaries: .built headers: $(ROMFS_HDR) $(BUILTIN_REGISTRY)$(DELIM)hello_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,hello,$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,hello_main)) + $(call REGISTER,hello,$(PRIORITY),$(STACKSIZE),hello_main) $(BUILTIN_REGISTRY)$(DELIM)tasks_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,tasks,$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,tasks_main)) + $(call REGISTER,tasks,$(PRIORITY),$(STACKSIZE),tasks_main) context: $(BUILTIN_REGISTRY)$(DELIM)hello_main.bdat $(BUILTIN_REGISTRY)$(DELIM)tasks_main.bdat diff --git a/examples/thttpd/thttpd_main.c b/examples/thttpd/thttpd_main.c index 837bf33af..172a9cf40 100644 --- a/examples/thttpd/thttpd_main.c +++ b/examples/thttpd/thttpd_main.c @@ -194,7 +194,7 @@ int g_thttpdnsymbols; * thttp_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int thttp_main(int argc, char *argv[]) diff --git a/examples/tiff/Makefile b/examples/tiff/Makefile index 3cd8ac43e..7a6b3f196 100644 --- a/examples/tiff/Makefile +++ b/examples/tiff/Makefile @@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -99,7 +99,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -114,7 +114,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/examples/tiff/tiff_main.c b/examples/tiff/tiff_main.c index d83ff9e51..adb89e73d 100644 --- a/examples/tiff/tiff_main.c +++ b/examples/tiff/tiff_main.c @@ -104,7 +104,7 @@ * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int tiff_main(int argc, char *argv[]) diff --git a/examples/timer/Kconfig b/examples/timer/Kconfig index ab828d6fb..7420164ac 100644 --- a/examples/timer/Kconfig +++ b/examples/timer/Kconfig @@ -67,7 +67,7 @@ config EXAMPLES_TIMER_PRIORITY config EXAMPLES_TIMER_PROGNAME string "Timer program name" default "timer" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/timer/timer_main.c b/examples/timer/timer_main.c index 6972cbaf8..5cc0c91ee 100644 --- a/examples/timer/timer_main.c +++ b/examples/timer/timer_main.c @@ -135,7 +135,7 @@ static void timer_status(int fd) * timer_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int timer_main(int argc, char *argv[]) diff --git a/examples/touchscreen/tc_main.c b/examples/touchscreen/tc_main.c index 6d49715bc..3554c37a2 100644 --- a/examples/touchscreen/tc_main.c +++ b/examples/touchscreen/tc_main.c @@ -88,7 +88,7 @@ * Name: tc_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int tc_main(int argc, char *argv[]) diff --git a/examples/udgram/Kconfig b/examples/udgram/Kconfig index ca9e3d9f5..d0bf62033 100644 --- a/examples/udgram/Kconfig +++ b/examples/udgram/Kconfig @@ -40,7 +40,7 @@ config EXAMPLES_UDGRAM_SERVER_PRIORITY config EXAMPLES_UDGRAM_SERVER_PROGNAME string "Server program name" default "server" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF server program is installed. @@ -69,7 +69,7 @@ config EXAMPLES_UDGRAM_CLIENT_PRIORITY config EXAMPLES_UDGRAM_CLIENT_PROGNAME string "Client program name" default "client" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF client program is installed. diff --git a/examples/udgram/Makefile b/examples/udgram/Makefile index f02b1043b..793bf84cc 100644 --- a/examples/udgram/Makefile +++ b/examples/udgram/Makefile @@ -89,7 +89,7 @@ COBJS = $(CLIENT_COBJS) $(CLIENT_MAINOBJ) $(SERVER_COBJS) $(SERVER_MAINOBJ) SRCS = $(CLIENT_SRCS) $(SERVER_SRCS) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) SERVER_OBJS += $(SERVER_MAINOBJ) CLIENT_OBJS += $(CLIENT_MAINOBJ) endif @@ -128,7 +128,7 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(UDGRAM_BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(CLIENT_PROGNAME): $(CLIENT_OBJS) @echo "LD: $(CLIENT_PROGNAME)" @@ -150,10 +150,10 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(CLIENT_APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(CLIENT_APPNAME),$(CLIENT_PRIORITY),$(CLIENT_STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(CLIENT_APPNAME)_main)) + $(call REGISTER,$(CLIENT_APPNAME),$(CLIENT_PRIORITY),$(CLIENT_STACKSIZE),$(CLIENT_APPNAME)_main) $(BUILTIN_REGISTRY)$(DELIM)$(SERVER_APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(SERVER_APPNAME),$(SERVER_PRIORITY),$(SERVER_STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(SERVER_APPNAME)_main)) + $(call REGISTER,$(SERVER_APPNAME),$(SERVER_PRIORITY),$(SERVER_STACKSIZE),$(SERVER_APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(CLIENT_APPNAME)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(SERVER_APPNAME)_main.bdat diff --git a/examples/udgram/udgram_client.c b/examples/udgram/udgram_client.c index 8afea22b4..f3ce4558f 100644 --- a/examples/udgram/udgram_client.c +++ b/examples/udgram/udgram_client.c @@ -75,7 +75,7 @@ static inline void fill_buffer(unsigned char *buf, int offset) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int client_main(int argc, char *argv[]) diff --git a/examples/udgram/udgram_server.c b/examples/udgram/udgram_server.c index 719645335..5a114e50f 100644 --- a/examples/udgram/udgram_server.c +++ b/examples/udgram/udgram_server.c @@ -82,7 +82,7 @@ static inline int check_buffer(unsigned char *buf) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int server_main(int argc, char *argv[]) diff --git a/examples/udp/Kconfig b/examples/udp/Kconfig index 57a18e36e..0d6b65a63 100644 --- a/examples/udp/Kconfig +++ b/examples/udp/Kconfig @@ -22,7 +22,7 @@ config EXAMPLES_UDP_PROGNAME1 string "Target1 program name" default "udpserver" if EXAMPLES_UDP_SERVER1 default "udpclient" if !EXAMPLES_UDP_SERVER1 - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the Target1 program that will be use when the NSH ELF program is installed. @@ -51,7 +51,7 @@ config EXAMPLES_UDP_PROGNAME2 string "Target2 program name" default "udpserver" if !EXAMPLES_UDP_SERVER2 default "udpclient" if EXAMPLES_UDP_SERVER2 - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the Target2 program that will be use when the NSH ELF program is installed. diff --git a/examples/udp/Makefile b/examples/udp/Makefile index 629b1a43b..8db4d1210 100644 --- a/examples/udp/Makefile +++ b/examples/udp/Makefile @@ -107,7 +107,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_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) TARG_OBJS += $(TARG1_MAINOBJ) $(TARG2_MAINOBJ) endif @@ -187,7 +187,7 @@ endif .built: config.h $(TARG_BIN) $(HOST_BIN) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME1): $(OBJS) $(TARG1_MAINOBJ) @echo "LD: $(PROGNAME1)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME1) $(ARCHCRT0OBJ) $(TARG1_MAINOBJ) $(LDLIBS) @@ -202,11 +202,11 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(if $(CONFIG_BUILD_LOADABLE),,$(MAINNAME1))) + $(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(MAINNAME1)) ifeq ($(CONFIG_EXAMPLES_UDP_TARGET2),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(if $(CONFIG_BUILD_LOADABLE),,$(MAINNAME2))) + $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(MAINNAME2)) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat \ $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat diff --git a/examples/udp/udp_target1.c b/examples/udp/udp_target1.c index a8d259e2c..2b54bd5e5 100644 --- a/examples/udp/udp_target1.c +++ b/examples/udp/udp_target1.c @@ -48,7 +48,7 @@ * udp1_main ****************************************************************************/ -#if defined(CONFIG_BUILD_LOADABLE) +#if defined(CONFIG_BUILD_KERNEL) int main(int argc, FAR char *argv[]) #elif defined(CONFIG_EXAMPLES_UDP_TARGET2) int udp1_main(int argc, char *argv[]) diff --git a/examples/udp/udp_target2.c b/examples/udp/udp_target2.c index 390412c41..59aeee28c 100644 --- a/examples/udp/udp_target2.c +++ b/examples/udp/udp_target2.c @@ -48,7 +48,7 @@ * udp2_main ****************************************************************************/ -#if defined(CONFIG_BUILD_LOADABLE) +#if defined(CONFIG_BUILD_KERNEL) int main(int argc, FAR char *argv[]) #else int udp2_main(int argc, char *argv[]) diff --git a/examples/udpblaster/Kconfig b/examples/udpblaster/Kconfig index fde9e39a4..d31683431 100644 --- a/examples/udpblaster/Kconfig +++ b/examples/udpblaster/Kconfig @@ -15,7 +15,7 @@ if EXAMPLES_UDPBLASTER config EXAMPLES_UDPBLASTER_PROGNAME string "Program name" default "nettest" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the Nettest program is installed. @@ -51,7 +51,7 @@ config EXAMPLES_UDPBLASTER_INIT bool "Initialize network" default n if NSH_BUILTIN_APPS default y if !NSH_BUILTIN_APPS - depends on !BUILD_LOADABLE && !EXAMPLES_UDPBLASTER_LOOPBACK + depends on !BUILD_KERNEL && !EXAMPLES_UDPBLASTER_LOOPBACK ---help--- Include logic to initialize the network. This should not be done if the network is already initialized when udpblaster runs. This is diff --git a/examples/udpblaster/Makefile b/examples/udpblaster/Makefile index b840da209..204acad54 100644 --- a/examples/udpblaster/Makefile +++ b/examples/udpblaster/Makefile @@ -51,7 +51,7 @@ TARG_MAINOBJ = $(TARG_MAINSRC:.c=$(OBJEXT)) TARG_SRCS = $(TARG_ASRCS) $(TARG_CSRCS) $(TARG_CSRCS) TARG_OBJS = $(TARG_AOBJS) $(TARG_COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) TARG_OBJS += $(TARG_MAINOBJ) endif @@ -127,7 +127,7 @@ endif $(call ARCHIVE, $(TARG_BIN), $(TARG_OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(TARG_MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(TARG_MAINOBJ) $(LDLIBS) @@ -142,7 +142,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/examples/udpblaster/udpblaster_target.c b/examples/udpblaster/udpblaster_target.c index 5e2cd440a..21a3078c2 100644 --- a/examples/udpblaster/udpblaster_target.c +++ b/examples/udpblaster/udpblaster_target.c @@ -191,7 +191,7 @@ static void netest_initialize(void) * udpblaster_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int udpblaster_main(int argc, char *argv[]) diff --git a/examples/unionfs/Makefile b/examples/unionfs/Makefile index 1db0448de..d9d316671 100644 --- a/examples/unionfs/Makefile +++ b/examples/unionfs/Makefile @@ -56,7 +56,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -118,7 +118,7 @@ romfs_btestdir.h : btestdir.img $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -133,7 +133,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/examples/unionfs/unionfs_main.c b/examples/unionfs/unionfs_main.c index b5ecd7bfd..433251180 100644 --- a/examples/unionfs/unionfs_main.c +++ b/examples/unionfs/unionfs_main.c @@ -129,7 +129,7 @@ * Name: unionfs_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int unionfs_main(int argc, char *argv[]) diff --git a/examples/usbserial/Makefile b/examples/usbserial/Makefile index ec751a551..6b9de2895 100644 --- a/examples/usbserial/Makefile +++ b/examples/usbserial/Makefile @@ -54,7 +54,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -97,7 +97,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -112,7 +112,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/examples/usbserial/usbserial_main.c b/examples/usbserial/usbserial_main.c index ea3facbb5..989b9c5c5 100644 --- a/examples/usbserial/usbserial_main.c +++ b/examples/usbserial/usbserial_main.c @@ -191,7 +191,7 @@ static void dumptrace(void) * usbserial_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int usbserial_main(int argc, char *argv[]) diff --git a/examples/userfs/Kconfig b/examples/userfs/Kconfig index 99c2eeeaf..47e250798 100644 --- a/examples/userfs/Kconfig +++ b/examples/userfs/Kconfig @@ -14,7 +14,7 @@ if EXAMPLES_USERFS config EXAMPLES_USERFS_PROGNAME string "Program name" default "userfs" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/userfs/userfs_main.c b/examples/userfs/userfs_main.c index b8d91642d..8e390c080 100644 --- a/examples/userfs/userfs_main.c +++ b/examples/userfs/userfs_main.c @@ -592,7 +592,7 @@ int ufstest_daemon(int argc, char *argv[]) * userfs_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int userfs_main(int argc, char *argv[]) diff --git a/examples/usrsocktest/Kconfig b/examples/usrsocktest/Kconfig index 14fc1f492..b6fee20af 100644 --- a/examples/usrsocktest/Kconfig +++ b/examples/usrsocktest/Kconfig @@ -20,7 +20,7 @@ if EXAMPLES_USRSOCKTEST config EXAMPLES_USRSOCKTEST_PROGNAME string "Program name" default "usrsocktest" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/usrsocktest/usrsocktest_main.c b/examples/usrsocktest/usrsocktest_main.c index 6235a6904..a59c4c5e5 100644 --- a/examples/usrsocktest/usrsocktest_main.c +++ b/examples/usrsocktest/usrsocktest_main.c @@ -246,7 +246,7 @@ bool usrsocktest_assert_print_buf(FAR const char *func, * usrsocktest_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int usrsocktest_main(int argc, char *argv[]) diff --git a/examples/ustream/Makefile b/examples/ustream/Makefile index 76d9a6a35..db33eecc5 100644 --- a/examples/ustream/Makefile +++ b/examples/ustream/Makefile @@ -81,7 +81,7 @@ COBJS = $(CLIENT_COBJS) $(CLIENT_MAINOBJ) $(SERVER_COBJS) $(SERVER_MAINOBJ) SRCS = $(CLIENT_SRCS) $(SERVER_SRCS) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) SERVER_OBJS += $(SERVER_MAINOBJ) CLIENT_OBJS += $(CLIENT_MAINOBJ) endif @@ -120,7 +120,7 @@ $(COBJS): %$(OBJEXT): %.c $(call ARCHIVE, $(USTREAM_BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(CLIENT_PROGNAME): $(CLIENT_OBJS) @echo "LD: $(CLIENT_PROGNAME)" @@ -142,10 +142,10 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(CLIENT_APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(CLIENT_APPNAME),$(CLIENT_PRIORITY),$(CLIENT_STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(CLIENT_APPNAME)_main)) + $(call REGISTER,$(CLIENT_APPNAME),$(CLIENT_PRIORITY),$(CLIENT_STACKSIZE),$(CLIENT_APPNAME)_main) $(BUILTIN_REGISTRY)$(DELIM)$(SERVER_APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(SERVER_APPNAME),$(SERVER_PRIORITY),$(SERVER_STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(SERVER_APPNAME)_main)) + $(call REGISTER,$(SERVER_APPNAME),$(SERVER_PRIORITY),$(SERVER_STACKSIZE),$(SERVER_APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(CLIENT_APPNAME)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(SERVER_APPNAME)_main.bdat diff --git a/examples/ustream/ustream_client.c b/examples/ustream/ustream_client.c index 3b6e67aa9..950760d4f 100644 --- a/examples/ustream/ustream_client.c +++ b/examples/ustream/ustream_client.c @@ -55,7 +55,7 @@ * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int client_main(int argc, char *argv[]) diff --git a/examples/ustream/ustream_server.c b/examples/ustream/ustream_server.c index b4f83b6fd..f21ff901d 100644 --- a/examples/ustream/ustream_server.c +++ b/examples/ustream/ustream_server.c @@ -56,7 +56,7 @@ * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int server_main(int argc, char *argv[]) diff --git a/examples/veml6070/Kconfig b/examples/veml6070/Kconfig index 7092c5ee1..ec5626bd8 100644 --- a/examples/veml6070/Kconfig +++ b/examples/veml6070/Kconfig @@ -15,7 +15,7 @@ if EXAMPLES_VEML6070 config EXAMPLES_VEML6070_PROGNAME string "Program name" default "veml6070" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/veml6070/veml6070_main.c b/examples/veml6070/veml6070_main.c index 637af00a6..88a148a82 100644 --- a/examples/veml6070/veml6070_main.c +++ b/examples/veml6070/veml6070_main.c @@ -51,7 +51,7 @@ * veml6070_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int veml6070_main(int argc, char *argv[]) diff --git a/examples/watchdog/watchdog_main.c b/examples/watchdog/watchdog_main.c index 82215f85f..edce88b4e 100644 --- a/examples/watchdog/watchdog_main.c +++ b/examples/watchdog/watchdog_main.c @@ -204,7 +204,7 @@ static void parse_args(FAR struct wdog_example_s *wdog, int argc, FAR char **arg * Name: wdog_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int wdog_main(int argc, char *argv[]) diff --git a/examples/webserver/Makefile b/examples/webserver/Makefile index 2c1988ef9..60c11b3df 100644 --- a/examples/webserver/Makefile +++ b/examples/webserver/Makefile @@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -102,7 +102,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c httpd_fsdata.c: httpd-fs/* $(TOPDIR)/tools/mkfsdata.pl -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -117,7 +117,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/examples/webserver/webserver_main.c b/examples/webserver/webserver_main.c index 4c81b5c51..e1d97a790 100644 --- a/examples/webserver/webserver_main.c +++ b/examples/webserver/webserver_main.c @@ -95,7 +95,7 @@ * webserver_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int webserver_main(int argc, char *argv[]) diff --git a/examples/wget/wget_main.c b/examples/wget/wget_main.c index 1540b0221..96c21a0d5 100644 --- a/examples/wget/wget_main.c +++ b/examples/wget/wget_main.c @@ -106,7 +106,7 @@ static void callback(FAR char **buffer, int offset, int datend, * Name: wget_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int wget_main(int argc, char *argv[]) diff --git a/examples/wgetjson/wgetjson_main.c b/examples/wgetjson/wgetjson_main.c index a4dff95c6..83a6b13e0 100644 --- a/examples/wgetjson/wgetjson_main.c +++ b/examples/wgetjson/wgetjson_main.c @@ -295,7 +295,7 @@ static int wgetjson_json_parse(char *text) * Name: wgetjson_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int wgetjson_main(int argc, char *argv[]) diff --git a/examples/xbc_test/Kconfig b/examples/xbc_test/Kconfig index 16390be00..9aa0d573d 100644 --- a/examples/xbc_test/Kconfig +++ b/examples/xbc_test/Kconfig @@ -14,7 +14,7 @@ if EXAMPLES_XBC_TEST config EXAMPLES_XBC_TEST_PROGNAME string "Program name" default "xbc_test" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/examples/xbc_test/xbc_test_main.c b/examples/xbc_test/xbc_test_main.c index cda5ee9b7..c4d36e038 100644 --- a/examples/xbc_test/xbc_test_main.c +++ b/examples/xbc_test/xbc_test_main.c @@ -83,7 +83,7 @@ * hello_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int xbc_test_main(int argc, char *argv[]) diff --git a/examples/xmlrpc/xmlrpc_main.c b/examples/xmlrpc/xmlrpc_main.c index 54c864538..72149fe27 100644 --- a/examples/xmlrpc/xmlrpc_main.c +++ b/examples/xmlrpc/xmlrpc_main.c @@ -372,7 +372,7 @@ static int xmlrpc_netinit(void) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int xmlrpc_main(int argc, char *argv[]) diff --git a/examples/zerocross/zerocross_main.c b/examples/zerocross/zerocross_main.c index 4a38d974f..2a7efcc15 100644 --- a/examples/zerocross/zerocross_main.c +++ b/examples/zerocross/zerocross_main.c @@ -82,7 +82,7 @@ * zerocross_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int zerocross_main(int argc, char *argv[]) diff --git a/fsutils/passwd/passwd_lock.c b/fsutils/passwd/passwd_lock.c index 54f588873..c92f7f04e 100644 --- a/fsutils/passwd/passwd_lock.c +++ b/fsutils/passwd/passwd_lock.c @@ -47,7 +47,7 @@ * Pre-processor Definitions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL /* In the kernel build mode, we need to use a named semaphore so that all * processes will share the same, named semaphore instance. */ @@ -59,7 +59,7 @@ * Private Data ****************************************************************************/ -#ifndef CONFIG_BUILD_LOADABLE +#ifndef CONFIG_BUILD_KERNEL /* In the FLAT and PROTECTED build modes, we do not need to bother with a * named semaphore. We use a single global semaphore in theses cases. */ @@ -92,7 +92,7 @@ int passwd_lock(FAR sem_t **semp) { FAR sem_t *sem; -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL /* Open the shared, named semaphore */ sem = sem_open(PASSWD_SEMNAME, O_CREAT, 0644, 1); @@ -127,7 +127,7 @@ int passwd_unlock(FAR sem_t *sem) sem_post(sem); -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL /* Close the named semaphore */ (void)sem_close(sem); diff --git a/graphics/screenshot/Makefile b/graphics/screenshot/Makefile index bb74deb49..c1493ba4c 100644 --- a/graphics/screenshot/Makefile +++ b/graphics/screenshot/Makefile @@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -99,7 +99,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -114,7 +114,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/graphics/screenshot/screenshot_main.c b/graphics/screenshot/screenshot_main.c index 53a9c3e83..e1c03aca6 100644 --- a/graphics/screenshot/screenshot_main.c +++ b/graphics/screenshot/screenshot_main.c @@ -242,7 +242,7 @@ int save_screenshot(FAR const char *filename) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int screenshot_main(int argc, char *argv[]) diff --git a/graphics/traveler/Makefile b/graphics/traveler/Makefile index f4da2d033..f1489dae6 100644 --- a/graphics/traveler/Makefile +++ b/graphics/traveler/Makefile @@ -78,7 +78,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -138,7 +138,7 @@ endif tools: $(Q) $(MAKE) -C $(TRAVELER_TOOLS) -f Makefile.host TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -153,7 +153,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/graphics/traveler/src/trv_main.c b/graphics/traveler/src/trv_main.c index 6717b0ae9..9ef348214 100644 --- a/graphics/traveler/src/trv_main.c +++ b/graphics/traveler/src/trv_main.c @@ -244,7 +244,7 @@ errout: * Description: ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int traveler_main(int argc, char *argv[]) diff --git a/interpreters/bas/Makefile b/interpreters/bas/Makefile index ecc267034..875d159cc 100644 --- a/interpreters/bas/Makefile +++ b/interpreters/bas/Makefile @@ -95,7 +95,7 @@ install: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/interpreters/bas/bas_main.c b/interpreters/bas/bas_main.c index a75f71fa3..f0062aa8b 100644 --- a/interpreters/bas/bas_main.c +++ b/interpreters/bas/bas_main.c @@ -82,7 +82,7 @@ * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int bas_main(int argc, char *argv[]) diff --git a/interpreters/minibasic/Makefile b/interpreters/minibasic/Makefile index b0e514901..7996d87f4 100644 --- a/interpreters/minibasic/Makefile +++ b/interpreters/minibasic/Makefile @@ -90,7 +90,7 @@ install: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/interpreters/minibasic/script.c b/interpreters/minibasic/script.c index c95d6e2f1..a11814c70 100644 --- a/interpreters/minibasic/script.c +++ b/interpreters/minibasic/script.c @@ -151,7 +151,7 @@ static void usage(void) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int basic_main(int argc, char *argv[]) diff --git a/netutils/thttpd/Makefile b/netutils/thttpd/Makefile index 2327378a4..d10132d4a 100644 --- a/netutils/thttpd/Makefile +++ b/netutils/thttpd/Makefile @@ -99,7 +99,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(BINFS_CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) $(BINFS_COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -146,7 +146,7 @@ endif $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -161,13 +161,13 @@ endif ifeq ($(CONFIG_THTTPD_BINFS),y) $(BUILTIN_REGISTRY)$(DELIM)phf_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,phf,$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,phf_main)) + $(call REGISTER,phf,$(PRIORITY),$(STACKSIZE),phf_main) $(BUILTIN_REGISTRY)$(DELIM)redirect_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,redirect,$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,redirect_main)) + $(call REGISTER,redirect,$(PRIORITY),$(STACKSIZE),redirect_main) $(BUILTIN_REGISTRY)$(DELIM)ssi_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,ssi,$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,ssi_main)) + $(call REGISTER,ssi,$(PRIORITY),$(STACKSIZE),ssi_main) context: $(BUILTIN_REGISTRY)$(DELIM)phf_main.bdat $(BUILTIN_REGISTRY)$(DELIM)redirect_main.bdat $(BUILTIN_REGISTRY)$(DELIM)ssi_main.bdat diff --git a/netutils/thttpd/thttpd.c b/netutils/thttpd/thttpd.c index 6e2022378..1f00fc87e 100644 --- a/netutils/thttpd/thttpd.c +++ b/netutils/thttpd/thttpd.c @@ -652,7 +652,7 @@ static void occasional(ClientData client_data, struct timeval *nowP) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int thttpd_main(int argc, char **argv) diff --git a/nshlib/nsh.h b/nshlib/nsh.h index 666272c84..187cc5696 100644 --- a/nshlib/nsh.h +++ b/nshlib/nsh.h @@ -613,7 +613,7 @@ * library where they will become accessible to application code. */ -#if defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_LOADABLE) +#if defined(CONFIG_BUILD_PROTECTED) || defined(CONFIG_BUILD_KERNEL) # undef CONFIG_NSH_DISABLE_MKRD /* 'mkrd' depends on ramdisk_register */ # define CONFIG_NSH_DISABLE_MKRD 1 #endif diff --git a/system/cdcacm/Makefile b/system/cdcacm/Makefile index 9d14e39db..5f4af7fdf 100644 --- a/system/cdcacm/Makefile +++ b/system/cdcacm/Makefile @@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -103,7 +103,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -118,10 +118,10 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME1)_main)) + $(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(APPNAME1)_main) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME2)_main)) + $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(APPNAME2)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat else diff --git a/system/cdcacm/cdcacm_main.c b/system/cdcacm/cdcacm_main.c index d290f739a..82d97b901 100644 --- a/system/cdcacm/cdcacm_main.c +++ b/system/cdcacm/cdcacm_main.c @@ -72,7 +72,7 @@ static struct cdcacm_state_s g_cdcacm; * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int sercon_main(int argc, char *argv[]) @@ -125,7 +125,7 @@ int sercon_main(int argc, char *argv[]) * device. ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char **argv) #else int serdis_main(int argc, char *argv[]) diff --git a/system/composite/Makefile b/system/composite/Makefile index 4192f05f8..00d50b11b 100644 --- a/system/composite/Makefile +++ b/system/composite/Makefile @@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -103,7 +103,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -118,10 +118,10 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME1)_main)) + $(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(APPNAME1)_main) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME2)_main)) + $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(APPNAME2)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat else diff --git a/system/composite/composite_main.c b/system/composite/composite_main.c index e46c1be2d..3726db458 100644 --- a/system/composite/composite_main.c +++ b/system/composite/composite_main.c @@ -521,7 +521,7 @@ static int echo_serial(void) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int conn_main(int argc, char *argv[]) @@ -722,7 +722,7 @@ errout: ****************************************************************************/ #ifdef CONFIG_NSH_BUILTIN_APPS -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char **argv) #else int disconn_main(int argc, char *argv[]) diff --git a/system/cu/Makefile b/system/cu/Makefile index 3cbd93969..9b6b5e91b 100644 --- a/system/cu/Makefile +++ b/system/cu/Makefile @@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -102,7 +102,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -117,7 +117,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/cu/cu_main.c b/system/cu/cu_main.c index d619ba3aa..8031a86bd 100644 --- a/system/cu/cu_main.c +++ b/system/cu/cu_main.c @@ -261,7 +261,7 @@ static int cu_cmd(char bcmd) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int cu_main(int argc, FAR char *argv[]) diff --git a/system/dhcpc/Kconfig b/system/dhcpc/Kconfig index 47dd46577..014e94f49 100644 --- a/system/dhcpc/Kconfig +++ b/system/dhcpc/Kconfig @@ -16,7 +16,7 @@ if SYSTEM_DHCPC_RENEW config DHCPC_RENEW_PROGNAME string "Program name" default "renew" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/system/dhcpc/Makefile b/system/dhcpc/Makefile index c44f6afc1..c0be66280 100644 --- a/system/dhcpc/Makefile +++ b/system/dhcpc/Makefile @@ -62,7 +62,7 @@ RENEW_MAINOBJ = $(RENEW_MAINSRC:.c=$(OBJEXT)) SRCS = $(RENEW_SRCS) $(RENEW_MAINSRC) OBJS = $(RENEW_OBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(RENEW_MAINOBJ) endif @@ -99,7 +99,7 @@ $(RENEW_OBJS) $(RENEW_MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(RENEW_PROGNAME): $(OBJS) $(RENEW_MAINOBJ) @echo "LD: $(RENEW_PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(RENEW_PROGNAME) $(ARCHCRT0OBJ) $(RENEW_MAINOBJ) $(LDLIBS) @@ -114,7 +114,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(RENEW_APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(RENEW_APPNAME),$(RENEW_PRIORITY),$(RENEW_STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(RENEW_APPNAME)_main)) + $(call REGISTER,$(RENEW_APPNAME),$(RENEW_PRIORITY),$(RENEW_STACKSIZE),$(RENEW_APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(RENEW_APPNAME)_main.bdat else diff --git a/system/dhcpc/renew_main.c b/system/dhcpc/renew_main.c index 341fd4a7c..0e7d0c15e 100644 --- a/system/dhcpc/renew_main.c +++ b/system/dhcpc/renew_main.c @@ -69,7 +69,7 @@ static void dhcpc_showusage(FAR const char *progname, int exitcode) * renew_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int renew_main(int argc, char *argv[]) diff --git a/system/flash_eraseall/Makefile b/system/flash_eraseall/Makefile index fb6595e0d..a129a2b92 100644 --- a/system/flash_eraseall/Makefile +++ b/system/flash_eraseall/Makefile @@ -60,7 +60,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -102,7 +102,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -121,7 +121,7 @@ preconfig: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/flash_eraseall/flash_eraseall_main.c b/system/flash_eraseall/flash_eraseall_main.c index c4a0dcb8d..885214c8e 100644 --- a/system/flash_eraseall/flash_eraseall_main.c +++ b/system/flash_eraseall/flash_eraseall_main.c @@ -49,7 +49,7 @@ * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int flash_eraseall_main(int argc, char *argv[]) diff --git a/system/hex2bin/Makefile b/system/hex2bin/Makefile index ba7d9939a..f73d46455 100644 --- a/system/hex2bin/Makefile +++ b/system/hex2bin/Makefile @@ -42,7 +42,7 @@ include $(APPDIR)/Make.defs ASRCS = CSRCS = -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) HEX2BIN_MAINSRC = hex2bin_main.c HEX2MEM_MAINSRC = hex2mem_main.c @@ -68,7 +68,7 @@ SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) MAINOBJ = $(HEX2BIN_MAINOBJ) $(HEX2MEM_MAINOBJ) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -129,7 +129,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c ifeq ($(CONFIG_SYSTEM_HEX2BIN_BUILTIN),y) $(BUILTIN_REGISTRY)$(DELIM)hex2bin.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,"hex2bin",$(HEX2BIN_PRIORITY),$(HEX2BIN_STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,hex2bin_main)) + $(call REGISTER,"hex2bin",$(HEX2BIN_PRIORITY),$(HEX2BIN_STACKSIZE),hex2bin_main) rhex2bin: $(BUILTIN_REGISTRY)$(DELIM)hex2bin.bdat else @@ -138,14 +138,14 @@ endif ifeq ($(CONFIG_SYSTEM_HEX2MEM_BUILTIN),y) $(BUILTIN_REGISTRY)$(DELIM)hex2mem.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,"hex2mem",$(HEX2MEM_PRIORITY),$(HEX2MEM_STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,hex2mem_main)) + $(call REGISTER,"hex2mem",$(HEX2MEM_PRIORITY),$(HEX2MEM_STACKSIZE),hex2mem_main) rhex2mem: $(BUILTIN_REGISTRY)$(DELIM)hex2mem.bdat else rhex2mem: endif -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(HEX2BIN_PROGNAME): $(OBJS) $(HEX2BIN_MAINOBJ) @echo "LD: $(HEX2BIN_PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(HEX2BIN_PROGNAME) $(ARCHCRT0OBJ) $(HEX2BIN_MAINOBJ) $(LDLIBS) diff --git a/system/hex2bin/hex2bin_main.c b/system/hex2bin/hex2bin_main.c index f66adf57c..e6ff8194a 100644 --- a/system/hex2bin/hex2bin_main.c +++ b/system/hex2bin/hex2bin_main.c @@ -109,7 +109,7 @@ static void show_usage(FAR const char *progname, int exitcode) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int hex2bin_main(int argc, char **argv) diff --git a/system/hex2bin/hex2mem_main.c b/system/hex2bin/hex2mem_main.c index 3d9f9ae63..70b589674 100644 --- a/system/hex2bin/hex2mem_main.c +++ b/system/hex2bin/hex2mem_main.c @@ -104,7 +104,7 @@ static void show_usage(FAR const char *progname, int exitcode) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int hex2mem_main(int argc, char **argv) diff --git a/system/hexed/Makefile b/system/hexed/Makefile index 858b182bf..16c8b6827 100644 --- a/system/hexed/Makefile +++ b/system/hexed/Makefile @@ -58,7 +58,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -102,7 +102,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -119,7 +119,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/hexed/src/hexed.c b/system/hexed/src/hexed.c index d86c7f885..a9a682576 100644 --- a/system/hexed/src/hexed.c +++ b/system/hexed/src/hexed.c @@ -371,7 +371,7 @@ int runargs(void) /* hexed - Hexadecimal File Editor */ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int hexed_main(int argc, char *argv[]) diff --git a/system/i2c/Makefile b/system/i2c/Makefile index 0a52cba6f..aab65ace6 100644 --- a/system/i2c/Makefile +++ b/system/i2c/Makefile @@ -51,7 +51,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -97,7 +97,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -112,7 +112,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/i2c/i2c_main.c b/system/i2c/i2c_main.c index 21c6866d9..8d3cf3192 100644 --- a/system/i2c/i2c_main.c +++ b/system/i2c/i2c_main.c @@ -345,7 +345,7 @@ static void i2c_teardown(FAR struct i2ctool_s *i2ctool) * Name: i2c_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int i2c_main(int argc, char *argv[]) diff --git a/system/install/Makefile b/system/install/Makefile index 4c9bebec3..59fbd3b80 100644 --- a/system/install/Makefile +++ b/system/install/Makefile @@ -60,7 +60,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -103,7 +103,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -120,7 +120,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/install/install.c b/system/install/install.c index 3f95b320a..cf54bd4bb 100644 --- a/system/install/install.c +++ b/system/install/install.c @@ -330,7 +330,7 @@ static int install_remove(const char *scriptname) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int install_main(int argc, char *argv[]) diff --git a/system/lm75/Makefile b/system/lm75/Makefile index 9bbfc01b3..941bf22cc 100644 --- a/system/lm75/Makefile +++ b/system/lm75/Makefile @@ -60,7 +60,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -103,7 +103,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -120,7 +120,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,lm75_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),lm75_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/lm75/lm75.c b/system/lm75/lm75.c index 8d4127368..d6d5260b3 100644 --- a/system/lm75/lm75.c +++ b/system/lm75/lm75.c @@ -183,7 +183,7 @@ static void parse_args(int argc, FAR char **argv) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int lm75_main(int argc, char *argv[]) diff --git a/system/lzf/Kconfig b/system/lzf/Kconfig index 69685b166..c482d5d55 100644 --- a/system/lzf/Kconfig +++ b/system/lzf/Kconfig @@ -32,7 +32,7 @@ config SYSTEM_LZF_BLOG config SYSTEM_LZF_PROGNAME string "Program name" default "lzf" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/system/lzf/lzf_main.c b/system/lzf/lzf_main.c index 395c8f739..e20b73b6c 100644 --- a/system/lzf/lzf_main.c +++ b/system/lzf/lzf_main.c @@ -58,7 +58,7 @@ * Private Data ****************************************************************************/ -#ifndef CONFIG_BUILD_LOADABLE +#ifndef CONFIG_BUILD_KERNEL static sem_t g_exclsem = SEM_INITIALIZER(1); #endif @@ -78,7 +78,7 @@ static uint8_t g_buf2[MAX_BLOCKSIZE + LZF_MAX_HDR_SIZE + 16]; * Private Functions ****************************************************************************/ -#ifndef CONFIG_BUILD_LOADABLE +#ifndef CONFIG_BUILD_KERNEL static void lzf_exit(int exitcode) noreturn_function; static void lzf_exit(int exitcode) { @@ -433,7 +433,7 @@ static int run_file(FAR const char *fname) * lzf_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int lzf_main(int argc, FAR char *argv[]) @@ -443,7 +443,7 @@ int lzf_main(int argc, FAR char *argv[]) int optc; int ret = 0; -#ifndef CONFIG_BUILD_LOADABLE +#ifndef CONFIG_BUILD_KERNEL /* Get exclusive access to the global variables. Global variables are * used because the hash table and buffers are too large to allocate on * the embedded stack. But the use of global variables has the downside diff --git a/system/mdio/Makefile b/system/mdio/Makefile index a95ddf9c3..4f15cd284 100644 --- a/system/mdio/Makefile +++ b/system/mdio/Makefile @@ -56,7 +56,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -99,7 +99,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -114,7 +114,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/mdio/mdio_main.c b/system/mdio/mdio_main.c index 5ad0c5475..9300458ce 100644 --- a/system/mdio/mdio_main.c +++ b/system/mdio/mdio_main.c @@ -159,7 +159,7 @@ int set_phy_reg(uint16_t phy_id, uint16_t reg_num, uint16_t val) * mdio_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int mdio_main(int argc, char *argv[]) diff --git a/system/netdb/Makefile b/system/netdb/Makefile index 2da1deaa2..bc2355605 100644 --- a/system/netdb/Makefile +++ b/system/netdb/Makefile @@ -90,7 +90,7 @@ install: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)netdb.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,"netdb",$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,netdb_main)) + $(call REGISTER,"netdb",$(PRIORITY),$(STACKSIZE),netdb_main) context: $(BUILTIN_REGISTRY)$(DELIM)netdb.bdat else diff --git a/system/nsh/Kconfig b/system/nsh/Kconfig index 98a949383..323fc45b4 100644 --- a/system/nsh/Kconfig +++ b/system/nsh/Kconfig @@ -4,7 +4,7 @@ # config SYSTEM_NSH - tristate "NuttShell (NSH) example" + bool "NuttShell (NSH) example" default n select NSH_LIBRARY select SYSTEM_READLINE @@ -13,14 +13,6 @@ config SYSTEM_NSH if SYSTEM_NSH -config SYSTEM_NSH_PRIORITY - int "Nuttx shell thread priority" - default 100 - -config SYSTEM_NSH_STACKSIZE - int "Nuttx shell stack size" - default 2048 - config SYSTEM_NSH_SYMTAB bool "Register symbol table" default n @@ -72,7 +64,7 @@ endif # SYSTEM_NSH_SYMTAB config SYSTEM_NSH_PROGNAME string "Program name" default "nsh" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/system/nsh/Makefile b/system/nsh/Makefile index e646e563d..cd281f1a1 100644 --- a/system/nsh/Makefile +++ b/system/nsh/Makefile @@ -46,10 +46,4 @@ MAINSRC = nsh_main.c CONFIG_SYSTEM_NSH_PROGNAME ?= nsh$(EXEEXT) PROGNAME = $(CONFIG_SYSTEM_NSH_PROGNAME) -ifeq ($(CONFIG_SYSTEM_NSH),m) -APPNAME = $(CONFIG_SYSTEM_NSH_PROGNAME) -PRIORITY = $(CONFIG_SYSTEM_NSH_PRIORITY) -STACKSIZE = $(CONFIG_SYSTEM_NSH_STACKSIZE) -endif - include $(APPDIR)/Application.mk diff --git a/system/nsh/nsh_main.c b/system/nsh/nsh_main.c index 0f1a2a636..9e7563096 100644 --- a/system/nsh/nsh_main.c +++ b/system/nsh/nsh_main.c @@ -107,7 +107,7 @@ #undef HAVE_NSH_COMMAND #if (defined(CONFIG_SYSTEM_SYSTEM) || defined(CONFIG_SYSTEM_POPEN)) && \ - defined(CONFIG_BUILD_LOADABLE) + defined(CONFIG_BUILD_KERNEL) # define HAVE_NSH_COMMAND 1 #endif @@ -264,7 +264,7 @@ static int nsh_task(void) * Name: nsh_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int nsh_main(int argc, char *argv[]) @@ -277,7 +277,7 @@ int nsh_main(int argc, char *argv[]) * 2) As a single command processor. In this case, the single command is * is provided in argv[1]. * - * NOTE: The latter mode is only available if CONFIG_BUILD_LOADABLE=y. In + * NOTE: The latter mode is only available if CONFIG_BUILD_KERNEL=y. In * that cause, this main() function will be build as a process. The process * will be started with a command by the implementations of the system() and * popen() interfaces. diff --git a/system/ntpc/Makefile b/system/ntpc/Makefile index c665d8e24..b5e008d6b 100644 --- a/system/ntpc/Makefile +++ b/system/ntpc/Makefile @@ -67,7 +67,7 @@ MAINOBJ = $(MAINOBJ1) $(MAINOBJ2) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -107,7 +107,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME1): $(OBJS) $(MAINOBJ1) @echo "LD: $(PROGNAME1)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME1) $(ARCHCRT0OBJ) $(MAINOBJ1) $(LDLIBS) @@ -127,10 +127,10 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME1),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME1)_main)) + $(call REGISTER,$(APPNAME1),$(PRIORITY),$(STACKSIZE),$(APPNAME1)_main) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME2),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME2)_main)) + $(call REGISTER,$(APPNAME2),$(PRIORITY),$(STACKSIZE),$(APPNAME2)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat else diff --git a/system/ntpc/ntpcstart_main.c b/system/ntpc/ntpcstart_main.c index 5be8dad0b..43ae234c7 100644 --- a/system/ntpc/ntpcstart_main.c +++ b/system/ntpc/ntpcstart_main.c @@ -52,7 +52,7 @@ * ntpcstart_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int ntpcstart_main(int argc, char *argv[]) diff --git a/system/ntpc/ntpcstop_main.c b/system/ntpc/ntpcstop_main.c index 48b8837ba..06627efaf 100644 --- a/system/ntpc/ntpcstop_main.c +++ b/system/ntpc/ntpcstop_main.c @@ -52,7 +52,7 @@ * ntpcstop_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int ntpcstop_main(int argc, char *argv[]) diff --git a/system/nxplayer/Makefile b/system/nxplayer/Makefile index 66e591a1b..86b12412c 100644 --- a/system/nxplayer/Makefile +++ b/system/nxplayer/Makefile @@ -50,7 +50,7 @@ APPNAME = nxplayer PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) MAINSRC = nxplayer_main.c else ifeq ($(CONFIG_NXPLAYER_COMMAND_LINE),y) @@ -65,7 +65,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -108,7 +108,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -126,7 +126,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) ifeq ($(CONFIG_NXPLAYER_COMMAND_LINE),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/nxplayer/nxplayer_main.c b/system/nxplayer/nxplayer_main.c index 30c85fff3..e97e083a7 100644 --- a/system/nxplayer/nxplayer_main.c +++ b/system/nxplayer/nxplayer_main.c @@ -591,7 +591,7 @@ static int nxplayer_cmd_help(FAR struct nxplayer_s *pPlayer, char *parg) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int nxplayer_main(int argc, char *argv[]) diff --git a/system/ping/Kconfig b/system/ping/Kconfig index 190697e23..254a64f04 100644 --- a/system/ping/Kconfig +++ b/system/ping/Kconfig @@ -14,7 +14,7 @@ if SYSTEM_PING config SYSTEM_PING_PROGNAME string "Ping program name" default "ping" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/system/ping/Makefile b/system/ping/Makefile index 3d9a30cce..2db18a1bd 100644 --- a/system/ping/Makefile +++ b/system/ping/Makefile @@ -62,7 +62,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -102,7 +102,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -119,7 +119,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/ping/ping.c b/system/ping/ping.c index 23c45749f..b99c5af45 100644 --- a/system/ping/ping.c +++ b/system/ping/ping.c @@ -442,7 +442,7 @@ static void show_usage(FAR const char *progname, int exitcode) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int ping_main(int argc, char **argv) diff --git a/system/ping6/Kconfig b/system/ping6/Kconfig index 14d054709..c6d50f6da 100644 --- a/system/ping6/Kconfig +++ b/system/ping6/Kconfig @@ -14,7 +14,7 @@ if SYSTEM_PING6 config SYSTEM_PING6_PROGNAME string "Ping program name" default "ping6" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/system/ping6/Makefile b/system/ping6/Makefile index 3c11bb8ac..a4af8e46d 100644 --- a/system/ping6/Makefile +++ b/system/ping6/Makefile @@ -62,7 +62,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -102,7 +102,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -119,7 +119,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/ping6/ping6.c b/system/ping6/ping6.c index 0c1ecbd2b..ddf2a294b 100644 --- a/system/ping6/ping6.c +++ b/system/ping6/ping6.c @@ -443,7 +443,7 @@ static void show_usage(FAR const char *progname, int exitcode) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int ping6_main(int argc, char **argv) diff --git a/system/popen/Kconfig b/system/popen/Kconfig index 4e8ee15bd..d709fb79f 100644 --- a/system/popen/Kconfig +++ b/system/popen/Kconfig @@ -18,7 +18,7 @@ if SYSTEM_POPEN config SYSTEM_POPEN_SHPATH string "Path to shell command" default "/bin/nsh" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the full path to the program in a mounted file system that implements the system() command. That is, a program that starts the diff --git a/system/popen/popen.c b/system/popen/popen.c index a8789eb14..782f06426 100644 --- a/system/popen/popen.c +++ b/system/popen/popen.c @@ -261,7 +261,7 @@ FILE *popen(FAR const char *command, FAR const char *mode) argv[0] = (FAR char *)command; argv[1] = NULL; -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL errcode = posix_spawn(&container->shell, CONFIG_SYSTEM_POPEN_SHPATH, &file_actions, &attr, argv, (FAR char * const *)NULL); diff --git a/system/prun/Makefile b/system/prun/Makefile index a6f673977..17bb2d856 100644 --- a/system/prun/Makefile +++ b/system/prun/Makefile @@ -66,7 +66,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -109,7 +109,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -125,7 +125,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) ifeq ($(CONFIG_SYSTEM_PEXEC),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/prun/pexec_main.c b/system/prun/pexec_main.c index e25355d39..1cc7784e6 100644 --- a/system/prun/pexec_main.c +++ b/system/prun/pexec_main.c @@ -81,7 +81,7 @@ static void show_usage(FAR const char *progname, int errcode) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int pexec_main(int argc, FAR char **argv) diff --git a/system/ramtest/Kconfig b/system/ramtest/Kconfig index 816a2d0be..7c78efbb9 100644 --- a/system/ramtest/Kconfig +++ b/system/ramtest/Kconfig @@ -14,7 +14,7 @@ if SYSTEM_RAMTEST config SYSTEM_RAMTEST_PROGNAME string "Program name" default "ramtest" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/system/ramtest/Makefile b/system/ramtest/Makefile index d98573725..fd744781f 100644 --- a/system/ramtest/Makefile +++ b/system/ramtest/Makefile @@ -60,7 +60,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -100,7 +100,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -117,7 +117,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME).bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME).bdat else diff --git a/system/ramtest/ramtest.c b/system/ramtest/ramtest.c index e45fd4692..34cbf9168 100644 --- a/system/ramtest/ramtest.c +++ b/system/ramtest/ramtest.c @@ -556,7 +556,7 @@ static void addr_in_addr(FAR struct ramtest_s *info) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int ramtest_main(int argc, char **argv) diff --git a/system/sched_note/Kconfig b/system/sched_note/Kconfig index c0857a8f3..9ad1f1e0c 100644 --- a/system/sched_note/Kconfig +++ b/system/sched_note/Kconfig @@ -15,7 +15,7 @@ if SYSTEM_NOTE config SYSTEM_NOTE_PROGNAME string "Program name" default "note" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/system/sched_note/note_main.c b/system/sched_note/note_main.c index 2c2ca78e8..0e5d72ace 100644 --- a/system/sched_note/note_main.c +++ b/system/sched_note/note_main.c @@ -643,7 +643,7 @@ errout: * note_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int note_main(int argc, FAR char *argv[]) diff --git a/system/setlogmask/Kconfig b/system/setlogmask/Kconfig index adeb7d81f..f828c5a1f 100644 --- a/system/setlogmask/Kconfig +++ b/system/setlogmask/Kconfig @@ -13,7 +13,7 @@ if SYSTEM_SETLOGMASK config SYSTEM_SETLOGMASK_PROGNAME string "setlogmask program name" default "setlogmask" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/system/setlogmask/Makefile b/system/setlogmask/Makefile index a662d4a67..db6a8464d 100644 --- a/system/setlogmask/Makefile +++ b/system/setlogmask/Makefile @@ -62,7 +62,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -102,7 +102,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -119,7 +119,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/setlogmask/setlogmask.c b/system/setlogmask/setlogmask.c index 95e8ef0c4..38d0b93ef 100644 --- a/system/setlogmask/setlogmask.c +++ b/system/setlogmask/setlogmask.c @@ -85,7 +85,7 @@ static void show_usage(FAR const char *progname, int exitcode) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int setlogmask_main(int argc, char **argv) diff --git a/system/stackmonitor/Makefile b/system/stackmonitor/Makefile index 129c2ff36..151300e0a 100644 --- a/system/stackmonitor/Makefile +++ b/system/stackmonitor/Makefile @@ -53,7 +53,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -96,7 +96,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -113,10 +113,10 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)stackmonitor_start.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,"stkmon_start",$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,stackmonitor_start)) + $(call REGISTER,"stkmon_start",$(PRIORITY),$(STACKSIZE),stackmonitor_start) $(BUILTIN_REGISTRY)$(DELIM)stackmonitor_stop.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,"stkmon_stop",$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,stackmonitor_stop)) + $(call REGISTER,"stkmon_stop",$(PRIORITY),$(STACKSIZE),stackmonitor_stop) context: $(BUILTIN_REGISTRY)$(DELIM)stackmonitor_start.bdat $(BUILTIN_REGISTRY)$(DELIM)stackmonitor_stop.bdat else diff --git a/system/sudoku/Makefile b/system/sudoku/Makefile index 09bee17d9..f2c7b4621 100644 --- a/system/sudoku/Makefile +++ b/system/sudoku/Makefile @@ -56,7 +56,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -99,7 +99,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -116,7 +116,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)sudoku.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,"sudoku",$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,sudoku_main)) + $(call REGISTER,"sudoku",$(PRIORITY),$(STACKSIZE),sudoku_main) context: $(BUILTIN_REGISTRY)$(DELIM)sudoku.bdat else diff --git a/system/sudoku/sudoku.c b/system/sudoku/sudoku.c index 53df3e9a1..cba345d9f 100644 --- a/system/sudoku/sudoku.c +++ b/system/sudoku/sudoku.c @@ -500,7 +500,7 @@ static inline void count_cells(void) * Private Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int sudoku_main(int argc, char **argv, char **envp) diff --git a/system/symtab/README.txt b/system/symtab/README.txt index 4c399c370..ca0f71a5e 100644 --- a/system/symtab/README.txt +++ b/system/symtab/README.txt @@ -18,7 +18,7 @@ Symbol tables have differing usefulness in different NuttX build modes: share resources with other user code (but should use system calls to interact with the OS). - 3. But in the kernel build mode (CONFIG_BUILD_LOADABLE), only fully linked + 3. But in the kernel build mode (CONFIG_BUILD_KERNEL), only fully linked executables loadable via execl(), execv(), or posix_spawan() can used. There is no use for a symbol table with the kernel build since all memory resources are separate; nothing is share-able with the newly diff --git a/system/system/Kconfig b/system/system/Kconfig index d4099b6f3..9dcfc428f 100644 --- a/system/system/Kconfig +++ b/system/system/Kconfig @@ -17,7 +17,7 @@ if SYSTEM_SYSTEM config SYSTEM_SYSTEM_SHPATH string "Path to shell command" default "/bin/nsh" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the full path to the program in a mounted file system that implements the system() command. That is, a program that starts the diff --git a/system/system/system.c b/system/system/system.c index ea10a4a3b..d3731c583 100644 --- a/system/system/system.c +++ b/system/system/system.c @@ -144,7 +144,7 @@ int system(FAR char *cmd) argv[0] = cmd; argv[1] = NULL; -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL errcode = posix_spawn(&pid, CONFIG_SYSTEM_OPEN_SHPATH, NULL, &attr, argv, (FAR char * const *)NULL); #else diff --git a/system/taskset/Kconfig b/system/taskset/Kconfig index 00db246bc..63a7e8f29 100644 --- a/system/taskset/Kconfig +++ b/system/taskset/Kconfig @@ -14,7 +14,7 @@ if SYSTEM_TASKSET config SYSTEM_TASKSET_PROGNAME string "Taskset program name" default "taskset" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/system/taskset/Makefile b/system/taskset/Makefile index 618f11651..9a1513f35 100644 --- a/system/taskset/Makefile +++ b/system/taskset/Makefile @@ -62,7 +62,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -102,7 +102,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -119,7 +119,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/taskset/taskset.c b/system/taskset/taskset.c index 4891d5b76..f086bf75e 100644 --- a/system/taskset/taskset.c +++ b/system/taskset/taskset.c @@ -94,7 +94,7 @@ static bool get_cpuset(const char *arg, cpu_set_t *cpu_set) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int taskset_main(int argc, char **argv) diff --git a/system/tee/Makefile b/system/tee/Makefile index d0ff4d190..c9ec9c0a3 100644 --- a/system/tee/Makefile +++ b/system/tee/Makefile @@ -59,7 +59,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -102,7 +102,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -119,7 +119,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/tee/tee.c b/system/tee/tee.c index 760bc323b..5aa5fbd9e 100644 --- a/system/tee/tee.c +++ b/system/tee/tee.c @@ -121,7 +121,7 @@ static void show_usage(FAR const char *progrname, int exitcode) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int tee_main(int argc, char *argv[]) diff --git a/system/telnet/Kconfig b/system/telnet/Kconfig index d57bab1db..7cc99de39 100644 --- a/system/telnet/Kconfig +++ b/system/telnet/Kconfig @@ -16,7 +16,7 @@ if SYSTEM_TELNET_CHATD config SYSTEM_TELNET_CHATD_PROGNAME string "Chat daemon program name" default "chatd" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL if NSH_BUILTIN_APPS @@ -45,7 +45,7 @@ if SYSTEM_TELNET_CLIENT config SYSTEM_TELNET_CLIENT_PROGNAME string "Telnet client program name" default "chatd" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL if NSH_BUILTIN_APPS diff --git a/system/telnet/Makefile b/system/telnet/Makefile index 5ee29d07d..9d2117afc 100644 --- a/system/telnet/Makefile +++ b/system/telnet/Makefile @@ -92,7 +92,7 @@ endif TARG_SRCS = $(CHATD_CRCS) $(CHATD_MAINSRC) $(CLIENT_CSRCS) $(CLIENT_MAINSRC) TARG_OBJS = $(CHATD_COBJS) $(CLIENT_COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) TARG_OBJS += $(CHATD_MAINOBJ) $(CLIENT_MAINOBJ) endif @@ -129,7 +129,7 @@ $(CHATD_COBJS) $(CHATD_MAINOBJ) $(CLIENT_COBJS) $(CLIENT_MAINOBJ) : %$(OBJEXT): $(call ARCHIVE, $(TARG_BIN), $(TARG_OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) ifeq ($(CONFIG_SYSTEM_TELNET_CHATD),y) $(BIN_DIR)$(DELIM)$(CHATD_PROGNAME): $(OBJS) $(CHATD_MAINOBJ) @@ -165,7 +165,7 @@ ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) ifeq ($(CONFIG_SYSTEM_TELNET_CHATD),y) $(BUILTIN_REGISTRY)$(DELIM)$(CHATD_APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(CHATD_APPNAME),$(CHATD_PRIORITY),$(CHATD_STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(CHATD_MAINNAME))) + $(call REGISTER,$(CHATD_APPNAME),$(CHATD_PRIORITY),$(CHATD_STACKSIZE),$(CHATD_MAINNAME)) chatd_register: $(BUILTIN_REGISTRY)$(DELIM)$(CHATD_APPNAME)_main.bdat else @@ -174,7 +174,7 @@ endif ifeq ($(CONFIG_SYSTEM_TELNET_CLIENT),y) $(BUILTIN_REGISTRY)$(DELIM)$(CLIENT_APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(CLIENT_APPNAME),$(CLIENT_PRIORITY),$(CLIENT_STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(CLIENT_MAINNAME))) + $(call REGISTER,$(CLIENT_APPNAME),$(CLIENT_PRIORITY),$(CLIENT_STACKSIZE),$(CLIENT_MAINNAME)) client_register: $(BUILTIN_REGISTRY)$(DELIM)$(CLIENT_APPNAME)_main.bdat else diff --git a/system/telnet/telnet_chatd.c b/system/telnet/telnet_chatd.c index e2481d009..423724a79 100644 --- a/system/telnet/telnet_chatd.c +++ b/system/telnet/telnet_chatd.c @@ -321,7 +321,7 @@ static void _event_handler(struct telnet_s *telnet, * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int chatd_main(int argc, char *argv[]) diff --git a/system/telnet/telnet_client.c b/system/telnet/telnet_client.c index 0433d02f2..47fa83361 100644 --- a/system/telnet/telnet_client.c +++ b/system/telnet/telnet_client.c @@ -271,7 +271,7 @@ static void show_usage(const char *progname, int exitcode) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int telnet_main(int argc, char *argv[]) diff --git a/system/ubloxmodem/Makefile b/system/ubloxmodem/Makefile index 9750784b0..bc1cad245 100644 --- a/system/ubloxmodem/Makefile +++ b/system/ubloxmodem/Makefile @@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -96,7 +96,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -111,7 +111,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/ubloxmodem/ubloxmodem_main.c b/system/ubloxmodem/ubloxmodem_main.c index c2edb2c16..aecddf90b 100644 --- a/system/ubloxmodem/ubloxmodem_main.c +++ b/system/ubloxmodem/ubloxmodem_main.c @@ -406,7 +406,7 @@ inline int ubloxmodem_exec(FAR struct ubloxmodem_cxt* cxt) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char** argv) #else int ubloxmodem_main(int argc, FAR char** argv) diff --git a/system/usbmsc/Makefile b/system/usbmsc/Makefile index cdf24e8da..1019580c3 100644 --- a/system/usbmsc/Makefile +++ b/system/usbmsc/Makefile @@ -50,7 +50,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -106,7 +106,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -121,10 +121,10 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME1)_main)) + $(call REGISTER,$(APPNAME1),$(PRIORITY1),$(STACKSIZE1),$(APPNAME1)_main) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME2)_main)) + $(call REGISTER,$(APPNAME2),$(PRIORITY2),$(STACKSIZE2),$(APPNAME2)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME1)_main.bdat $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME2)_main.bdat else diff --git a/system/usbmsc/README.txt b/system/usbmsc/README.txt index 23c3ae6b2..27836b237 100755 --- a/system/usbmsc/README.txt +++ b/system/usbmsc/README.txt @@ -79,4 +79,4 @@ system/usbmsc it relies on internal OS interfaces that are not normally available to a user-space program. As a result, this add-on cannot be used if a NuttX is built as a protected, supervisor kernel (CONFIG_BUILD_PROTECTED - or CONFIG_BUILD_LOADABLE). + or CONFIG_BUILD_KERNEL). diff --git a/system/usbmsc/usbmsc_main.c b/system/usbmsc/usbmsc_main.c index d8260c0ea..e0112dfd7 100644 --- a/system/usbmsc/usbmsc_main.c +++ b/system/usbmsc/usbmsc_main.c @@ -433,7 +433,7 @@ static void usbmsc_disconnect(FAR void *handle) * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int msconn_main(int argc, char *argv[]) @@ -639,7 +639,7 @@ int msconn_main(int argc, char *argv[]) ****************************************************************************/ #ifdef CONFIG_NSH_BUILTIN_APPS -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char **argv) #else int msdis_main(int argc, char *argv[]) diff --git a/system/vi/Makefile b/system/vi/Makefile index 83d265524..a3c5802ef 100644 --- a/system/vi/Makefile +++ b/system/vi/Makefile @@ -57,7 +57,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -100,7 +100,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -117,7 +117,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/system/vi/vi.c b/system/vi/vi.c index 7689bb943..3e0305867 100644 --- a/system/vi/vi.c +++ b/system/vi/vi.c @@ -3599,7 +3599,7 @@ static void vi_showusage(FAR struct vi_s *vi, FAR const char *progname, * ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int vi_main(int argc, char **argv) diff --git a/system/zmodem/Makefile b/system/zmodem/Makefile index f358055da..99bb7bb60 100644 --- a/system/zmodem/Makefile +++ b/system/zmodem/Makefile @@ -68,7 +68,7 @@ RZ_MAINOBJ = $(RZ_MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(SZ_MAINSRC) $(RZ_MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(SZ_MAINOBJ) $(RZ_MAINOBJ) endif @@ -108,7 +108,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(SZ_PROGNAME): $(OBJS) $(SZ_MAINOBJ) @echo "LD: $(SZ_PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(SZ_PROGNAME) $(ARCHCRT0OBJ) $(SZ_MAINOBJ) $(LDLIBS) @@ -130,10 +130,10 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)sz.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,"sz",$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,sz_main)) + $(call REGISTER,"sz",$(PRIORITY),$(STACKSIZE),sz_main) $(BUILTIN_REGISTRY)$(DELIM)rz.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,"rz",$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,rz_main)) + $(call REGISTER,"rz",$(PRIORITY),$(STACKSIZE),rz_main) context: $(BUILTIN_REGISTRY)$(DELIM)sz.bdat $(BUILTIN_REGISTRY)$(DELIM)rz.bdat else diff --git a/system/zmodem/rz_main.c b/system/zmodem/rz_main.c index c27e766dc..38b889eaf 100644 --- a/system/zmodem/rz_main.c +++ b/system/zmodem/rz_main.c @@ -72,7 +72,7 @@ static void show_usage(FAR const char *progname, int errcode) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int rz_main(int argc, FAR char **argv) diff --git a/system/zmodem/sz_main.c b/system/zmodem/sz_main.c index 198dd3c22..5bcc8e046 100644 --- a/system/zmodem/sz_main.c +++ b/system/zmodem/sz_main.c @@ -91,7 +91,7 @@ static void show_usage(FAR const char *progname, int errcode) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int sz_main(int argc, FAR char **argv) diff --git a/tools/mksymtab.sh b/tools/mksymtab.sh index 2342bbb5d..67586dd74 100755 --- a/tools/mksymtab.sh +++ b/tools/mksymtab.sh @@ -36,6 +36,16 @@ usage="Usage: $0 " +# Make sure we understand where we are + +if [ ! -f tools/mksymtab.sh ]; then + cd .. || { echo "ERROR: cd .. failed"; exit 1; } + if [ ! -f tools/mksymtab.sh ]; then + error "This script must be executed from the top-level apps/ directory" + exit 1 + fi +fi + # Check for the required directory path dir=$1 @@ -68,7 +78,7 @@ rm -f $outfile # Extract all of the undefined symbols from the ELF files and create a # list of sorted, unique undefined variable names. -execlist=`find ${dir} -type f` +execlist=`find ${dir} -executable -type f` for exec in ${execlist}; do nm $exec | fgrep ' U ' | sed -e "s/^[ ]*//g" | cut -d' ' -f2 >>_tmplist done @@ -90,7 +100,7 @@ for var in $varlist; do done echo "" >>$outfile -echo "const struct symtab_s CONFIG_EXECFUNCS_SYMTAB_ARRAY[] = " >>$outfile +echo "const struct symtab_s g_symtab[] = " >>$outfile echo "{" >>$outfile for var in $varlist; do @@ -99,4 +109,4 @@ done echo "};" >>$outfile echo "" >>$outfile -echo "const int CONFIG_EXECFUNCS_NSYMBOLS_VAR = sizeof(CONFIG_EXECFUNCS_SYMTAB_ARRAY) / sizeof(struct symtab_s);" >>$outfile +echo "const int g_nsymbols = sizeof(g_symtab) / sizeof(struct symtab_s);" >>$outfile diff --git a/wireless/bluetooth/btsak/Kconfig b/wireless/bluetooth/btsak/Kconfig index 28742f72c..dfdf5475b 100644 --- a/wireless/bluetooth/btsak/Kconfig +++ b/wireless/bluetooth/btsak/Kconfig @@ -14,7 +14,7 @@ if BTSAK config BTSAK_PROGNAME string "Program name" default "bt" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/wireless/bluetooth/btsak/btsak_main.c b/wireless/bluetooth/btsak/btsak_main.c index 67de139c1..5605d8c19 100644 --- a/wireless/bluetooth/btsak/btsak_main.c +++ b/wireless/bluetooth/btsak/btsak_main.c @@ -254,7 +254,7 @@ void btsak_cmd_gatt(FAR struct btsak_s *btsak, int argc, FAR char *argv[]) * bt_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int bt_main(int argc, char *argv[]) diff --git a/wireless/ieee802154/i8sak/Kconfig b/wireless/ieee802154/i8sak/Kconfig index a2f31ed01..a6ddae900 100644 --- a/wireless/ieee802154/i8sak/Kconfig +++ b/wireless/ieee802154/i8sak/Kconfig @@ -16,7 +16,7 @@ if IEEE802154_I8SAK config IEEE802154_I8SAK_PROGNAME string "Program name" default "i8" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/wireless/ieee802154/i8sak/Makefile b/wireless/ieee802154/i8sak/Makefile index 77e954f1c..f5a46e05f 100644 --- a/wireless/ieee802154/i8sak/Makefile +++ b/wireless/ieee802154/i8sak/Makefile @@ -64,7 +64,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -104,7 +104,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) @touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -119,7 +119,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/wireless/ieee802154/i8sak/i8sak_main.c b/wireless/ieee802154/i8sak/i8sak_main.c index f5ffe4d50..82b7d4921 100644 --- a/wireless/ieee802154/i8sak/i8sak_main.c +++ b/wireless/ieee802154/i8sak/i8sak_main.c @@ -839,7 +839,7 @@ static int i8sak_showusage(FAR const char *progname, int exitcode) * i8_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int i8_main(int argc, char *argv[]) diff --git a/wireless/ieee802154/i8shark/i8shark_main.c b/wireless/ieee802154/i8shark/i8shark_main.c index 73ad65ba8..9c868b439 100644 --- a/wireless/ieee802154/i8shark/i8shark_main.c +++ b/wireless/ieee802154/i8shark/i8shark_main.c @@ -467,7 +467,7 @@ static int i8shark_daemon(int argc, FAR char *argv[]) * Name: i8shark_main ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int i8shark_main(int argc, char *argv[]) diff --git a/wireless/iwpan/Kconfig b/wireless/iwpan/Kconfig index e1d173895..09a7ec7d3 100644 --- a/wireless/iwpan/Kconfig +++ b/wireless/iwpan/Kconfig @@ -18,7 +18,7 @@ if WIRELESS_IWPAN config WIRELESS_IWPAN_PROGNAME string "Program Name" default "iwpan" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/wireless/iwpan/Makefile b/wireless/iwpan/Makefile index 0b178cbed..2a9940b60 100644 --- a/wireless/iwpan/Makefile +++ b/wireless/iwpan/Makefile @@ -65,7 +65,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -106,7 +106,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -123,7 +123,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/wireless/iwpan/src/iwpan.c b/wireless/iwpan/src/iwpan.c index 87b74912d..9ac1b28e9 100644 --- a/wireless/iwpan/src/iwpan.c +++ b/wireless/iwpan/src/iwpan.c @@ -676,7 +676,7 @@ static void iwpan_showusage(FAR const char *progname, int exitcode) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int iwpan_main(int argc, char *argv[]) diff --git a/wireless/wapi/Kconfig b/wireless/wapi/Kconfig index b54039898..806ef97c2 100644 --- a/wireless/wapi/Kconfig +++ b/wireless/wapi/Kconfig @@ -24,7 +24,7 @@ config WIRELESS_WAPI_CMDTOOL config WIRELESS_WAPI_PROGNAME string "Program Name" default "wapi" - depends on BUILD_LOADABLE + depends on BUILD_KERNEL ---help--- This is the name of the program that will be use when the NSH ELF program is installed. diff --git a/wireless/wapi/Makefile b/wireless/wapi/Makefile index 9ad3b198b..cdc3b0851 100644 --- a/wireless/wapi/Makefile +++ b/wireless/wapi/Makefile @@ -65,7 +65,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) OBJS = $(AOBJS) $(COBJS) -ifneq ($(CONFIG_BUILD_LOADABLE),y) +ifneq ($(CONFIG_BUILD_KERNEL),y) OBJS += $(MAINOBJ) endif @@ -104,7 +104,7 @@ $(COBJS) $(MAINOBJ): %$(OBJEXT): %.c $(call ARCHIVE, $(BIN), $(OBJS)) $(Q) touch .built -ifeq ($(CONFIG_BUILD_LOADABLE),y) +ifeq ($(CONFIG_BUILD_KERNEL),y) $(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) @echo "LD: $(PROGNAME)" $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) @@ -121,7 +121,7 @@ endif ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main)) + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat else diff --git a/wireless/wapi/src/wapi.c b/wireless/wapi/src/wapi.c index 5268b3e7f..b27a19f98 100644 --- a/wireless/wapi/src/wapi.c +++ b/wireless/wapi/src/wapi.c @@ -765,7 +765,7 @@ static void wapi_showusage(FAR const char *progname, int exitcode) * Public Functions ****************************************************************************/ -#ifdef CONFIG_BUILD_LOADABLE +#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) #else int wapi_main(int argc, char *argv[])