From e806097c70084ba98ff2ed1d018afbc126e533ae Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 6 Oct 2019 06:14:39 -0600 Subject: [PATCH] Application.mk and main.c files: Change builtin's entry point from main to xxx_main by macro expansion. This change make the entry point fully compliant with POSIX/ANSI standard. --- Application.mk | 139 +++++++----------- README.txt | 10 +- canutils/canlib/Makefile | 2 - canutils/libobd2/Makefile | 2 - examples/README.txt | 24 +-- examples/abntcodi/Kconfig | 1 - examples/abntcodi/Makefile | 11 +- examples/abntcodi/abntcodi_main.c | 4 - examples/adc/Makefile | 8 +- examples/adc/adc_main.c | 4 - examples/adxl372_test/Kconfig | 7 +- examples/adxl372_test/Makefile | 11 +- examples/adxl372_test/adxl372_test_main.c | 4 - examples/ajoystick/Makefile | 8 +- examples/ajoystick/ajoy_main.c | 6 +- examples/alarm/Kconfig | 1 - examples/alarm/Makefile | 11 +- examples/alarm/alarm_main.c | 4 - examples/apa102/Kconfig | 1 - examples/apa102/Makefile | 8 +- examples/apa102/apa102_main.c | 4 - examples/apds9960/Kconfig | 1 - examples/apds9960/Makefile | 11 +- examples/apds9960/apds9960_main.c | 4 - examples/bastest/Makefile | 7 +- examples/bastest/bastest_main.c | 4 - examples/battery/Kconfig | 1 - examples/battery/Makefile | 12 +- examples/battery/batt_main.c | 4 - examples/bmp180/Kconfig | 1 - examples/bmp180/Makefile | 11 +- examples/bmp180/bmp180_main.c | 4 - examples/bridge/Makefile | 8 +- examples/bridge/bridge_main.c | 4 - examples/buttons/Kconfig | 1 - examples/buttons/Makefile | 11 +- examples/buttons/buttons_main.c | 4 - examples/calib_udelay/Makefile | 15 +- examples/calib_udelay/calib_udelay_main.c | 4 - examples/can/Makefile | 8 +- examples/can/can_main.c | 4 - examples/canard/Makefile | 10 +- examples/canard/canard_main.c | 4 - examples/cctype/Makefile | 8 +- examples/cctype/cctype_main.cxx | 2 +- examples/chat/Makefile | 8 +- examples/chat/chat_main.c | 4 - examples/chrono/Kconfig | 1 - examples/chrono/Makefile | 12 +- examples/chrono/chrono_main.c | 4 - examples/configdata/Makefile | 8 +- examples/configdata/configdata_main.c | 4 - examples/cpuhog/Makefile | 11 +- examples/cpuhog/cpuhog_main.c | 4 - examples/dac/Makefile | 8 +- examples/dac/dac_main.c | 2 +- examples/dhcpd/Makefile | 8 +- examples/dhcpd/target.c | 4 - examples/dhtxx/Kconfig | 3 +- examples/dhtxx/Makefile | 12 +- examples/dhtxx/dhtxx_main.c | 4 - examples/discover/Makefile | 8 +- examples/discover/discover_main.c | 4 - examples/djoystick/Makefile | 8 +- examples/djoystick/djoy_main.c | 4 - examples/dsptest/Kconfig | 1 - examples/dsptest/Makefile | 11 +- examples/dsptest/dsptest_main.c | 4 - examples/elf/Kconfig | 2 +- examples/elf/Makefile | 6 +- examples/elf/elf_main.c | 4 - examples/embedlog/Kconfig | 3 +- examples/embedlog/Makefile | 9 +- examples/embedlog/embedlog_main.c | 4 - examples/fb/Kconfig | 1 - examples/fb/Makefile | 11 +- examples/fb/fb_main.c | 4 - examples/fboverlay/Kconfig | 1 - examples/fboverlay/Makefile | 8 +- examples/fboverlay/fboverlay_main.c | 4 - examples/flash_test/Kconfig | 5 +- examples/flash_test/Makefile | 8 +- examples/flash_test/flash_test.c | 4 - examples/flowc/Kconfig | 9 +- examples/flowc/Makefile | 34 +---- examples/flowc/flowc_target1.c | 6 - examples/flowc/flowc_target2.c | 4 - examples/ft80x/Kconfig | 1 - examples/ft80x/Makefile | 11 +- examples/ft80x/ft80x_main.c | 4 - examples/ftpc/Makefile | 12 +- examples/ftpc/ftpc_main.c | 4 - examples/ftpd/Makefile | 10 +- examples/ftpd/ftpd_main.c | 6 - examples/gpio/Kconfig | 1 - examples/gpio/Makefile | 11 +- examples/gpio/gpio_main.c | 4 - examples/gps/Kconfig | 1 - examples/gps/Makefile | 11 +- examples/gps/gps_main.c | 4 - examples/hello/Kconfig | 1 - examples/hello/Makefile | 12 +- examples/hello/hello_main.c | 4 - examples/helloxx/Makefile | 9 +- examples/helloxx/helloxx_main.cxx | 4 - examples/hidkbd/Kconfig | 1 - examples/hidkbd/Makefile | 11 +- examples/hidkbd/hidkbd_main.c | 4 - examples/i2schar/Makefile | 8 +- examples/i2schar/i2schar_main.c | 4 - examples/i2sloop/Makefile | 8 +- examples/i2sloop/i2sloop_main.c | 4 - examples/igmp/Makefile | 8 +- examples/igmp/igmp.c | 4 - examples/ina219/Kconfig | 1 - examples/ina219/Makefile | 11 +- examples/ina219/ina219_main.c | 4 - examples/ina226/Kconfig | 3 +- examples/ina226/Makefile | 9 +- examples/ina226/ina226_main.c | 4 - examples/ini_dumper/Kconfig | 3 +- examples/ini_dumper/Makefile | 10 +- examples/ini_dumper/ini_dumper_main.c | 4 - examples/ipforward/Kconfig | 1 - examples/ipforward/Makefile | 11 +- examples/ipforward/ipforward.c | 4 - examples/json/Makefile | 8 +- examples/json/json_main.c | 4 - examples/leds/Kconfig | 1 - examples/leds/Makefile | 11 +- examples/leds/leds_main.c | 4 - examples/lis3dsh_reader/Kconfig | 1 - examples/lis3dsh_reader/Makefile | 8 +- examples/lis3dsh_reader/lis3dsh_reader_main.c | 4 - examples/lsm330spi_test/Kconfig | 1 - examples/lsm330spi_test/Makefile | 11 +- examples/lsm330spi_test/lsm330spi_test_main.c | 4 - examples/lvgldemo/Makefile | 11 +- examples/lvgldemo/lvgldemo.c | 4 - examples/max31855/Kconfig | 1 - examples/max31855/Makefile | 11 +- examples/max31855/max31855_main.c | 4 - examples/media/Kconfig | 1 - examples/media/Makefile | 8 +- examples/media/media_main.c | 4 - examples/mld/Kconfig | 10 -- examples/mld/Makefile | 12 +- examples/mld/mld_main.c | 4 - examples/mlx90614/Kconfig | 1 - examples/mlx90614/Makefile | 8 +- examples/mlx90614/mlx90614_main.c | 4 - examples/mm/Makefile | 15 +- examples/mm/mm_main.c | 4 - examples/modbus/Kconfig | 2 +- examples/modbus/Makefile | 6 +- examples/modbus/modbus_main.c | 4 - examples/modbusmaster/Kconfig | 3 +- examples/modbusmaster/Makefile | 9 +- examples/modbusmaster/mbmaster_main.c | 4 - examples/module/Makefile | 8 +- examples/module/module_main.c | 4 - examples/mount/Makefile | 10 +- examples/mount/mount_main.c | 4 - examples/mtdpart/Makefile | 10 +- examples/mtdpart/mtdpart_main.c | 4 - examples/mtdrwb/Kconfig | 1 - examples/mtdrwb/Makefile | 10 +- examples/mtdrwb/mtdrwb_main.c | 4 - examples/netloop/Kconfig | 2 - examples/netloop/Makefile | 11 +- examples/netloop/lo_main.c | 4 - examples/netpkt/Makefile | 8 +- examples/netpkt/netpkt_main.c | 4 - examples/nettest/Kconfig | 10 +- examples/nettest/Makefile | 48 +----- examples/nettest/nettest_target1.c | 6 - examples/nettest/nettest_target2.c | 4 - examples/nrf24l01_term/Makefile | 8 +- examples/nrf24l01_term/nrf24l01_term.c | 4 - examples/null/Makefile | 8 +- examples/null/null_main.c | 4 - examples/nunchuck/Makefile | 8 +- examples/nunchuck/nunchuck_main.c | 4 - examples/nx/Makefile | 8 +- examples/nx/nx_main.c | 4 - examples/nxdemo/Makefile | 15 +- examples/nxdemo/nxdemo_main.c | 4 - examples/nxflat/Kconfig | 2 +- examples/nxflat/Makefile | 6 +- examples/nxflat/nxflat_main.c | 4 - examples/nxhello/Kconfig | 1 - examples/nxhello/Makefile | 11 +- examples/nxhello/nxhello_main.c | 4 - examples/nximage/Kconfig | 1 - examples/nximage/Makefile | 11 +- examples/nximage/nximage_main.c | 4 - examples/nxlines/Kconfig | 1 - examples/nxlines/Makefile | 11 +- examples/nxlines/nxlines_main.c | 4 - examples/nxterm/Kconfig | 1 - examples/nxterm/Makefile | 10 +- examples/nxterm/nxterm_main.c | 4 - examples/nxtext/Makefile | 12 +- examples/nxtext/nxtext_main.c | 4 - examples/obd2/Makefile | 15 +- examples/obd2/obd2_main.c | 4 - examples/oneshot/Kconfig | 10 -- examples/oneshot/Makefile | 11 +- examples/oneshot/oneshot_main.c | 4 - examples/pashello/Makefile | 10 +- examples/pashello/pashello.c | 4 - examples/pca9635/Kconfig | 1 - examples/pca9635/Makefile | 8 +- examples/pca9635/pca9635_main.c | 4 - examples/pdcurses/Makefile | 14 +- examples/pdcurses/charset_main.c | 4 - examples/pdcurses/firework_main.c | 4 - examples/pdcurses/newdemo_main.c | 4 - examples/pdcurses/panel_main.c | 4 - examples/pdcurses/rain_main.c | 4 - examples/pdcurses/testcurs_main.c | 4 - examples/pdcurses/tui_main.c | 4 - examples/pdcurses/worm_main.c | 4 - examples/pdcurses/xmas_main.c | 4 - examples/pf_ieee802154/Kconfig | 2 - examples/pf_ieee802154/Makefile | 11 +- examples/pf_ieee802154/pf_client.c | 4 - examples/pf_ieee802154/pf_server.c | 4 - examples/pipe/Makefile | 10 +- examples/pipe/pipe_main.c | 4 - examples/poll/Kconfig | 2 +- examples/poll/Makefile | 8 +- examples/poll/poll_main.c | 4 - examples/popen/Kconfig | 1 - examples/popen/Makefile | 11 +- examples/popen/popen_main.c | 4 - examples/posix_spawn/Kconfig | 2 +- examples/posix_spawn/Makefile | 6 +- examples/posix_spawn/spawn_main.c | 4 - examples/powerled/Makefile | 9 +- examples/powerled/powerled_main.c | 2 +- examples/powermonitor/Makefile | 8 +- examples/powermonitor/powermonitor_main.c | 4 - examples/pppd/Makefile | 10 +- examples/pppd/pppd_main.c | 2 +- examples/pty_test/Kconfig | 5 - examples/pty_test/Makefile | 11 +- examples/pty_test/pty_test.c | 4 - examples/pwfb/Kconfig | 1 - examples/pwfb/Makefile | 11 +- examples/pwfb/pwfb_main.c | 4 - examples/pwlines/Kconfig | 1 - examples/pwlines/Makefile | 11 +- examples/pwlines/pwlines_main.c | 4 - examples/pwm/Kconfig | 2 +- examples/pwm/Makefile | 8 +- examples/pwm/pwm.h | 6 - examples/pwm/pwm_main.c | 4 - examples/qencoder/Makefile | 8 +- examples/qencoder/qe_main.c | 4 - examples/random/Makefile | 8 +- examples/random/random_main.c | 4 - examples/relays/Makefile | 8 +- examples/relays/relays_main.c | 4 - examples/rfid_readuid/Kconfig | 1 - examples/rfid_readuid/Makefile | 11 +- examples/rfid_readuid/rfid_readuid.c | 4 - examples/rgbled/Kconfig | 1 - examples/rgbled/Makefile | 11 +- examples/rgbled/rgbled.c | 4 - examples/romfs/Makefile | 8 +- examples/romfs/romfs_main.c | 4 - examples/sendmail/Makefile | 10 +- examples/sendmail/sendmail_main.c | 4 - examples/serialblaster/Makefile | 11 +- examples/serialblaster/serialblaster_main.c | 4 - examples/serialrx/Makefile | 11 +- examples/serialrx/serialrx_main.c | 4 - examples/serloop/Makefile | 10 +- examples/serloop/serloop_main.c | 4 - examples/slcd/Makefile | 8 +- examples/slcd/slcd_main.c | 4 - examples/smps/Makefile | 9 +- examples/smps/smps_main.c | 2 +- examples/sotest/Makefile | 8 +- examples/sotest/sotest_main.c | 4 - examples/stat/Kconfig | 1 - examples/stat/Makefile | 11 +- examples/stat/stat_main.c | 4 - examples/sx127x_demo/Kconfig | 2 +- examples/sx127x_demo/Makefile | 8 +- examples/sx127x_demo/sx127x_demo.c | 4 - examples/system/Kconfig | 1 - examples/system/Makefile | 11 +- examples/system/system_main.c | 4 - examples/tcpblaster/Kconfig | 6 +- examples/tcpblaster/Makefile | 48 +----- examples/tcpblaster/tcpblaster_target1.c | 6 - examples/tcpblaster/tcpblaster_target2.c | 4 - examples/tcpecho/Makefile | 8 +- examples/tcpecho/tcpecho_main.c | 4 - examples/telnetd/Makefile | 8 +- examples/telnetd/telnetd.c | 4 - examples/thttpd/Makefile | 8 +- examples/thttpd/content/Makefile.binfs | 9 +- examples/thttpd/thttpd_main.c | 4 - examples/tiff/Makefile | 8 +- examples/tiff/tiff_main.c | 10 +- examples/timer/Kconfig | 10 -- examples/timer/Makefile | 11 +- examples/timer/timer_main.c | 4 - examples/touchscreen/Makefile | 8 +- examples/touchscreen/tc_main.c | 4 - examples/udgram/Kconfig | 21 --- examples/udgram/Makefile | 13 +- examples/udgram/udgram_client.c | 4 - examples/udgram/udgram_server.c | 4 - examples/udp/Kconfig | 6 +- examples/udp/Makefile | 33 +---- examples/udp/udp_target1.c | 6 - examples/udp/udp_target2.c | 4 - examples/udpblaster/Kconfig | 3 +- examples/udpblaster/Makefile | 17 +-- examples/udpblaster/udpblaster_target.c | 4 - examples/uid/Kconfig | 1 - examples/uid/Makefile | 12 +- examples/uid/uid_main.c | 4 - examples/unionfs/Makefile | 8 +- examples/unionfs/unionfs_main.c | 4 - examples/usbserial/Makefile | 8 +- examples/usbserial/usbserial_main.c | 4 - examples/userfs/Kconfig | 1 - examples/userfs/Makefile | 11 +- examples/userfs/userfs_main.c | 4 - examples/usrsocktest/Kconfig | 1 - examples/usrsocktest/Makefile | 11 +- examples/usrsocktest/usrsocktest_main.c | 4 - examples/ustream/Makefile | 7 +- examples/ustream/ustream_client.c | 4 - examples/ustream/ustream_server.c | 4 - examples/veml6070/Kconfig | 1 - examples/veml6070/Makefile | 11 +- examples/veml6070/veml6070_main.c | 4 - examples/watchdog/Makefile | 8 +- examples/watchdog/watchdog.h | 7 +- examples/watchdog/watchdog_main.c | 4 - examples/webserver/Makefile | 8 +- examples/webserver/webserver_main.c | 4 - examples/wget/Kconfig | 2 +- examples/wget/Makefile | 10 +- examples/wget/wget_main.c | 4 - examples/wgetjson/Makefile | 8 +- examples/wgetjson/wgetjson_main.c | 4 - examples/xbc_test/Kconfig | 1 - examples/xbc_test/Makefile | 11 +- examples/xbc_test/xbc_test_main.c | 4 - examples/xmlrpc/Makefile | 8 +- examples/xmlrpc/xmlrpc_main.c | 4 - examples/zerocross/Makefile | 8 +- examples/zerocross/zerocross_main.c | 4 - graphics/nxwidgets/UnitTests/CButton/Makefile | 5 +- .../UnitTests/CButton/cbutton_main.cxx | 4 +- .../nxwidgets/UnitTests/CButtonArray/Makefile | 5 +- .../CButtonArray/cbuttonarray_main.cxx | 4 +- .../nxwidgets/UnitTests/CCheckBox/Makefile | 5 +- .../UnitTests/CCheckBox/ccheckbox_main.cxx | 4 +- .../nxwidgets/UnitTests/CGlyphButton/Makefile | 5 +- .../CGlyphButton/cglyphbutton_main.cxx | 4 +- .../UnitTests/CGlyphSliderHorizontal/Makefile | 5 +- .../cglyphsliderhorizontal_main.cxx | 4 +- graphics/nxwidgets/UnitTests/CImage/Makefile | 5 +- .../UnitTests/CImage/cimage_main.cxx | 4 +- graphics/nxwidgets/UnitTests/CKeypad/Makefile | 5 +- .../UnitTests/CKeypad/ckeypad_main.cxx | 4 +- graphics/nxwidgets/UnitTests/CLabel/Makefile | 5 +- .../UnitTests/CLabel/clabel_main.cxx | 4 +- .../nxwidgets/UnitTests/CLatchButton/Makefile | 5 +- .../CLatchButton/clatchbutton_main.cxx | 4 +- .../UnitTests/CLatchButtonArray/Makefile | 5 +- .../clatchbuttonarray_main.cxx | 4 +- .../nxwidgets/UnitTests/CListBox/Makefile | 5 +- .../UnitTests/CListBox/clistbox_main.cxx | 4 +- .../nxwidgets/UnitTests/CProgressBar/Makefile | 5 +- .../CProgressBar/cprogressbar_main.cxx | 4 +- .../nxwidgets/UnitTests/CRadioButton/Makefile | 5 +- .../CRadioButton/cradiobutton_main.cxx | 4 +- .../UnitTests/CScrollbarHorizontal/Makefile | 5 +- .../cscrollbarhorizontal_main.cxx | 4 +- .../UnitTests/CScrollbarVertical/Makefile | 5 +- .../cscrollbarvertical_main.cxx | 4 +- .../UnitTests/CSliderHorizonal/Makefile | 5 +- .../csliderhorizontal_main.cxx | 4 +- .../UnitTests/CSliderVertical/Makefile | 5 +- .../CSliderVertical/cslidervertical_main.cxx | 4 +- .../nxwidgets/UnitTests/CTextBox/Makefile | 5 +- .../UnitTests/CTextBox/ctextbox_main.cxx | 4 +- graphics/nxwm/Makefile | 5 + graphics/nxwm/src/nxwm_main.cxx | 4 +- graphics/screenshot/Makefile | 8 +- graphics/screenshot/screenshot_main.c | 4 - graphics/traveler/Makefile | 8 +- graphics/traveler/src/trv_main.c | 4 - graphics/twm4nx/Kconfig | 1 - graphics/twm4nx/Makefile | 13 +- graphics/twm4nx/src/twm4nx_main.cxx | 8 - industry/abnt_codi/Kconfig | 2 +- interpreters/bas/Makefile | 10 +- interpreters/bas/bas_main.c | 4 - interpreters/minibasic/Makefile | 10 +- interpreters/minibasic/script.c | 4 - netutils/libcurl4nx/Kconfig | 2 +- netutils/thttpd/Kconfig | 2 +- netutils/thttpd/Makefile | 23 +-- netutils/thttpd/thttpd.c | 4 - system/cdcacm/Makefile | 9 +- system/cdcacm/README.txt | 1 - system/cdcacm/cdcacm.h | 4 - system/cdcacm/cdcacm_main.c | 8 - system/cfgdata/Kconfig | 2 +- system/cfgdata/Makefile | 12 +- system/cfgdata/cfgdata_main.c | 4 - system/composite/Makefile | 8 +- system/composite/composite_main.c | 12 +- system/critmon/Kconfig | 2 +- system/critmon/Makefile | 12 +- system/critmon/critmon.c | 2 +- system/cu/Makefile | 11 +- system/cu/cu_main.c | 4 - system/dhcpc/Kconfig | 1 - system/dhcpc/Makefile | 11 +- system/dhcpc/renew_main.c | 4 - system/flash_eraseall/Kconfig | 2 +- system/flash_eraseall/Makefile | 12 +- system/flash_eraseall/flash_eraseall_main.c | 4 - system/hex2bin/Kconfig | 2 - system/hex2bin/Makefile | 44 ++---- system/hex2bin/hex2bin_main.c | 4 - system/hex2bin/hex2mem_main.c | 4 - system/hexed/Makefile | 11 +- system/hexed/src/hexed.c | 4 - system/i2c/Makefile | 8 +- system/i2c/i2c_main.c | 4 - system/lm75/Makefile | 11 +- system/lm75/lm75.c | 4 - system/lzf/Kconfig | 1 - system/lzf/Makefile | 11 +- system/lzf/lzf_main.c | 4 - system/mdio/Makefile | 8 +- system/mdio/mdio_main.c | 4 - system/netdb/Makefile | 10 +- system/netdb/netdb_main.c | 4 - system/nsh/Kconfig | 1 - system/nsh/Makefile | 8 +- system/nsh/nsh_main.c | 4 - system/ntpc/Makefile | 9 +- system/ntpc/ntpcstart_main.c | 4 - system/ntpc/ntpcstop_main.c | 4 - system/nxplayer/Kconfig | 4 +- system/nxplayer/Makefile | 35 +---- system/nxplayer/nxplayer_main.c | 4 - system/nxrecorder/Kconfig | 4 +- system/nxrecorder/Makefile | 15 +- system/nxrecorder/nxrecorder_main.c | 4 - system/ping/Kconfig | 1 - system/ping/Makefile | 11 +- system/ping/ping.c | 4 - system/ping6/Kconfig | 1 - system/ping6/Makefile | 11 +- system/ping6/ping6.c | 4 - system/prun/Kconfig | 4 +- system/prun/Makefile | 19 +-- system/prun/pexec_main.c | 4 - system/psmq/Kconfig | 7 +- system/psmq/Makefile | 24 +-- system/ramtest/Kconfig | 1 - system/ramtest/Makefile | 11 +- system/ramtest/ramtest.c | 4 - system/sched_note/Kconfig | 1 - system/sched_note/Makefile | 11 +- system/sched_note/note_main.c | 4 - system/setlogmask/Kconfig | 1 - system/setlogmask/Makefile | 11 +- system/setlogmask/setlogmask.c | 4 - system/spi/Kconfig | 1 - system/spi/Makefile | 11 +- system/spi/spi_main.c | 4 - system/stackmonitor/Kconfig | 2 +- system/stackmonitor/Makefile | 9 +- system/stackmonitor/stackmonitor.c | 2 +- system/sudoku/Makefile | 10 +- system/sudoku/sudoku.c | 4 - system/taskset/Kconfig | 1 - system/taskset/Makefile | 11 +- system/taskset/taskset.c | 4 - system/tee/Makefile | 11 +- system/tee/tee.c | 4 - system/telnet/Kconfig | 8 - system/telnet/Makefile | 14 +- system/telnet/telnet_chatd.c | 4 - system/telnet/telnet_client.c | 4 - system/ubloxmodem/Makefile | 8 +- system/ubloxmodem/ubloxmodem_main.c | 4 - system/usbmsc/Kconfig | 5 +- system/usbmsc/Makefile | 14 +- system/usbmsc/usbmsc_main.c | 12 +- system/vi/Kconfig | 3 - system/vi/Makefile | 11 +- system/vi/vi.c | 4 - system/zmodem/Makefile | 14 +- system/zmodem/rz_main.c | 4 - system/zmodem/sz_main.c | 4 - testing/README.txt | 5 - testing/cxxtest/Makefile | 8 +- testing/cxxtest/cxxtest_main.cxx | 2 +- testing/fstest/Kconfig | 1 - testing/fstest/Makefile | 11 +- testing/fstest/fstest_main.c | 4 - testing/nxffs/Makefile | 10 +- testing/nxffs/nxffs_main.c | 4 - testing/ostest/Makefile | 8 +- testing/ostest/ostest_main.c | 4 - testing/scanftest/Kconfig | 1 - testing/scanftest/Makefile | 12 +- testing/scanftest/scanftest_main.c | 4 - testing/smart/Makefile | 10 +- testing/smart/smart_main.c | 4 - testing/smart_test/Kconfig | 1 - testing/smart_test/Makefile | 8 +- testing/smart_test/README.txt | 5 - testing/smart_test/smart_test.c | 4 - testing/smp/Kconfig | 1 - testing/smp/Makefile | 11 +- testing/smp/smp_main.c | 4 - wireless/bluetooth/btsak/Kconfig | 1 - wireless/bluetooth/btsak/Makefile | 8 +- wireless/bluetooth/btsak/btsak_main.c | 4 - wireless/gs2200m/Makefile | 11 +- wireless/gs2200m/gs2200m_main.c | 4 - wireless/ieee802154/i8sak/Kconfig | 1 - wireless/ieee802154/i8sak/Makefile | 8 +- wireless/ieee802154/i8sak/i8sak_main.c | 4 - wireless/ieee802154/i8shark/Makefile | 8 +- wireless/ieee802154/i8shark/i8shark_main.c | 4 - wireless/iwpan/Kconfig | 1 - wireless/iwpan/Makefile | 16 +- wireless/iwpan/src/iwpan.c | 4 - wireless/wapi/Kconfig | 5 +- wireless/wapi/Makefile | 16 +- wireless/wapi/src/Make.defs | 2 +- wireless/wapi/src/wapi.c | 4 - 550 files changed, 664 insertions(+), 2928 deletions(-) diff --git a/Application.mk b/Application.mk index d05d3c0e4..b6a30db14 100644 --- a/Application.mk +++ b/Application.mk @@ -42,20 +42,13 @@ include $(APPDIR)/Make.defs # has the value "m" ifneq ($(MAINSRC),) - ifeq ($($(MODULE)),m) + ifeq ($(MODULE),m) BUILD_MODULE = y endif -endif -ifeq ($(CONFIG_BUILD_KERNEL),y) - BUILD_MODULE = y -endif - -# Pass the definition to the C/C++ code via the CFLAGS/CXXFLAGS - -ifeq ($(BUILD_MODULE),y) - CFLAGS += ${shell $(DEFINE) "$(CC)" BUILD_MODULE} - CXXFLAGS += ${shell $(DEFINE) "$(CC)" BUILD_MODULE} + ifeq ($(CONFIG_BUILD_KERNEL),y) + BUILD_MODULE = y + endif endif # File extensions @@ -84,12 +77,13 @@ endif # Module install directory BIN ?= $(APPDIR)$(DELIM)libapps$(LIBEXT) -INSTALL_DIR = $(BIN) ifeq ($(WINTOOL),y) - TOOLBIN ?= "${shell cygpath -w $(BIN)}" + TOOLBIN = "${shell cygpath -w $(BIN)}" + INSTALLDIR = "${shell cygpath -w $(BINDIR)}" else - TOOLBIN ?= $(BIN) + TOOLBIN = $(BIN) + INSTALLDIR = $(BINDIR) endif ROOTDEPPATH += --dep-path . @@ -102,27 +96,6 @@ all:: .built .PHONY: clean preconfig depend distclean .PRECIOUS: $(BIN) -ifneq ($(CONFIG_BUILD_LOADABLE),y) - -$(AOBJS): %$(OBJEXT): %.S - $(call ASSEMBLE, $<, $@) - -$(COBJS): %$(OBJEXT): %.c - $(call COMPILE, $<, $@) - -$(CXXOBJS): %$(OBJEXT): %$(CXXEXT) - $(call COMPILEXX, $<, $@) - -ifeq ($(suffix $(MAINSRC)),$(CXXEXT)) -$(MAINOBJ): %$(OBJEXT): %$(CXXEXT) - $(call COMPILEXX, $<, $@) -else -$(MAINOBJ): %$(OBJEXT): %.c - $(call COMPILE, $<, $@) -endif - -else - define ELFASSEMBLE @echo "AS: $1" $(Q) $(CC) -c $(AELFFLAGS) $($(strip $1)_AELFFLAGS) $1 -o $2 @@ -138,69 +111,70 @@ define ELFCOMPILEXX $(Q) $(CXX) -c $(CXXELFFLAGS) $($(strip $1)_CXXELFFLAGS) $1 -o $2 endef +define ELFLD + @echo "LD: $2" + $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) $(ARCHCRT0OBJ) $1 $(LDLIBS) -o $2 +# $(Q) $(STRIP) $2 + $(Q) chmod +x $2 +endef + $(AOBJS): %$(OBJEXT): %.S - $(if $(AELFFLAGS), \ - $(call ELFASSEMBLE, $<, $@), \ - $(call ASSEMBLE, $<, $@) \ - ) + $(if $(and $(CONFIG_BUILD_LOADABLE),$(AELFFLAGS)), \ + $(call ELFASSEMBLE, $<, $@), $(call ASSEMBLE, $<, $@)) $(COBJS): %$(OBJEXT): %.c - $(if $(CELFFLAGS), \ - $(call ELFCOMPILE, $<, $@), \ - $(call COMPILE, $<, $@) \ - ) + $(if $(and $(CONFIG_BUILD_LOADABLE),$(CELFFLAGS)), \ + $(call ELFCOMPILE, $<, $@), $(call COMPILE, $<, $@)) $(CXXOBJS): %$(OBJEXT): %$(CXXEXT) - $(if $(CXXELFFLAGS), \ - $(call ELFCOMPILEXX, $<, $@), \ - $(call COMPILEXX, $<, $@) \ - ) - -ifeq ($(suffix $(MAINSRC)),$(CXXEXT)) -$(MAINOBJ): %$(OBJEXT): %$(CXXEXT) - $(if $(CXXELFFLAGS), \ - $(call ELFCOMPILEXX, $<, $@), \ - $(call COMPILEXX, $<, $@) \ - ) -else -$(MAINOBJ): %$(OBJEXT): %.c - $(if $(CELFFLAGS), \ - $(call ELFCOMPILE, $<, $@), \ - $(call COMPILE, $<, $@) \ - ) -endif - -endif + $(if $(and $(CONFIG_BUILD_LOADABLE),$(CXXELFFLAGS)), \ + $(call ELFCOMPILEXX, $<, $@), $(call COMPILEXX, $<, $@)) .built: $(OBJS) $(call ARCHIVE, $(TOOLBIN), $(OBJS)) $(Q) touch $@ -ifeq ($(BUILD_MODULE), y) +ifeq ($(BUILD_MODULE),y) -ifeq ($(WINTOOL), y) - PROGPRFX = ${cygpath -u $(INSTALL_DIR)$(DELIM)} +ifeq ($(suffix $(MAINSRC)),$(CXXEXT)) +$(MAINOBJ): %$(OBJEXT): %$(CXXEXT) + $(if $(and $(CONFIG_BUILD_LOADABLE),$(CXXELFFLAGS)), \ + $(call ELFCOMPILEXX, $<, $@), $(call COMPILEXX, $<, $@)) else - PROGPRFX = $(INSTALL_DIR)$(DELIM) +$(MAINOBJ): %$(OBJEXT): %.c + $(if $(and $(CONFIG_BUILD_LOADABLE),$(CELFFLAGS)), \ + $(call ELFCOMPILE, $<, $@), $(call COMPILE, $<, $@)) endif -PROGLIST := $(addprefix $(PROGPRFX),$(PROGNAME)) +PROGLIST := $(wordlist 1,$(words $(MAINOBJ)),$(PROGNAME)) +PROGLIST := $(addprefix $(INSTALLDIR)$(DELIM),$(PROGLIST)) PROGOBJ := $(MAINOBJ) -$(PROGLIST): $(MAINOBJ) $(OBJS) -ifneq ($(PROGOBJ),) - $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) $(ARCHCRT0OBJ) $(firstword $(PROGOBJ)) $(LDLIBS) -o $(strip $(firstword $(PROGLIST)))_ - $(Q) $(NM) -u $(strip $(firstword $(PROGLIST)))_ - $(Q) install -m 0755 -D $(strip $(firstword $(PROGLIST)))_ $(firstword $(PROGLIST)) - $(call DELFILE, $(strip $(firstword $(PROGLIST)))_) -# $(Q) $(STRIP) $(firstword $(PROGLIST)) +$(PROGLIST): $(MAINOBJ) + $(call ELFLD,$(firstword $(PROGOBJ)),$(firstword $(PROGLIST))) $(eval PROGLIST=$(filter-out $(firstword $(PROGLIST)),$(PROGLIST))) $(eval PROGOBJ=$(filter-out $(firstword $(PROGOBJ)),$(PROGOBJ))) -endif install:: $(PROGLIST) else + +MAINNAME := $(addsuffix _main,$(PROGNAME)) + +ifeq ($(suffix $(MAINSRC)),$(CXXEXT)) +$(MAINOBJ): %$(OBJEXT): %$(CXXEXT) + $(eval CXXFLAGS += ${shell $(DEFINE) "$(CXX)" main=$(firstword $(MAINNAME))}) + $(eval MAINNAME=$(filter-out $(firstword $(MAINNAME)),$(MAINNAME))) + $(if $(and $(CONFIG_BUILD_LOADABLE),$(CXXELFFLAGS)), \ + $(call ELFCOMPILEXX, $<, $@), $(call COMPILEXX, $<, $@)) +else +$(MAINOBJ): %$(OBJEXT): %.c + $(eval CFLAGS += ${shell $(DEFINE) "$(CC)" main=$(firstword $(MAINNAME))}) + $(eval MAINNAME=$(filter-out $(firstword $(MAINNAME)),$(MAINNAME))) + $(if $(and $(CONFIG_BUILD_LOADABLE),$(CELFFLAGS)), \ + $(call ELFCOMPILE, $<, $@), $(call COMPILE, $<, $@)) +endif + install:: endif # BUILD_MODULE @@ -208,13 +182,13 @@ endif # BUILD_MODULE preconfig:: ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) -ifneq ($(BUILD_MODULE),y) -REGLIST := $(addprefix $(BUILTIN_REGISTRY)$(DELIM),$(APPNAME)_main.bdat) -APPLIST := $(APPNAME) - -ifneq ($(APPNAME),) +ifneq ($(PROGNAME),) ifneq ($(PRIORITY),) ifneq ($(STACKSIZE),) + +REGLIST := $(addprefix $(BUILTIN_REGISTRY)$(DELIM),$(addsuffix _main.bdat,$(PROGNAME))) +APPLIST := $(PROGNAME) + $(REGLIST): $(DEPCONFIG) Makefile $(call REGISTER,$(firstword $(APPLIST)),$(firstword $(PRIORITY)),$(firstword $(STACKSIZE)),$(if $(BUILD_MODULE),,$(firstword $(APPLIST))_main)) $(eval APPLIST=$(filter-out $(firstword $(APPLIST)),$(APPLIST))) @@ -234,9 +208,6 @@ endif else context:: endif -else -context:: -endif .depend: Makefile $(SRCS) ifeq ($(filter %$(CXXEXT),$(SRCS)),) diff --git a/README.txt b/README.txt index 2afca4b35..79226cd63 100644 --- a/README.txt +++ b/README.txt @@ -117,7 +117,7 @@ An example application skeleton can be found under the examples/hello sub-directory. This example shows how a builtin application can be added to the project. One must: - 1. Create sub-directory as: appname + 1. Create sub-directory as: progname 2. In this directory there should be: @@ -129,11 +129,11 @@ to the project. One must: - The application source code. 3. The application source code should provide the entry point: - appname_main() + main() 4. Set the requirements in the file: Makefile, specially the lines: - APPNAME = appname + PROGNAME = progname PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 768 ASRCS = asm source file list as a.asm b.asm ... @@ -141,8 +141,8 @@ to the project. One must: 4b. The Make.defs file should include a line like: - ifeq ($(CONFIG_APPNAME),y) - CONFIGURED_APPS += appname + ifeq ($(CONFIG_PROGNAME),y) + CONFIGURED_APPS += progname endif Building NuttX with Board-Specific Pieces Outside the Source Tree diff --git a/canutils/canlib/Makefile b/canutils/canlib/Makefile index dd70839ee..232a9d490 100644 --- a/canutils/canlib/Makefile +++ b/canutils/canlib/Makefile @@ -41,6 +41,4 @@ CSRCS = canlib_getbaud.c canlib_setbaud.c CSRCS += canlib_getloopback.c canlib_setloopback.c CSRCS += canlib_getsilent.c canlib_setsilent.c -APPNAME = canlib - include $(APPDIR)/Application.mk diff --git a/canutils/libobd2/Makefile b/canutils/libobd2/Makefile index 129e99ee3..828325b11 100644 --- a/canutils/libobd2/Makefile +++ b/canutils/libobd2/Makefile @@ -39,6 +39,4 @@ include $(TOPDIR)/Make.defs CSRCS = obd2.c obd_sendrequest.c obd_waitresponse.c obd_decodepid.c -APPNAME = libobd2 - include $(APPDIR)/Application.mk diff --git a/examples/README.txt b/examples/README.txt index 6f77375d2..a6684dc63 100644 --- a/examples/README.txt +++ b/examples/README.txt @@ -79,8 +79,8 @@ examples/alarm Configuration: CONFIG_EXAMPLES_ALARM - Enable the RTC driver alarm test - CONFIG_EXAMPLES_ALARM_PROGNAME - If CONFIG_BUILD_LOADABLE=y, then this is - the name of the program that will be used when the NSH ELF program is + CONFIG_EXAMPLES_ALARM_PROGNAME - this isthe name of the + program that will be used when the NSH ELF program is installed. CONFIG_EXAMPLES_ALARM_PRIORITY - Alarm daemon priority CONFIG_EXAMPLES_ALARM_STACKSIZE - Alarm daemon stack size @@ -396,8 +396,6 @@ examples/flash_test Dependencies: * CONFIG_MTD_SMART=y - SMART block driver support - * CONFIG_NSH_BUILTIN_APPS=y - This example can only be built as an NSH - command * CONFIG_BUILD_PROTECTED=n and CONFIG_BUILD_KERNEL=n - This test uses internal OS interfaces and so is not available in the NUTTX kernel builds @@ -418,9 +416,7 @@ examples/ftpc ^^^^^^^^^^^^^ This is a simple FTP client shell used to exercise the capabilities - of the FTPC library (apps/netutils/ftpc). This example is configured - to that it will only work as a "built-in" program that can be run from - NSH when CONFIG_NSH_BUILTIN_APPS is defined. + of the FTPC library (apps/netutils/ftpc). From NSH, the startup command sequence is as follows. This is only an example, your configration could have different mass storage devices, @@ -901,7 +897,6 @@ examples/netloop Dependencies: - CONFIG_NSH_BUILTIN_APPS=n - Does NOT work as an NSH built-in command CONFIG_NET_LOOPBACK - Requires local loopback supprt CONFIG_NET_TCP - Requires TCP support with the following: CONFIG_NET_TCPBACKLOG @@ -1418,8 +1413,6 @@ examples/pwm CONFIG_PWM_PULSECOUNT - Enables PWM pulse count support (if the hardware supports it). CONFIG_NSH_BUILTIN_APPS - Build the PWM test as an NSH built-in function. - Default: Not built! The example can only be used as an NSH built-in - application Specific configuration options for this example include: @@ -1757,11 +1750,7 @@ examples/tiff This is a simple unit test for the TIFF creation library at apps/graphic/tiff. It is configured to work in the Linux user-mode simulation and has not been - tested in any other environment. Since the example also depends on some - other logic to mount a file system, currently it will only work as an NSH - built-on, i.e., if the following is defined: - - CONFIG_NSH_BUILTIN_APPS=y + tested in any other environment. At a miniumum, to run in an embedded environment, you will probably have to change the configured paths to the TIFF files defined in the example. @@ -1793,8 +1782,6 @@ examples/timer microseconds. Default: 1000000 CONFIG_EXAMPLES_TIMER_DELAY - This is the delay between timer samples in microseconds. Default: 10000 - CONFIG_EXAMPLES_TIMER_APPNAME - This is the name of the built-in - application: Default: "timer" CONFIG_EXAMPLES_TIMER_STACKSIZE - This is the stack size allocated when the timer task runs. Default: 2048 CONFIG_EXAMPLES_TIMER_PRIORITY - This is the priority of the timer task: @@ -2012,8 +1999,7 @@ examples/watchdog CONFIG_WATCHDOG- Enables watchdog timer support support. CONFIG_NSH_BUILTIN_APPS - Build the watchdog time test as an NSH - built-in function. Default: Not built! The example can only be used - as an NSH built-in application + built-in function. Specific configuration options for this example include: diff --git a/examples/abntcodi/Kconfig b/examples/abntcodi/Kconfig index 4f8d05aee..468f73e9d 100644 --- a/examples/abntcodi/Kconfig +++ b/examples/abntcodi/Kconfig @@ -15,7 +15,6 @@ if EXAMPLES_ABNTCODI config EXAMPLES_ABNTCODI_PROGNAME string "Program name" default "abntcodi" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/abntcodi/Makefile b/examples/abntcodi/Makefile index 0ec8955fc..48793d3a8 100644 --- a/examples/abntcodi/Makefile +++ b/examples/abntcodi/Makefile @@ -37,21 +37,14 @@ include $(TOPDIR)/Make.defs # ABNTCODI built-in application info -CONFIG_EXAMPLES_ABNTCODI_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_ABNTCODI_STACKSIZE ?= 2048 - -APPNAME = abntcodi +PROGNAME = $(CONFIG_EXAMPLES_ABNTCODI_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_ABNTCODI_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_ABNTCODI_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_ABNTCODI) # ABNTCODI Example MAINSRC = abntcodi_main.c -CONFIG_EXAMPLES_ABNTCODI_PROGNAME ?= abntcodi$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_ABNTCODI_PROGNAME) - -MODULE = CONFIG_EXAMPLES_ABNTCODI - include $(APPDIR)/Application.mk diff --git a/examples/abntcodi/abntcodi_main.c b/examples/abntcodi/abntcodi_main.c index d43ca3368..18dbbcfaa 100644 --- a/examples/abntcodi/abntcodi_main.c +++ b/examples/abntcodi/abntcodi_main.c @@ -82,11 +82,7 @@ void print_abnt_codi(FAR struct abnt_codi_proto_s *proto) * abntcodi_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int abntcodi_main(int argc, char *argv[]) -#endif { FAR struct abnt_codi_proto_s *proto; int fd; diff --git a/examples/adc/Makefile b/examples/adc/Makefile index b9eeaf328..0e73cbe2b 100644 --- a/examples/adc/Makefile +++ b/examples/adc/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = adc_main.c -CONFIG_XYZ_PROGNAME ?= adc$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # application info -APPNAME = adc +PROGNAME = adc PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_ADC +MODULE = $(CONFIG_EXAMPLES_ADC) include $(APPDIR)/Application.mk diff --git a/examples/adc/adc_main.c b/examples/adc/adc_main.c index 56aefbd59..8d6929176 100644 --- a/examples/adc/adc_main.c +++ b/examples/adc/adc_main.c @@ -228,11 +228,7 @@ static void parse_args(FAR struct adc_state_s *adc, int argc, FAR char **argv) * Name: adc_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int adc_main(int argc, char *argv[]) -#endif { struct adc_msg_s sample[CONFIG_EXAMPLES_ADC_GROUPSIZE]; size_t readsize; diff --git a/examples/adxl372_test/Kconfig b/examples/adxl372_test/Kconfig index b00bd6dd6..19e9c836a 100644 --- a/examples/adxl372_test/Kconfig +++ b/examples/adxl372_test/Kconfig @@ -13,18 +13,17 @@ if EXAMPLES_ADXL372_TEST config EXAMPLES_ADXL372_TEST_PROGNAME string "Program name" - default "ADXL372_test" - depends on BUILD_LOADABLE + default "adxl372_test" ---help--- This is the name of the program that will be used when the NSH ELF program is installed. config EXAMPLES_ADXL372_TEST_PRIORITY - int "ADXL372_test task priority" + int "adxl372_test task priority" default 100 config EXAMPLES_ADXL372_TEST_STACKSIZE - int "ADXL372_test stack size" + int "adxl372_test stack size" default 2048 endif diff --git a/examples/adxl372_test/Makefile b/examples/adxl372_test/Makefile index 76bd0f2ec..a63bcad35 100644 --- a/examples/adxl372_test/Makefile +++ b/examples/adxl372_test/Makefile @@ -35,20 +35,13 @@ include $(TOPDIR)/Make.defs -CONFIG_EXAMPLES_ADXL372_TEST_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_ADXL372_TEST_STACKSIZE ?= 2048 - -APPNAME = adxl372_test +PROGNAME = $(CONFIG_EXAMPLES_ADXL372_TEST_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_ADXL372_TEST_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_ADXL372_TEST_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_ADXL372_TEST) # ADXL372 sensor test Example MAINSRC = adxl372_test_main.c -CONFIG_EXAMPLES_ADXL372_TEST_PROGNAME ?= adxl372_test$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_ADXL372_TEST_PROGNAME) - -MODULE = CONFIG_EXAMPLES_ADXL372_TEST - include $(APPDIR)/Application.mk diff --git a/examples/adxl372_test/adxl372_test_main.c b/examples/adxl372_test/adxl372_test_main.c index 622b78f98..e7aff6bbd 100644 --- a/examples/adxl372_test/adxl372_test_main.c +++ b/examples/adxl372_test/adxl372_test_main.c @@ -387,11 +387,7 @@ quick_exit: * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int adxl372_test_main(int argc, FAR char *argv[]) -#endif { int rc = 0; int step_rc = 0; diff --git a/examples/ajoystick/Makefile b/examples/ajoystick/Makefile index 20f561fac..13904a04d 100644 --- a/examples/ajoystick/Makefile +++ b/examples/ajoystick/Makefile @@ -39,16 +39,12 @@ include $(TOPDIR)/Make.defs MAINSRC = ajoy_main.c -CONFIG_AJOY_PROGNAME ?= ajoy$(EXEEXT) -PROGNAME = $(CONFIG_AJOY_PROGNAME) - # Buttons built-in application info -APPNAME = ajoy +PROGNAME = ajoy PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_AJOYSTICK +MODULE = $(CONFIG_EXAMPLES_AJOYSTICK) include $(APPDIR)/Application.mk diff --git a/examples/ajoystick/ajoy_main.c b/examples/ajoystick/ajoy_main.c index 1fea5aa56..b9975bf54 100644 --- a/examples/ajoystick/ajoy_main.c +++ b/examples/ajoystick/ajoy_main.c @@ -376,11 +376,7 @@ static int ajoy_calibrate(int fd) * ajoy_main ****************************************************************************/ -#ifdef BUILD_MODULE -int main(int argc, FAR char *argv[]) -#else -int ajoy_main(int argc, char *argv[]) -#endif +int main(int argc, char *argv[]) { struct timespec timeout; struct ajoy_notify_s notify; diff --git a/examples/alarm/Kconfig b/examples/alarm/Kconfig index d81d97af6..b55c986e8 100644 --- a/examples/alarm/Kconfig +++ b/examples/alarm/Kconfig @@ -15,7 +15,6 @@ if EXAMPLES_ALARM config EXAMPLES_ALARM_PROGNAME string "Program name" default "alarm" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/alarm/Makefile b/examples/alarm/Makefile index 6b88ab254..1716fe54c 100644 --- a/examples/alarm/Makefile +++ b/examples/alarm/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # RTC driver alarm test built-in application info -CONFIG_EXAMPLES_ALARM_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_ALARM_STACKSIZE ?= 2048 - -APPNAME = alarm +PROGNAME = $(CONFIG_EXAMPLES_ALARM_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_ALARM_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_ALARM_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_ALARM) # RTC driver alarm test MAINSRC = alarm_main.c -CONFIG_EXAMPLES_ALARM_PROGNAME ?= alarm$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_ALARM_PROGNAME) - -MODULE = CONFIG_EXAMPLES_ALARM - include $(APPDIR)/Application.mk diff --git a/examples/alarm/alarm_main.c b/examples/alarm/alarm_main.c index 54b4562c0..fe9bcb037 100644 --- a/examples/alarm/alarm_main.c +++ b/examples/alarm/alarm_main.c @@ -208,11 +208,7 @@ static void show_usage(FAR const char *progname) * alarm_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int alarm_main(int argc, FAR char *argv[]) -#endif { unsigned long seconds = 0; bool badarg = false; diff --git a/examples/apa102/Kconfig b/examples/apa102/Kconfig index eec9070bf..9494a7446 100644 --- a/examples/apa102/Kconfig +++ b/examples/apa102/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_APA102 config EXAMPLES_APA102_PROGNAME string "Program name" default "apa102" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/apa102/Makefile b/examples/apa102/Makefile index 435ad1222..c336e62fb 100644 --- a/examples/apa102/Makefile +++ b/examples/apa102/Makefile @@ -37,17 +37,13 @@ include $(TOPDIR)/Make.defs # APA102 built-in application info -APPNAME = apa102 +PROGNAME = $(CONFIG_EXAMPLES_APA102_PROGNAME) PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_APA102) # APA102 Test MAINSRC = apa102_main.c -CONFIG_EXAMPLES_APA102_PROGNAME ?= apa102$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_APA102_PROGNAME) - -MODULE = CONFIG_EXAMPLES_APA102 - include $(APPDIR)/Application.mk diff --git a/examples/apa102/apa102_main.c b/examples/apa102/apa102_main.c index 4493cf389..b9f062eb7 100644 --- a/examples/apa102/apa102_main.c +++ b/examples/apa102/apa102_main.c @@ -150,11 +150,7 @@ static struct apa102_ledstrip_s hsvtorgb(uint16_t h, uint8_t s, uint8_t v) * apa102_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int apa102_main(int argc, char *argv[]) -#endif { int fd; int ret; diff --git a/examples/apds9960/Kconfig b/examples/apds9960/Kconfig index 4af9e9028..0de5d404b 100644 --- a/examples/apds9960/Kconfig +++ b/examples/apds9960/Kconfig @@ -15,7 +15,6 @@ if EXAMPLES_APDS9960 config EXAMPLES_APDS9960_PROGNAME string "APDS-9960 Test Program name" default "apds9960" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/apds9960/Makefile b/examples/apds9960/Makefile index 2783a7197..87abb03a4 100644 --- a/examples/apds9960/Makefile +++ b/examples/apds9960/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # Hello, World! built-in application info -CONFIG_EXAMPLES_APDS9960_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_APDS9960_STACKSIZE ?= 2048 - -APPNAME = apds9960 +PROGNAME = $(CONFIG_EXAMPLES_APDS9960_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_APDS9960_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_APDS9960_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_APDS9960) # Hello, World! Example MAINSRC = apds9960_main.c -CONFIG_EXAMPLES_APDS9960_PROGNAME ?= apds9960$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_APDS9960_PROGNAME) - -MODULE = CONFIG_EXAMPLES_APDS9960 - include $(APPDIR)/Application.mk diff --git a/examples/apds9960/apds9960_main.c b/examples/apds9960/apds9960_main.c index 4e338c7a1..0625aa80c 100644 --- a/examples/apds9960/apds9960_main.c +++ b/examples/apds9960/apds9960_main.c @@ -62,11 +62,7 @@ * apds9960_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int apds9960_main(int argc, char *argv[]) -#endif { int fd; int nbytes; diff --git a/examples/bastest/Makefile b/examples/bastest/Makefile index 9c076e0fa..094dff954 100644 --- a/examples/bastest/Makefile +++ b/examples/bastest/Makefile @@ -37,9 +37,10 @@ include $(TOPDIR)/Make.defs # BAS test volume mounter -APPNAME = bastest +PROGNAME = bastest PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_BASTEST) # Hello, World! Example @@ -50,8 +51,6 @@ TESTS_DIR = $(BASTEST_DIR)$(DELIM)tests ROMFS_IMG = romfs.img ROMFS_HDR = romfs.h -PROGNAME = bastest$(EXEEXT) - # Common build # Create the romfs.h header file from the tests/ directory @@ -70,6 +69,4 @@ distclean:: $(call DELFILE, $(ROMFS_HDR)) $(call DELFILE, $(ROMFS_IMG)) -MODULE = CONFIG_EXAMPLES_BASTEST - include $(APPDIR)/Application.mk diff --git a/examples/bastest/bastest_main.c b/examples/bastest/bastest_main.c index aba023758..f38e2af0c 100644 --- a/examples/bastest/bastest_main.c +++ b/examples/bastest/bastest_main.c @@ -89,11 +89,7 @@ * bastest_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int bastest_main(int argc, char *argv[]) -#endif { int ret; diff --git a/examples/battery/Kconfig b/examples/battery/Kconfig index b342f06ad..0f1a5eb82 100644 --- a/examples/battery/Kconfig +++ b/examples/battery/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_BATTERY config EXAMPLES_BATTERY_PROGNAME string "Program name" default "batt" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/battery/Makefile b/examples/battery/Makefile index 8ddfea4d6..2b169d3c1 100644 --- a/examples/battery/Makefile +++ b/examples/battery/Makefile @@ -37,21 +37,13 @@ include $(TOPDIR)/Make.defs # Battery built-in application info -CONFIG_EXAMPLES_BATTERY_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_BATTERY_STACKSIZE ?= 2048 - -APPNAME = batt - +PROGNAME = $(CONFIG_EXAMPLES_BATTERY_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_BATTERY_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_BATTERY_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_BATTERY) # Hello, World! Example MAINSRC = batt_main.c -CONFIG_EXAMPLES_BATTERY_PROGNAME ?= batt$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_BATTERY_PROGNAME) - -MODULE = CONFIG_EXAMPLES_BATTERY - include $(APPDIR)/Application.mk diff --git a/examples/battery/batt_main.c b/examples/battery/batt_main.c index 797b8a944..7e0ad4ffb 100644 --- a/examples/battery/batt_main.c +++ b/examples/battery/batt_main.c @@ -190,11 +190,7 @@ void health_report(int health) * batt_main ****************************************************************************/ -#if defined(BUILD_MODULE) int main(int argc, FAR char *argv[]) -#else -int batt_main(int argc, char *argv[]) -#endif { int i; int fd; diff --git a/examples/bmp180/Kconfig b/examples/bmp180/Kconfig index 70a601c9c..de96192f8 100644 --- a/examples/bmp180/Kconfig +++ b/examples/bmp180/Kconfig @@ -15,7 +15,6 @@ if EXAMPLES_BMP180 config EXAMPLES_BMP180_PROGNAME string "Program name" default "bmp180" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/bmp180/Makefile b/examples/bmp180/Makefile index cb8cf57d1..fe5e78557 100644 --- a/examples/bmp180/Makefile +++ b/examples/bmp180/Makefile @@ -39,20 +39,13 @@ include $(TOPDIR)/Make.defs # BMP180 Barometer sensor example built-in application info -CONFIG_EXAMPLES_BMP180_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_BMP180_STACKSIZE ?= 2048 - -APPNAME = bmp180 +PROGNAME = $(CONFIG_EXAMPLES_BMP180_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_BMP180_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_BMP180_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_BMP180) # BMP180 Barometer sensor example MAINSRC = bmp180_main.c -CONFIG_EXAMPLES_BMP180_PROGNAME ?= bmp180$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_BMP180_PROGNAME) - -MODULE = CONFIG_EXAMPLES_BMP180 - include $(APPDIR)/Application.mk diff --git a/examples/bmp180/bmp180_main.c b/examples/bmp180/bmp180_main.c index 3f42a03ab..2c58082ba 100644 --- a/examples/bmp180/bmp180_main.c +++ b/examples/bmp180/bmp180_main.c @@ -50,11 +50,7 @@ * bmp180_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int bmp180_main(int argc, char *argv[]) -#endif { int fd; int ret; diff --git a/examples/bridge/Makefile b/examples/bridge/Makefile index f45c691cf..864561e0e 100644 --- a/examples/bridge/Makefile +++ b/examples/bridge/Makefile @@ -38,9 +38,10 @@ include $(TOPDIR)/Make.defs # Discover built-in application info -APPNAME = bridge +PROGNAME = bridge PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_BRIDGE) MAINSRC = bridge_main.c @@ -54,9 +55,6 @@ HOST_OBJS = $(HOST_OBJS1) $(HOST_OBJS2) HOST_BIN1 = host1 HOST_BIN2 = host2 -CONFIG_EXAMPLES_BRIDGE_PROGNAME ?= bridge$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_BRIDGE_PROGNAME) - # Common build $(HOST_OBJS): %.o: %.c @@ -84,6 +82,4 @@ clean:: distclean:: $(call DELFILE, bridge_config.h) -MODULE = CONFIG_EXAMPLES_BRIDGE - include $(APPDIR)/Application.mk diff --git a/examples/bridge/bridge_main.c b/examples/bridge/bridge_main.c index 78ef44a1f..d5ea3537f 100644 --- a/examples/bridge/bridge_main.c +++ b/examples/bridge/bridge_main.c @@ -681,11 +681,7 @@ errout_with_recvsd: * bridge_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int bridge_main(int argc, char *argv[]) -#endif { pid_t net1_worker; pid_t net2_worker; diff --git a/examples/buttons/Kconfig b/examples/buttons/Kconfig index 07edbaa02..c2731eb35 100644 --- a/examples/buttons/Kconfig +++ b/examples/buttons/Kconfig @@ -15,7 +15,6 @@ if EXAMPLES_BUTTONS config EXAMPLES_BUTTONS_PROGNAME string "Program name" default "buttons" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/buttons/Makefile b/examples/buttons/Makefile index 9510dbc06..7c97b1d57 100644 --- a/examples/buttons/Makefile +++ b/examples/buttons/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # LED driver test built-in application info -CONFIG_EXAMPLES_BUTTONS_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_BUTTONS_STACKSIZE ?= 2048 - -APPNAME = buttons +PROGNAME = $(CONFIG_EXAMPLES_BUTTONS_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_BUTTONS_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_BUTTONS_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_BUTTONS) # LED driver test MAINSRC = buttons_main.c -CONFIG_EXAMPLES_BUTTONS_PROGNAME ?= buttons$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_BUTTONS_PROGNAME) - -MODULE = CONFIG_EXAMPLES_BUTTONS - include $(APPDIR)/Application.mk diff --git a/examples/buttons/buttons_main.c b/examples/buttons/buttons_main.c index 2fb9ca175..dc0273dc6 100644 --- a/examples/buttons/buttons_main.c +++ b/examples/buttons/buttons_main.c @@ -383,11 +383,7 @@ errout: * buttons_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int buttons_main(int argc, FAR char *argv[]) -#endif { int ret; diff --git a/examples/calib_udelay/Makefile b/examples/calib_udelay/Makefile index 527adc692..18c277749 100644 --- a/examples/calib_udelay/Makefile +++ b/examples/calib_udelay/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # built-in application info -CONFIG_EXAMPLES_CALIB_UDELAY_APPNAME ?= "calib_udelay" -CONFIG_EXAMPLES_CALIB_UDELAY_STACKSIZE ?= 2048 -CONFIG_EXAMPLES_CALIB_UDELAY_PRIORITY ?= 100 -CONFIG_EXAMPLES_CALIB_UDELAY_PROGNAME ?= "calib_udelay" - -APPNAME = $(CONFIG_EXAMPLES_CALIB_UDELAY_APPNAME) -PRIORITY = $(CONFIG_EXAMPLES_CALIB_UDELAY_PRIORITY) -STACKSIZE = $(CONFIG_EXAMPLES_CALIB_UDELAY_STACKSIZE) -PROGNAME = $(CONFIG_EXAMPLES_CALIB_UDELAY_PROGNAME) +PROGNAME = calib_udelay +PRIORITY = 100 +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_CALIB_UDELAY) # Udelay calibration tool MAINSRC = calib_udelay_main.c -MODULE = CONFIG_EXAMPLES_CALIB_UDELAY - include $(APPDIR)/Application.mk diff --git a/examples/calib_udelay/calib_udelay_main.c b/examples/calib_udelay/calib_udelay_main.c index a8405114a..02b5bf103 100644 --- a/examples/calib_udelay/calib_udelay_main.c +++ b/examples/calib_udelay/calib_udelay_main.c @@ -219,11 +219,7 @@ static int linreg(FAR struct measurement_s *point, int num_points, * calib_udelay_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int calib_udelay_main(int argc, char *argv[]) -#endif { const int num_measurements = CONFIG_EXAMPLES_CALIB_UDELAY_NUM_MEASUREMENTS; const int num_results = CONFIG_EXAMPLES_CALIB_UDELAY_NUM_RESULTS; diff --git a/examples/can/Makefile b/examples/can/Makefile index 19f7e30d8..1ad2194dd 100644 --- a/examples/can/Makefile +++ b/examples/can/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = can_main.c -CONFIG_XYZ_PROGNAME ?= can$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # Touchscreen built-in application info -APPNAME = can +PROGNAME = can PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_CAN +MODULE = $(CONFIG_EXAMPLES_CAN) include $(APPDIR)/Application.mk diff --git a/examples/can/can_main.c b/examples/can/can_main.c index fd5f41b77..5b13b9ddb 100644 --- a/examples/can/can_main.c +++ b/examples/can/can_main.c @@ -156,11 +156,7 @@ static void show_usage(FAR const char *progname) * Name: can_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int can_main(int argc, FAR char *argv[]) -#endif { struct canioc_bittiming_s bt; diff --git a/examples/canard/Makefile b/examples/canard/Makefile index 9bb8c8b83..d46a85f54 100644 --- a/examples/canard/Makefile +++ b/examples/canard/Makefile @@ -35,18 +35,12 @@ include $(TOPDIR)/Make.defs -CONFIG_EXAMPLES_LIBCANARD_STACKSIZE ?= 2048 - -CONFIG_XYZ_PROGNAME ?= canard$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -APPNAME = canard +PROGNAME = canard PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = $(CONFIG_EXAMPLES_LIBCANARD_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_LIBCANARD) CFLAGS += -I$(APPDIR)/include/canutils MAINSRC = canard_main.c -MODULE = CONFIG_EXAMPLES_LIBCANARD - include $(APPDIR)/Application.mk diff --git a/examples/canard/canard_main.c b/examples/canard/canard_main.c index 1b3709318..9454de822 100644 --- a/examples/canard/canard_main.c +++ b/examples/canard/canard_main.c @@ -508,11 +508,7 @@ errout_with_dev: * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int canard_main(int argc, FAR char *argv[]) -#endif { int ret; diff --git a/examples/cctype/Makefile b/examples/cctype/Makefile index a872d8493..503977469 100644 --- a/examples/cctype/Makefile +++ b/examples/cctype/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = cctype_main.cxx -CONFIG_EXAMPLES_CCTYPE_PROGNAME ?= cctype$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_CCTYPE_PROGNAME) - # cctype built-in application info -APPNAME = cctype +PROGNAME = cctype PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_CCTYPE +MODULE = $(CONFIG_EXAMPLES_CCTYP) include $(APPDIR)/Application.mk diff --git a/examples/cctype/cctype_main.cxx b/examples/cctype/cctype_main.cxx index 961fadb13..f2fbea533 100644 --- a/examples/cctype/cctype_main.cxx +++ b/examples/cctype/cctype_main.cxx @@ -52,7 +52,7 @@ extern "C" { - int cctype_main(int argc, char *argv[]) + int main(int argc, char *argv[]) { std::printf("\n A B C D E F G H I J K L M N O\n"); for (int i = 0; i < 256; i++) diff --git a/examples/chat/Makefile b/examples/chat/Makefile index 8eb28f6e1..9fa8a4495 100644 --- a/examples/chat/Makefile +++ b/examples/chat/Makefile @@ -37,13 +37,9 @@ include $(TOPDIR)/Make.defs MAINSRC = chat_main.c -CONFIG_XYZ_PROGNAME ?= chat$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -APPNAME = chat +PROGNAME = chat PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_CHAT +MODULE = $(CONFIG_EXAMPLES_CHAT) include $(APPDIR)/Application.mk diff --git a/examples/chat/chat_main.c b/examples/chat/chat_main.c index fe791bd29..9c453d50c 100644 --- a/examples/chat/chat_main.c +++ b/examples/chat/chat_main.c @@ -320,11 +320,7 @@ static int chat_parse_args(FAR struct chat_app* priv) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char** argv) -#else -int chat_main(int argc, FAR char** argv) -#endif { struct chat_app priv; int ret; diff --git a/examples/chrono/Kconfig b/examples/chrono/Kconfig index bc10bbf90..c6bc6eef0 100644 --- a/examples/chrono/Kconfig +++ b/examples/chrono/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_CHRONO config EXAMPLES_CHRONO_PROGNAME string "Program name" default "chrono" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/chrono/Makefile b/examples/chrono/Makefile index c7e8e491e..a9759027b 100644 --- a/examples/chrono/Makefile +++ b/examples/chrono/Makefile @@ -37,21 +37,13 @@ include $(TOPDIR)/Make.defs # Chronometer built-in application info -CONFIG_EXAMPLES_CHRONO_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_CHRONO_STACKSIZE ?= 2048 - -APPNAME = chrono - +PROGNAME = $(CONFIG_EXAMPLES_CHRONO_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_CHRONO_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_CHRONO_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_CHRONO) # Chronometer Example MAINSRC = chrono_main.c -CONFIG_EXAMPLES_CHRONO_PROGNAME ?= chrono$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_CHRONO_PROGNAME) - -MODULE = CONFIG_EXAMPLES_CHRONO - include $(APPDIR)/Application.mk diff --git a/examples/chrono/chrono_main.c b/examples/chrono/chrono_main.c index 89bacf808..14c320259 100644 --- a/examples/chrono/chrono_main.c +++ b/examples/chrono/chrono_main.c @@ -305,11 +305,7 @@ static void slcd_puts(FAR struct lib_outstream_s *outstream, * chrono_main ****************************************************************************/ -#if defined(BUILD_MODULE) int main(int argc, FAR char *argv[]) -#else -int chrono_main(int argc, char *argv[]) -#endif { FAR struct slcd_chrono_s *priv = &g_slcd; FAR char str[8] = "00:00.0"; diff --git a/examples/configdata/Makefile b/examples/configdata/Makefile index 7f8b1800e..ac909c6cf 100644 --- a/examples/configdata/Makefile +++ b/examples/configdata/Makefile @@ -37,15 +37,11 @@ include $(TOPDIR)/Make.defs # CONFIGDATA Unit Test -APPNAME = configdata +PROGNAME = configdata PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_CONFIGDATA) MAINSRC = configdata_main.c -CONFIG_XYZ_PROGNAME ?= configdata$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_CONFIGDATA - include $(APPDIR)/Application.mk diff --git a/examples/configdata/configdata_main.c b/examples/configdata/configdata_main.c index 6695fa042..30ae84ad7 100644 --- a/examples/configdata/configdata_main.c +++ b/examples/configdata/configdata_main.c @@ -622,11 +622,7 @@ static void configdata_cleardeleted(void) * Name: configdata_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int configdata_main(int argc, char *argv[]) -#endif { unsigned int i; int ret; diff --git a/examples/cpuhog/Makefile b/examples/cpuhog/Makefile index a1a4a2003..aae635944 100644 --- a/examples/cpuhog/Makefile +++ b/examples/cpuhog/Makefile @@ -39,18 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = cpuhog_main.c -CONFIG_XYZ_PROGNAME ?= cpuhog$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # Built-in application info -CONFIG_EXAMPLES_CPUHOG_PRIORITY ?= 50 -CONFIG_EXAMPLES_CPUHOG_STACKSIZE ?= 2048 - -APPNAME = cpuhog +PROGNAME = cpuhog PRIORITY = $(CONFIG_EXAMPLES_CPUHOG_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_CPUHOG_STACKSIZE) - -MODULE = CONFIG_EXAMPLES_CPUHOG +MODULE = $(CONFIG_EXAMPLES_CPUHOG) include $(APPDIR)/Application.mk diff --git a/examples/cpuhog/cpuhog_main.c b/examples/cpuhog/cpuhog_main.c index d79fe2d55..cb3bbe988 100644 --- a/examples/cpuhog/cpuhog_main.c +++ b/examples/cpuhog/cpuhog_main.c @@ -96,11 +96,7 @@ static struct state_s * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int cpuhog_main(int argc, char *argv[]) -#endif { int id = -1; char buf[256]; diff --git a/examples/dac/Makefile b/examples/dac/Makefile index 719135d58..24e7996a1 100644 --- a/examples/dac/Makefile +++ b/examples/dac/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = dac_main.c -CONFIG_XYZ_PROGNAME ?= dac$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # application info -APPNAME = dac +PROGNAME = dac PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_DAC +MODULE = $(CONFIG_EXAMPLES_DAC) include $(APPDIR)/Application.mk diff --git a/examples/dac/dac_main.c b/examples/dac/dac_main.c index c4228b98d..ab1cfa6df 100644 --- a/examples/dac/dac_main.c +++ b/examples/dac/dac_main.c @@ -409,7 +409,7 @@ static int parse_args(FAR struct dac_state_s *dac, * Public Functions ****************************************************************************/ -int dac_main(int argc, FAR const char *argv[]) +int main(int argc, FAR const char *argv[]) { int ret; int nargs = 1; diff --git a/examples/dhcpd/Makefile b/examples/dhcpd/Makefile index 2368f7b8d..986bb8409 100644 --- a/examples/dhcpd/Makefile +++ b/examples/dhcpd/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = target.c -CONFIG_XYZ_PROGNAME ?= dhcpd$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # DHCPD built-in application info -APPNAME = dhcpd +PROGNAME = dhcpd PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_DHCPD +MODULE = $(CONFIG_EXAMPLES_DHCPD) include $(APPDIR)/Application.mk diff --git a/examples/dhcpd/target.c b/examples/dhcpd/target.c index 5479ad60e..10f0cc619 100644 --- a/examples/dhcpd/target.c +++ b/examples/dhcpd/target.c @@ -89,11 +89,7 @@ * Name: dhcpd_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int dhcpd_main(int argc, char *argv[]) -#endif { struct in_addr addr; #if defined(CONFIG_EXAMPLES_DHCPD_NOMAC) diff --git a/examples/dhtxx/Kconfig b/examples/dhtxx/Kconfig index 92d03b28b..08e80ffd8 100644 --- a/examples/dhtxx/Kconfig +++ b/examples/dhtxx/Kconfig @@ -4,7 +4,7 @@ # config EXAMPLES_DHTXX - bool "Dhtxx sensor example" + tristate "Dhtxx sensor example" default n ---help--- Enable the dhtxx sensor example @@ -14,7 +14,6 @@ if EXAMPLES_DHTXX config EXAMPLES_DHTXX_PROGNAME string "Program name" default "dhtxx" - depends on BUILD_KERNEL ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/dhtxx/Makefile b/examples/dhtxx/Makefile index a8251c7bc..76094cfc5 100644 --- a/examples/dhtxx/Makefile +++ b/examples/dhtxx/Makefile @@ -37,21 +37,13 @@ include $(TOPDIR)/Make.defs # Dhtxx, World! built-in application info -CONFIG_EXAMPLES_DHTXX_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_DHTXX_STACKSIZE ?= 2048 - -APPNAME = dhtxx - +PROGNAME = $(CONFIG_EXAMPLES_DHTXX_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_DHTXX_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_DHTXX_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_DHTXX) # Dhtxx Example MAINSRC = dhtxx_main.c -CONFIG_EXAMPLES_DHTXX_PROGNAME ?= dhtxx$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_DHTXX_PROGNAME) - -MODULE = CONFIG_EXAMPLES_DHTXX - include $(APPDIR)/Application.mk diff --git a/examples/dhtxx/dhtxx_main.c b/examples/dhtxx/dhtxx_main.c index 1349feaeb..a6304a96c 100644 --- a/examples/dhtxx/dhtxx_main.c +++ b/examples/dhtxx/dhtxx_main.c @@ -52,11 +52,7 @@ * dhtxx_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int dhtxx_main(int argc, char *argv[]) -#endif { struct dhtxx_sensor_data_s data; int fd; diff --git a/examples/discover/Makefile b/examples/discover/Makefile index 6af032219..839693606 100644 --- a/examples/discover/Makefile +++ b/examples/discover/Makefile @@ -40,15 +40,11 @@ include $(TOPDIR)/Make.defs # Discover built-in application info -APPNAME = discover +PROGNAME = discover PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_DISCOVER) MAINSRC = discover_main.c -CONFIG_XYZ_PROGNAME ?= discover$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_DISCOVER - include $(APPDIR)/Application.mk diff --git a/examples/discover/discover_main.c b/examples/discover/discover_main.c index c5d6a52f1..521b8b27e 100644 --- a/examples/discover/discover_main.c +++ b/examples/discover/discover_main.c @@ -84,11 +84,7 @@ * discover_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int discover_main(int argc, char *argv[]) -#endif { /* If this task is excecutated as an NSH built-in function, then the * network has already been configured by NSH's start-up logic. diff --git a/examples/djoystick/Makefile b/examples/djoystick/Makefile index caf160399..c9dd1da1c 100644 --- a/examples/djoystick/Makefile +++ b/examples/djoystick/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = djoy_main.c -CONFIG_DJOY_PROGNAME ?= djoy$(EXEEXT) -PROGNAME = $(CONFIG_DJOY_PROGNAME) - # Buttons built-in application info -APPNAME = djoy +PROGNAME = djoy PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_DJOYSTICK +MODULE = $(CONFIG_EXAMPLES_DJOYSTICK) include $(APPDIR)/Application.mk diff --git a/examples/djoystick/djoy_main.c b/examples/djoystick/djoy_main.c index 92bce8afe..ec9fbf0d0 100644 --- a/examples/djoystick/djoy_main.c +++ b/examples/djoystick/djoy_main.c @@ -140,11 +140,7 @@ static void show_joystick(djoy_buttonset_t oldset, djoy_buttonset_t newset) * djoy_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int djoy_main(int argc, char *argv[]) -#endif { struct djoy_notify_s notify; int fd; diff --git a/examples/dsptest/Kconfig b/examples/dsptest/Kconfig index bbd069838..ddbf04817 100644 --- a/examples/dsptest/Kconfig +++ b/examples/dsptest/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_DSPTEST config EXAMPLES_DSPTEST_PROGNAME string "Program name" default "dsptest" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/dsptest/Makefile b/examples/dsptest/Makefile index 60546f81d..f6aa0d530 100644 --- a/examples/dsptest/Makefile +++ b/examples/dsptest/Makefile @@ -37,12 +37,10 @@ include $(TOPDIR)/Make.defs # dsptest built-in application info -CONFIG_EXAMPLES_DSPTEST_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_DSPTEST_STACKSIZE ?= 2048 - -APPNAME = dsptest +PROGNAME = $(CONFIG_EXAMPLES_DSPTEST_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_DSPTEST_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_DSPTEST_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_DSPTEST) # dsptest example @@ -51,9 +49,4 @@ MAINSRC = dsptest_main.c CSRCS += test_foc.c test_pid.c test_svm.c test_misc.c test_motor.c CSRCS += test_observer.c test_transform.c -CONFIG_EXAMPLES_DSPTEST_PROGNAME ?= dsptest$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_DSPTEST_PROGNAME) - -MODULE = CONFIG_EXAMPLES_DSPTEST - include $(APPDIR)/Application.mk diff --git a/examples/dsptest/dsptest_main.c b/examples/dsptest/dsptest_main.c index bccf49e91..703b911c1 100644 --- a/examples/dsptest/dsptest_main.c +++ b/examples/dsptest/dsptest_main.c @@ -79,11 +79,7 @@ * dsptest_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int dsptest_main(int argc, char *argv[]) -#endif { /* Test misc module */ diff --git a/examples/elf/Kconfig b/examples/elf/Kconfig index 6f320e379..d6957624d 100644 --- a/examples/elf/Kconfig +++ b/examples/elf/Kconfig @@ -4,7 +4,7 @@ # config EXAMPLES_ELF - bool "ELF Loader Example" + tristate "ELF Loader Example" default n select LIBC_EXECFUNCS depends on ELF diff --git a/examples/elf/Makefile b/examples/elf/Makefile index 3771e65c0..d86a12569 100644 --- a/examples/elf/Makefile +++ b/examples/elf/Makefile @@ -40,8 +40,10 @@ include $(TOPDIR)/Make.defs CSRCS = symtab.c MAINSRC = elf_main.c -CONFIG_XYZ_PROGNAME ?= elf$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) +PROGNAME = elf +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_ELF) ROOTDEPPATH := --dep-path tests diff --git a/examples/elf/elf_main.c b/examples/elf/elf_main.c index 9e258f281..dcd0ddc54 100644 --- a/examples/elf/elf_main.c +++ b/examples/elf/elf_main.c @@ -233,11 +233,7 @@ static inline void testheader(FAR const char *progname) * Name: elf_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int elf_main(int argc, char *argv[]) -#endif { #ifdef CONFIG_EXAMPLES_ELF_FSREMOVEABLE struct stat buf; diff --git a/examples/embedlog/Kconfig b/examples/embedlog/Kconfig index 5a8a6a204..3aabe892d 100644 --- a/examples/embedlog/Kconfig +++ b/examples/embedlog/Kconfig @@ -6,7 +6,7 @@ if SYSTEM_EMBEDLOG config EXAMPLES_EMBEDLOG - bool "embedlog example" + tristate "embedlog example" default n select EMBEDLOG_ENABLE_OUT_FILE select EMBEDLOG_ENABLE_OUT_STDERR @@ -26,7 +26,6 @@ if EXAMPLES_EMBEDLOG config EXAMPLES_EMBEDLOG_PROGNAME string "Program name" default "embedlog" - depends on BUILD_KERNEL ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/embedlog/Makefile b/examples/embedlog/Makefile index 182b6298c..c9a41234e 100644 --- a/examples/embedlog/Makefile +++ b/examples/embedlog/Makefile @@ -37,19 +37,14 @@ include $(TOPDIR)/Make.defs # embedlog example built-in application info -CONFIG_EXAMPLES_EMBEDLOG_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_EMBEDLOG_STACKSIZE ?= 2048 - -APPNAME = $(CONFIG_EXAMPLES_EMBEDLOG_PROGNAME) +PROGNAME = $(CONFIG_EXAMPLES_EMBEDLOG_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_EMBEDLOG_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_EMBEDLOG_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_EMBEDLOG) # embedlog Example MAINSRC = embedlog_main.c CFLAGS += -I$(APPDIR)/include/system -CONFIG_EXAMPLES_EMBEDLOG_PROGNAME ?= embedlog$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_EMBEDLOG_PROGNAME) - include $(APPDIR)/Application.mk diff --git a/examples/embedlog/embedlog_main.c b/examples/embedlog/embedlog_main.c index 519815941..1cca649da 100644 --- a/examples/embedlog/embedlog_main.c +++ b/examples/embedlog/embedlog_main.c @@ -317,11 +317,7 @@ static void el_print_file(const char *workdir) * embedlog_main ****************************************************************************/ -#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) -#else -int embedlog_main(int argc, FAR char *argv[]) -#endif { if (argc > 2 || (argc == 2 && strcmp(argv[1], "-h") == 0)) { diff --git a/examples/fb/Kconfig b/examples/fb/Kconfig index 509149f2d..038c41aed 100644 --- a/examples/fb/Kconfig +++ b/examples/fb/Kconfig @@ -28,7 +28,6 @@ config EXAMPLES_FB_DEFAULTFB config EXAMPLES_FB_PROGNAME string "Program name" default "fb" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/fb/Makefile b/examples/fb/Makefile index 67bd9796b..d0e9f7267 100644 --- a/examples/fb/Makefile +++ b/examples/fb/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # FB, World! built-in application info -CONFIG_EXAMPLES_FB_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_FB_STACKSIZE ?= 2048 - -APPNAME = fb +PROGNAME = $(CONFIG_EXAMPLES_FB_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_FB_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_FB_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_FB) # FB, World! Example MAINSRC = fb_main.c -CONFIG_EXAMPLES_FB_PROGNAME ?= fb$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_FB_PROGNAME) - -MODULE = CONFIG_EXAMPLES_FB - include $(APPDIR)/Application.mk diff --git a/examples/fb/fb_main.c b/examples/fb/fb_main.c index 480ede648..4c46ff30d 100644 --- a/examples/fb/fb_main.c +++ b/examples/fb/fb_main.c @@ -287,11 +287,7 @@ static void draw_rect(FAR struct fb_state_s *state, * fb_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int fb_main(int argc, char *argv[]) -#endif { FAR const char *fbdev = g_default_fbdev; struct fb_state_s state; diff --git a/examples/fboverlay/Kconfig b/examples/fboverlay/Kconfig index a0b80b4fa..92e1b9a3d 100644 --- a/examples/fboverlay/Kconfig +++ b/examples/fboverlay/Kconfig @@ -15,7 +15,6 @@ if EXAMPLES_FBOVERLAY config EXAMPLES_FBOVERLAY_PROGNAME string "Program name" default "fboverlay" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/fboverlay/Makefile b/examples/fboverlay/Makefile index acb836836..6a490b02b 100644 --- a/examples/fboverlay/Makefile +++ b/examples/fboverlay/Makefile @@ -37,17 +37,13 @@ include $(TOPDIR)/Make.defs # fboverlay built-in application info -APPNAME = fboverlay +PROGNAME = $(CONFIG_EXAMPLES_FBOVERLAY_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_FBOVERLAY_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_FBOVERLAY_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_FBOVERLAY) # fboverlay files MAINSRC = fboverlay_main.c -CONFIG_EXAMPLES_FBOVERLAY_PROGNAME ?= fboverlay$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_FBOVERLAY_PROGNAME) - -MODULE = CONFIG_EXAMPLES_FBOVERLAY - include $(APPDIR)/Application.mk diff --git a/examples/fboverlay/fboverlay_main.c b/examples/fboverlay/fboverlay_main.c index 16032dc0a..4b65d8b24 100644 --- a/examples/fboverlay/fboverlay_main.c +++ b/examples/fboverlay/fboverlay_main.c @@ -1010,11 +1010,7 @@ static void usage(const char * progname) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int fboverlay_main(int argc, char *argv[]) -#endif { char *fbdevice; diff --git a/examples/flash_test/Kconfig b/examples/flash_test/Kconfig index d981cb218..98cd42057 100644 --- a/examples/flash_test/Kconfig +++ b/examples/flash_test/Kconfig @@ -6,12 +6,11 @@ config EXAMPLES_FLASH_TEST tristate "SMART FLASH block device test" default n - depends on (!BUILD_PROTECTED && !BUILD_KERNEL) && MTD_SMART && NSH_BUILTIN_APPS + depends on (!BUILD_PROTECTED && !BUILD_KERNEL) && MTD_SMART ---help--- This logic performs a SMART flash block device test. This test performs a sector allocate, read, write, free and garbage collection - test on a SMART MTD block device. This test can be built only as an - NSH command + test on a SMART MTD block device. NOTE: This test uses internal OS interfaces and so is not available in the NUTTX kernel build diff --git a/examples/flash_test/Makefile b/examples/flash_test/Makefile index 0cc8b52af..314a74447 100644 --- a/examples/flash_test/Makefile +++ b/examples/flash_test/Makefile @@ -42,15 +42,11 @@ endif # SMART FLASH block device test -APPNAME = flash_test +PROGNAME = flash_test PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_FLASH_TEST) MAINSRC = flash_test.c -CONFIG_XYZ_PROGNAME ?= flash_test$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_FLASH_TEST - include $(APPDIR)/Application.mk diff --git a/examples/flash_test/flash_test.c b/examples/flash_test/flash_test.c index 21c75226d..d042f0e9e 100644 --- a/examples/flash_test/flash_test.c +++ b/examples/flash_test/flash_test.c @@ -61,11 +61,7 @@ * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int flash_test_main(int argc, char *argv[]) -#endif { struct inode* inode; int ret; diff --git a/examples/flowc/Kconfig b/examples/flowc/Kconfig index 0ee422f54..f8f080995 100644 --- a/examples/flowc/Kconfig +++ b/examples/flowc/Kconfig @@ -52,9 +52,8 @@ config EXAMPLES_FLOWC_SENDER1 config EXAMPLES_FLOWC_PROGNAME1 string "Target1 program name" - default "receiver" if !EXAMPLES_FLOWC_SENDER1 - default "sender" if EXAMPLES_FLOWC_SENDER1 - depends on BUILD_LOADABLE + default "flowc" if !EXAMPLES_FLOWC_TARGET2 + default "flowc1" if EXAMPLES_FLOWC_TARGET2 ---help--- This is the name of the Target1 program that will be used when the NSH ELF program is installed. @@ -81,9 +80,7 @@ if EXAMPLES_FLOWC_TARGET2 config EXAMPLES_FLOWC_PROGNAME2 string "Target2 program name" - default "receiver" if !EXAMPLES_FLOWC_RECEIVER2 - default "sender" if EXAMPLES_FLOWC_RECEIVER2 - depends on BUILD_LOADABLE + default "flowc2" ---help--- This is the name of the Target2 program that will be used when the NSH ELF program is installed. diff --git a/examples/flowc/Makefile b/examples/flowc/Makefile index b70e73c20..be22592b8 100644 --- a/examples/flowc/Makefile +++ b/examples/flowc/Makefile @@ -46,14 +46,6 @@ CSRCS += flowc_receiver.c endif MAINSRC += flowc_target1.c -ifeq ($(CONFIG_EXAMPLES_FLOWC_SENDER1),y) -CONFIG_EXAMPLES_FLOWC_PROGNAME1 ?= sender -else -CONFIG_EXAMPLES_FLOWC_PROGNAME1 ?= receiver -endif -CONFIG_EXAMPLES_FLOWC_PRIORITY1 ?= 100 -CONFIG_EXAMPLES_FLOWC_STACKSIZE1 ?= 2048 - PROGNAME = $(CONFIG_EXAMPLES_FLOWC_PROGNAME1) PRIORITY = $(CONFIG_EXAMPLES_FLOWC_PRIORITY1) STACKSIZE = $(CONFIG_EXAMPLES_FLOWC_STACKSIZE1) @@ -69,14 +61,6 @@ CSRCS += flowc_sender.c endif MAINSRC += flowc_target2.c -ifeq ($(CONFIG_EXAMPLES_FLOWC_SENDER1),y) -CONFIG_EXAMPLES_FLOWC_PROGNAME2 ?= receiver -else -CONFIG_EXAMPLES_FLOWC_PROGNAME2 ?= sender -endif -CONFIG_EXAMPLES_FLOWC_PRIORITY2 ?= 100 -CONFIG_EXAMPLES_FLOWC_STACKSIZE2 ?= 2048 - PROGNAME += $(CONFIG_EXAMPLES_FLOWC_PROGNAME2) PRIORITY += $(CONFIG_EXAMPLES_FLOWC_PRIORITY2) STACKSIZE += $(CONFIG_EXAMPLES_FLOWC_STACKSIZE2) @@ -100,39 +84,27 @@ HOST_BIN = sender$(EXEEXT) endif HOST_OBJS = $(HOST_SRCS:.c=.$(HOSTOBJSEXT)) -endif - -ifeq ($(CONFIG_EXAMPLES_FLOWC_TARGET2),y) -APPNAME = flowc1 flowc2 -else -APPNAME = flowc -endif - -ifneq ($(CONFIG_EXAMPLES_FLOWC_TARGET2),y) $(HOST_OBJS): %.$(HOSTOBJSEXT): %.c @echo "CC: $<" $(Q) $(HOSTCC) -c $(HOSTCFLAGS) $< -o $@ -endif config.h: $(TOPDIR)/include/nuttx/config.h @echo "CP: $<" $(Q) cp $< $@ -ifneq ($(CONFIG_EXAMPLES_FLOWC_TARGET2),y) $(HOST_BIN): config.h $(HOST_OBJS) $(Q) $(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@ -endif context:: config.h $(HOST_BIN) clean:: -ifneq ($(CONFIG_EXAMPLES_FLOWC_TARGET2),y) $(call DELFILE, $(HOST_BIN)) $(call DELFILE, *.$(HOSTOBJSEXT)) -endif $(call DELFILE, *.dSYM) $(call DELFILE, config.h) -MODULE = CONFIG_EXAMPLES_FLOWC +endif + +MODULE = $(CONFIG_EXAMPLES_FLOWC) include $(APPDIR)/Application.mk diff --git a/examples/flowc/flowc_target1.c b/examples/flowc/flowc_target1.c index 52f97f62d..9acda1583 100644 --- a/examples/flowc/flowc_target1.c +++ b/examples/flowc/flowc_target1.c @@ -48,13 +48,7 @@ * flowc1_main ****************************************************************************/ -#if defined(BUILD_MODULE) int main(int argc, FAR char *argv[]) -#elif defined(CONFIG_EXAMPLES_FLOWC_TARGET2) -int flowc1_main(int argc, char *argv[]) -#else -int flowc_main(int argc, char *argv[]) -#endif { /* Run the receiver or sender, depending upon how we are configured */ diff --git a/examples/flowc/flowc_target2.c b/examples/flowc/flowc_target2.c index 17372c072..2bf12e67b 100644 --- a/examples/flowc/flowc_target2.c +++ b/examples/flowc/flowc_target2.c @@ -48,11 +48,7 @@ * flowc2_main ****************************************************************************/ -#if defined(BUILD_MODULE) int main(int argc, FAR char *argv[]) -#else -int flowc2_main(int argc, char *argv[]) -#endif { /* Run the receiver or sender, depending upon how target1 was configured */ diff --git a/examples/ft80x/Kconfig b/examples/ft80x/Kconfig index 495a20030..cbc06f502 100644 --- a/examples/ft80x/Kconfig +++ b/examples/ft80x/Kconfig @@ -36,7 +36,6 @@ config EXAMPLES_FT80X_EXCLUDE_BITMAPS config EXAMPLES_FT80X_PROGNAME string "FT80x program name" default "ft80x" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/ft80x/Makefile b/examples/ft80x/Makefile index 76e3ef8dd..82bc27e15 100644 --- a/examples/ft80x/Makefile +++ b/examples/ft80x/Makefile @@ -37,12 +37,10 @@ include $(TOPDIR)/Make.defs # FT80X example built-in application info -CONFIG_EXAMPLES_FT80X_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_FT80X_STACKSIZE ?= 2048 - -APPNAME = ft80x +PROGNAME = $(CONFIG_EXAMPLES_FT80X_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_FT80X_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_FT80X_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_FT80X) # FT80X example @@ -58,9 +56,4 @@ endif MAINSRC = ft80x_main.c -CONFIG_EXAMPLES_FT80X_PROGNAME ?= ft80x$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_FT80X_PROGNAME) - -MODULE = CONFIG_EXAMPLES_FT80X - include $(APPDIR)/Application.mk diff --git a/examples/ft80x/ft80x_main.c b/examples/ft80x/ft80x_main.c index 3be5893ef..6fbfcaffb 100644 --- a/examples/ft80x/ft80x_main.c +++ b/examples/ft80x/ft80x_main.c @@ -288,11 +288,7 @@ static int ft80x_example(int fd, FAR struct ft80x_dlbuffer_s *buffer, * ft80x_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int ft80x_main(int argc, char *argv[]) -#endif { FAR struct ft80x_dlbuffer_s *buffer; int fd; diff --git a/examples/ftpc/Makefile b/examples/ftpc/Makefile index fed44561b..7ef708782 100644 --- a/examples/ftpc/Makefile +++ b/examples/ftpc/Makefile @@ -37,18 +37,12 @@ include $(TOPDIR)/Make.defs # FTPC Client Application -CONFIG_EXAMPLES_FTPC_STACKSIZE ?= 4096 - -APPNAME = ftpc +PROGNAME = ftpc PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = CONFIG_EXAMPLES_FTPC_STACKSIZE +STACKSIZE = $(CONFIG_EXAMPLES_FTPC_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_FTPC) CSRCS = ftpc_cmds.c MAINSRC = ftpc_main.c -CONFIG_XYZ_PROGNAME ?= ftpc$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_FTPC - include $(APPDIR)/Application.mk diff --git a/examples/ftpc/ftpc_main.c b/examples/ftpc/ftpc_main.c index a6b859d61..49358a599 100644 --- a/examples/ftpc/ftpc_main.c +++ b/examples/ftpc/ftpc_main.c @@ -365,11 +365,7 @@ int ftpc_parse(SESSION handle, char *cmdline) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int ftpc_main(int argc, char **argv, char **envp) -#endif { union ftpc_sockaddr_u server; SESSION handle; diff --git a/examples/ftpd/Makefile b/examples/ftpd/Makefile index a72c4dc78..d529a13ae 100644 --- a/examples/ftpd/Makefile +++ b/examples/ftpd/Makefile @@ -37,15 +37,9 @@ include $(TOPDIR)/Make.defs MAINSRC = ftpd_main.c -CONFIG_EXAMPLES_FTPD_STACKSIZE ?= 2048 +PROGNAME = ftpd_start ftpd_stop STACKSIZE = $(CONFIG_EXAMPLES_FTPD_STACKSIZE) PRIORITY = SCHED_PRIORITY_DEFAULT - -CONFIG_XYZ_PROGNAME ?= ftpd$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -APPNAME = ftpd_start ftpd_stop - -MODULE = CONFIG_EXAMPLES_FTPD +MODULE = $(CONFIG_EXAMPLES_FTPD) include $(APPDIR)/Application.mk diff --git a/examples/ftpd/ftpd_main.c b/examples/ftpd/ftpd_main.c index 52c1d9b61..9d6f63130 100644 --- a/examples/ftpd/ftpd_main.c +++ b/examples/ftpd/ftpd_main.c @@ -247,11 +247,7 @@ int ftpd_daemon(int s_argc, char **s_argv) * Name: ftpd_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int ftpd_start_main(int s_argc, char **s_argv) -#endif { /* Check if we have already initialized the network */ @@ -307,7 +303,6 @@ int ftpd_start_main(int s_argc, char **s_argv) * Name: ftpd_stop ****************************************************************************/ -#ifdef CONFIG_NSH_BUILTIN_APPS int ftpd_stop_main(int s_argc, char **s_argv) { if (!g_ftpdglob.initialized || !g_ftpdglob.running) @@ -320,4 +315,3 @@ int ftpd_stop_main(int s_argc, char **s_argv) g_ftpdglob.stop = true; return EXIT_SUCCESS; } -#endif diff --git a/examples/gpio/Kconfig b/examples/gpio/Kconfig index f325e08b6..db97d088d 100644 --- a/examples/gpio/Kconfig +++ b/examples/gpio/Kconfig @@ -15,7 +15,6 @@ if EXAMPLES_GPIO config EXAMPLES_GPIO_PROGNAME string "Program name" default "gpio" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/gpio/Makefile b/examples/gpio/Makefile index 07ce8df0b..572fd5326 100644 --- a/examples/gpio/Makefile +++ b/examples/gpio/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # GPIO, World! built-in application info -CONFIG_EXAMPLES_GPIO_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_GPIO_STACKSIZE ?= 2048 - -APPNAME = gpio +PROGNAME = $(CONFIG_EXAMPLES_GPIO_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_GPIO_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_GPIO_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_GPIO) # GPIO, World! Example MAINSRC = gpio_main.c -CONFIG_EXAMPLES_GPIO_PROGNAME ?= gpio$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_GPIO_PROGNAME) - -MODULE = CONFIG_EXAMPLES_GPIO - include $(APPDIR)/Application.mk diff --git a/examples/gpio/gpio_main.c b/examples/gpio/gpio_main.c index ded5d3989..432c1c14d 100644 --- a/examples/gpio/gpio_main.c +++ b/examples/gpio/gpio_main.c @@ -73,11 +73,7 @@ static void show_usage(FAR const char *progname) * gpio_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int gpio_main(int argc, char *argv[]) -#endif { FAR char *devpath = NULL; enum gpio_pintype_e pintype; diff --git a/examples/gps/Kconfig b/examples/gps/Kconfig index 4b0660a3e..cf004829b 100644 --- a/examples/gps/Kconfig +++ b/examples/gps/Kconfig @@ -15,7 +15,6 @@ if EXAMPLES_GPS config EXAMPLES_GPS_PROGNAME string "Program name" default "gps" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/gps/Makefile b/examples/gps/Makefile index 3766ed63e..bdce47087 100644 --- a/examples/gps/Makefile +++ b/examples/gps/Makefile @@ -37,21 +37,14 @@ include $(TOPDIR)/Make.defs # GPS built-in application info -CONFIG_EXAMPLES_GPS_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_GPS_STACKSIZE ?= 2048 - -APPNAME = gps +PROGNAME = $(CONFIG_EXAMPLES_GPS_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_GPS_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_GPS_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_GPS) # GPS Example MAINSRC = gps_main.c -CONFIG_EXAMPLES_GPS_PROGNAME ?= gps$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_GPS_PROGNAME) - -MODULE = CONFIG_EXAMPLES_GPS - include $(APPDIR)/Application.mk diff --git a/examples/gps/gps_main.c b/examples/gps/gps_main.c index ac4437981..724bc5486 100644 --- a/examples/gps/gps_main.c +++ b/examples/gps/gps_main.c @@ -54,11 +54,7 @@ * gps_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int gps_main(int argc, char *argv[]) -#endif { int fd; int cnt; diff --git a/examples/hello/Kconfig b/examples/hello/Kconfig index 417ee36cd..3ae096096 100644 --- a/examples/hello/Kconfig +++ b/examples/hello/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_HELLO config EXAMPLES_HELLO_PROGNAME string "Program name" default "hello" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/hello/Makefile b/examples/hello/Makefile index 4c072057b..96ba3588e 100644 --- a/examples/hello/Makefile +++ b/examples/hello/Makefile @@ -37,21 +37,13 @@ include $(TOPDIR)/Make.defs # Hello, World! built-in application info -CONFIG_EXAMPLES_HELLO_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_HELLO_STACKSIZE ?= 2048 - -APPNAME = hello - +PROGNAME = $(CONFIG_EXAMPLES_HELLO_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_HELLO_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_HELLO_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_HELLO) # Hello, World! Example MAINSRC = hello_main.c -CONFIG_EXAMPLES_HELLO_PROGNAME ?= hello$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_HELLO_PROGNAME) - -MODULE = CONFIG_EXAMPLES_HELLO - include $(APPDIR)/Application.mk diff --git a/examples/hello/hello_main.c b/examples/hello/hello_main.c index ec61f848f..953597aa2 100644 --- a/examples/hello/hello_main.c +++ b/examples/hello/hello_main.c @@ -48,11 +48,7 @@ * hello_main ****************************************************************************/ -#if defined(BUILD_MODULE) int main(int argc, FAR char *argv[]) -#else -int hello_main(int argc, char *argv[]) -#endif { printf("Hello, World!!\n"); return 0; diff --git a/examples/helloxx/Makefile b/examples/helloxx/Makefile index 2c4e5998e..b5e7a3580 100644 --- a/examples/helloxx/Makefile +++ b/examples/helloxx/Makefile @@ -39,16 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = helloxx_main.cxx -CONFIG_EXAMPLES_HELLOXX_PROGNAME ?= helloxx$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_HELLOXX_PROGNAME) - # helloxx built-in application info -APPNAME = helloxx - +PROGNAME = helloxx PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_HELLOXX +MODULE = $(CONFIG_EXAMPLES_HELLOXX) include $(APPDIR)/Application.mk diff --git a/examples/helloxx/helloxx_main.cxx b/examples/helloxx/helloxx_main.cxx index 4be4bf6b8..a76ee3a10 100644 --- a/examples/helloxx/helloxx_main.cxx +++ b/examples/helloxx/helloxx_main.cxx @@ -127,11 +127,7 @@ static CHelloWorld g_HelloWorld; extern "C" { -#if defined (BUILD_MODULE) int main(int argc, FAR char *argv[]) -#else - int helloxx_main(int argc, char *argv[]) -#endif { // If C++ initialization for static constructors is supported, then do // that first diff --git a/examples/hidkbd/Kconfig b/examples/hidkbd/Kconfig index 7cfabda37..6e2d5a5ed 100644 --- a/examples/hidkbd/Kconfig +++ b/examples/hidkbd/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_HIDKBD config EXAMPLES_HIDKBD_PROGNAME string "Program name" default "hidkbd" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the Nettest program is installed. diff --git a/examples/hidkbd/Makefile b/examples/hidkbd/Makefile index 8f1811ea9..b9c1457db 100644 --- a/examples/hidkbd/Makefile +++ b/examples/hidkbd/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # USB Host HID keyboard Example -CONFIG_EXAMPLES_HIDKBD_DEFPRIO ?= 100 -CONFIG_EXAMPLES_HIDKBD_STACKSIZE ?= 2048 - -APPNAME = hidkbd +PROGNAME = $(CONFIG_EXAMPLES_HIDKBD_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_HIDKBD_DEFPRIO) STACKSIZE = $(CONFIG_EXAMPLES_HIDKBD_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_HIDKBD) # Hello, World! Example MAINSRC = hidkbd_main.c -CONFIG_EXAMPLES_HIDKBD_PROGNAME ?= hidkbd$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_HIDKBD_PROGNAME) - -MODULE = CONFIG_EXAMPLES_HIDKBD - include $(APPDIR)/Application.mk diff --git a/examples/hidkbd/hidkbd_main.c b/examples/hidkbd/hidkbd_main.c index 663a621ef..6685a1001 100644 --- a/examples/hidkbd/hidkbd_main.c +++ b/examples/hidkbd/hidkbd_main.c @@ -196,11 +196,7 @@ static void hidkbd_decode(FAR char *buffer, ssize_t nbytes) * Name: hidkbd_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int hidkbd_main(int argc, char *argv[]) -#endif { char buffer[256]; ssize_t nbytes; diff --git a/examples/i2schar/Makefile b/examples/i2schar/Makefile index 659d934c3..f96163803 100644 --- a/examples/i2schar/Makefile +++ b/examples/i2schar/Makefile @@ -45,15 +45,11 @@ CSRCS += i2schar_receiver.c endif MAINSRC = i2schar_main.c -CONFIG_XYZ_PROGNAME ?= i2schar$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # Touchscreen built-in application info -APPNAME = i2schar +PROGNAME = i2schar PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_I2SCHAR +MODULE = $(CONFIG_EXAMPLES_I2SCHAR) include $(APPDIR)/Application.mk diff --git a/examples/i2schar/i2schar_main.c b/examples/i2schar/i2schar_main.c index e85578a87..b83439f33 100644 --- a/examples/i2schar/i2schar_main.c +++ b/examples/i2schar/i2schar_main.c @@ -236,11 +236,7 @@ static void parse_args(FAR struct i2schar_state_s *i2schar, int argc, FAR char * * Name: i2schar_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int i2schar_main(int argc, char *argv[]) -#endif { pthread_attr_t attr; pthread_addr_t result; diff --git a/examples/i2sloop/Makefile b/examples/i2sloop/Makefile index 4ce1f9f9f..9ef5a4ee7 100644 --- a/examples/i2sloop/Makefile +++ b/examples/i2sloop/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = i2sloop_main.c -CONFIG_XYZ_PROGNAME ?= i2sloop$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # Touchscreen built-in application info -APPNAME = i2sloop +PROGNAME = i2sloop PRIORITY = 140 STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_I2SLOOP +MODULE = $(CONFIG_EXAMPLES_I2SLOOP) include $(APPDIR)/Application.mk diff --git a/examples/i2sloop/i2sloop_main.c b/examples/i2sloop/i2sloop_main.c index b5ab37eef..861d76d8c 100644 --- a/examples/i2sloop/i2sloop_main.c +++ b/examples/i2sloop/i2sloop_main.c @@ -73,11 +73,7 @@ static void _signal_handler(int number) * Name: i2sloop_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int i2sloop_main(int argc, char *argv[]) -#endif { FAR struct ap_buffer_s *apb; struct audio_buf_desc_s desc; diff --git a/examples/igmp/Makefile b/examples/igmp/Makefile index 72f2b3c1b..c3a56ce40 100644 --- a/examples/igmp/Makefile +++ b/examples/igmp/Makefile @@ -35,17 +35,13 @@ include $(TOPDIR)/Make.defs -APPNAME = igmp +PROGNAME = igmp PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 1024 +MODULE = $(CONFIG_EXAMPLES_IGMP) # IGMP Networking Example MAINSRC = igmp.c -CONFIG_XYZ_PROGNAME ?= igmp$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_IGMP - include $(APPDIR)/Application.mk diff --git a/examples/igmp/igmp.c b/examples/igmp/igmp.c index 0d1a3b0bf..1dcc82998 100644 --- a/examples/igmp/igmp.c +++ b/examples/igmp/igmp.c @@ -83,11 +83,7 @@ * igmp_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int igmp_main(int argc, char *argv[]) -#endif { struct in_addr addr; struct in_addr mcast; diff --git a/examples/ina219/Kconfig b/examples/ina219/Kconfig index e316a9977..efa0d1e7d 100644 --- a/examples/ina219/Kconfig +++ b/examples/ina219/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_INA219 config EXAMPLES_INA219_PROGNAME string "Program name" default "ina219" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/ina219/Makefile b/examples/ina219/Makefile index dc5b75fc5..67b142fb8 100644 --- a/examples/ina219/Makefile +++ b/examples/ina219/Makefile @@ -39,20 +39,13 @@ include $(TOPDIR)/Make.defs # Hello, World! built-in application info -CONFIG_EXAMPLES_INA219_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_INA219_STACKSIZE ?= 2048 - -APPNAME = ina219 +PROGNAME = $(CONFIG_EXAMPLES_INA219_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_INA219_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_INA219_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_INA219) # Hello, World! Example MAINSRC = ina219_main.c -CONFIG_EXAMPLES_INA219_PROGNAME ?= ina219$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_INA219_PROGNAME) - -MODULE = CONFIG_EXAMPLES_INA219 - include $(APPDIR)/Application.mk diff --git a/examples/ina219/ina219_main.c b/examples/ina219/ina219_main.c index 0007f82ec..133416477 100644 --- a/examples/ina219/ina219_main.c +++ b/examples/ina219/ina219_main.c @@ -51,11 +51,7 @@ * ina219_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int ina219_main(int argc, char *argv[]) -#endif { struct ina219_s sample; int fd; diff --git a/examples/ina226/Kconfig b/examples/ina226/Kconfig index d954ae545..894ef81e1 100644 --- a/examples/ina226/Kconfig +++ b/examples/ina226/Kconfig @@ -4,7 +4,7 @@ # config EXAMPLES_INA226 - bool "INA226 example" + tristate "INA226 example" default n ---help--- Enable the INA226 example @@ -14,7 +14,6 @@ if EXAMPLES_INA226 config EXAMPLES_INA226_PROGNAME string "Program name" default "ina226" - depends on BUILD_KERNEL ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/ina226/Makefile b/examples/ina226/Makefile index e81bb5576..9ef60d02d 100644 --- a/examples/ina226/Makefile +++ b/examples/ina226/Makefile @@ -39,18 +39,13 @@ include $(TOPDIR)/Make.defs # INA226 built-in application info -CONFIG_EXAMPLES_INA226_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_INA226_STACKSIZE ?= 2048 - -APPNAME = ina226 +PROGNAME = $(CONFIG_EXAMPLES_INA226_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_INA226_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_INA226_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_INA226) # INA226 Example MAINSRC = ina226_main.c -CONFIG_EXAMPLES_INA226_PROGNAME ?= ina226$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_INA226_PROGNAME) - include $(APPDIR)/Application.mk diff --git a/examples/ina226/ina226_main.c b/examples/ina226/ina226_main.c index fa4dbfb34..db43840c5 100644 --- a/examples/ina226/ina226_main.c +++ b/examples/ina226/ina226_main.c @@ -62,11 +62,7 @@ * ina226_main ****************************************************************************/ -#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) -#else -int ina226_main(int argc, char *argv[]) -#endif { struct ina226_s sample; int fd; diff --git a/examples/ini_dumper/Kconfig b/examples/ini_dumper/Kconfig index 3abe1061c..5514ec117 100644 --- a/examples/ini_dumper/Kconfig +++ b/examples/ini_dumper/Kconfig @@ -6,7 +6,7 @@ if FSUTILS_INIH config EXAMPLES_INI_DUMPER - bool "ini dumper example" + tristate "ini dumper example" default n ---help--- Enable ini dumper example program which uses inih @@ -16,7 +16,6 @@ if EXAMPLES_INI_DUMPER config EXAMPLES_INI_DUMPER_PROGNAME string "Program name" default "ini_dumper" - depends on BUILD_KERNEL ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/ini_dumper/Makefile b/examples/ini_dumper/Makefile index ea80aab63..877feff25 100644 --- a/examples/ini_dumper/Makefile +++ b/examples/ini_dumper/Makefile @@ -37,13 +37,10 @@ include $(TOPDIR)/Make.defs # ini_dumper example built-in application info -CONFIG_EXAMPLES_INI_DUMPER_PROGNAME ?= ini_dumper -CONFIG_EXAMPLES_INI_DUMPER_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_INI_DUMPER_STACKSIZE ?= 2048 - -APPNAME = $(CONFIG_EXAMPLES_INI_DUMPER_PROGNAME) +PROGNAME = $(CONFIG_EXAMPLES_INI_DUMPER_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_INI_DUMPER_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_INI_DUMPER_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_INI_DUMPER) # ini_dumper Example @@ -55,7 +52,4 @@ CFLAGS += -I$(APPDIR)/include/fsutils # and that is defined in ini.h CFLAGS += -DINI_HANDLER_LINENO=1 -CONFIG_EXAMPLES_INI_DUMPER_PROGNAME ?= ini_dumper$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_INI_DUMPER_PROGNAME) - include $(APPDIR)/Application.mk diff --git a/examples/ini_dumper/ini_dumper_main.c b/examples/ini_dumper/ini_dumper_main.c index 33254e6a0..db90100b9 100644 --- a/examples/ini_dumper/ini_dumper_main.c +++ b/examples/ini_dumper/ini_dumper_main.c @@ -73,11 +73,7 @@ static int ini_dump(void *user, const char *section, const char *name, * ini_dumper_main() ****************************************************************************/ -#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) -#else -int ini_dumper_main(int argc, FAR char *argv[]) -#endif { int ret; diff --git a/examples/ipforward/Kconfig b/examples/ipforward/Kconfig index f9354258b..4ae0add9f 100644 --- a/examples/ipforward/Kconfig +++ b/examples/ipforward/Kconfig @@ -30,7 +30,6 @@ endchoice # L3 Protocol config EXAMPLES_IPFORWARD_PROGNAME string "IP forwarding rogram name" default "ipfwd" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/ipforward/Makefile b/examples/ipforward/Makefile index 6c814bf69..b816105e6 100644 --- a/examples/ipforward/Makefile +++ b/examples/ipforward/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # Hello, World! built-in application info -CONFIG_EXAMPLES_IPFORWARD_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_IPFORWARD_STACKSIZE ?= 2048 - -APPNAME = ipfwd +PROGNAME = $(CONFIG_EXAMPLES_IPFORWARD_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_IPFORWARD_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_IPFORWARD_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_IPFORWARD) # Hello, World! Example MAINSRC = ipforward.c -CONFIG_EXAMPLES_IPFORWARD_PROGNAME ?= ipfwd$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_IPFORWARD_PROGNAME) - -MODULE = CONFIG_EXAMPLES_IPFORWARD - include $(APPDIR)/Application.mk diff --git a/examples/ipforward/ipforward.c b/examples/ipforward/ipforward.c index 8d55c4b9b..8baf89a77 100644 --- a/examples/ipforward/ipforward.c +++ b/examples/ipforward/ipforward.c @@ -760,11 +760,7 @@ static FAR void *ipfwd_sender(FAR void *arg) * Name: fstest_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int ipfwd_main(int argc, char *argv[]) -#endif { struct ipfwd_state_s fwd; struct ipfwd_arg_s tun0arg; diff --git a/examples/json/Makefile b/examples/json/Makefile index 7adbeda3c..e1abe918e 100644 --- a/examples/json/Makefile +++ b/examples/json/Makefile @@ -37,15 +37,11 @@ include $(TOPDIR)/Make.defs # cJSON built-in application info -APPNAME = json +PROGNAME = json PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_JSON) MAINSRC = json_main.c -CONFIG_XYZ_PROGNAME ?= json$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_JSON - include $(APPDIR)/Application.mk diff --git a/examples/json/json_main.c b/examples/json/json_main.c index 5681cea68..e3b1c9118 100644 --- a/examples/json/json_main.c +++ b/examples/json/json_main.c @@ -237,11 +237,7 @@ static void create_objects(void) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int json_main(int argc, const char *argv[]) -#endif { /* a bunch of json: */ diff --git a/examples/leds/Kconfig b/examples/leds/Kconfig index 63849b46f..62465389d 100644 --- a/examples/leds/Kconfig +++ b/examples/leds/Kconfig @@ -15,7 +15,6 @@ if EXAMPLES_LEDS config EXAMPLES_LEDS_PROGNAME string "Program name" default "leds" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/leds/Makefile b/examples/leds/Makefile index 8578057ed..72ae721d3 100644 --- a/examples/leds/Makefile +++ b/examples/leds/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # LED driver test built-in application info -CONFIG_EXAMPLES_LEDS_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_LEDS_STACKSIZE ?= 2048 - -APPNAME = leds +PROGNAME = $(CONFIG_EXAMPLES_LEDS_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_LEDS_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_LEDS_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_LEDS) # LED driver test MAINSRC = leds_main.c -CONFIG_EXAMPLES_LEDS_PROGNAME ?= leds$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_LEDS_PROGNAME) - -MODULE = CONFIG_EXAMPLES_LEDS - include $(APPDIR)/Application.mk diff --git a/examples/leds/leds_main.c b/examples/leds/leds_main.c index d32308544..138d9b1d1 100644 --- a/examples/leds/leds_main.c +++ b/examples/leds/leds_main.c @@ -191,11 +191,7 @@ errout: * leds_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int leds_main(int argc, FAR char *argv[]) -#endif { int ret; diff --git a/examples/lis3dsh_reader/Kconfig b/examples/lis3dsh_reader/Kconfig index b6132675d..0334f0e81 100644 --- a/examples/lis3dsh_reader/Kconfig +++ b/examples/lis3dsh_reader/Kconfig @@ -16,7 +16,6 @@ if EXAMPLES_LIS3DSH_READER config EXAMPLES_LIS3DSH_READER_PROGNAME string "Program name" default "lis3dsh_reader" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/lis3dsh_reader/Makefile b/examples/lis3dsh_reader/Makefile index 95f2f02d0..8f5a78028 100644 --- a/examples/lis3dsh_reader/Makefile +++ b/examples/lis3dsh_reader/Makefile @@ -35,17 +35,13 @@ include $(TOPDIR)/Make.defs -APPNAME = lis3dsh_reader +PROGNAME = $(CONFIG_EXAMPLES_LIS3DSH_READER_PROGNAME) PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_LIS3DSH_READER) # LIS3DSH reader example MAINSRC = lis3dsh_reader_main.c -CONFIG_FLOX_IMUTEST_PROGNAME ?= lis3dsh_reader$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_LIS3DSH_READER_PROGNAME) - -MODULE = CONFIG_EXAMPLES_LIS3DSH_READER - include $(APPDIR)/Application.mk diff --git a/examples/lis3dsh_reader/lis3dsh_reader_main.c b/examples/lis3dsh_reader/lis3dsh_reader_main.c index a8c302b18..46961d9c8 100644 --- a/examples/lis3dsh_reader/lis3dsh_reader_main.c +++ b/examples/lis3dsh_reader/lis3dsh_reader_main.c @@ -52,11 +52,7 @@ * lis3dsh_reader_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int lis3dsh_reader_main(int argc, FAR char *argv[]) -#endif { FILE *acc; struct acc_data_t diff --git a/examples/lsm330spi_test/Kconfig b/examples/lsm330spi_test/Kconfig index 36206fc6b..258f73630 100644 --- a/examples/lsm330spi_test/Kconfig +++ b/examples/lsm330spi_test/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_LSM330SPI_TEST config EXAMPLES_LSM330SPI_TEST_PROGNAME string "Program name" default "lsm330spi_test" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/lsm330spi_test/Makefile b/examples/lsm330spi_test/Makefile index 488657394..42bcbb562 100644 --- a/examples/lsm330spi_test/Makefile +++ b/examples/lsm330spi_test/Makefile @@ -35,20 +35,13 @@ include $(TOPDIR)/Make.defs -CONFIG_EXAMPLES_LSM330SPI_TEST_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_LSM330SPI_TEST_STACKSIZE ?= 2048 - -APPNAME = lsm330spi_test +PROGNAME = $(CONFIG_EXAMPLES_LSM330SPI_TEST_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_LSM330SPI_TEST_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_LSM330SPI_TEST_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_LSM330SPI_TEST) # LSM330 sensor test Example MAINSRC = lsm330spi_test_main.c -CONFIG_EXAMPLES_LSM330SPI_TEST_PROGNAME ?= lsm330spi_test$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_LSM330SPI_TEST_PROGNAME) - -MODULE = CONFIG_EXAMPLES_LSM330SPI_TEST - include $(APPDIR)/Application.mk diff --git a/examples/lsm330spi_test/lsm330spi_test_main.c b/examples/lsm330spi_test/lsm330spi_test_main.c index 50477759f..f6cf0de22 100644 --- a/examples/lsm330spi_test/lsm330spi_test_main.c +++ b/examples/lsm330spi_test/lsm330spi_test_main.c @@ -623,11 +623,7 @@ quick_exit: * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int lsm330spi_test_main(int argc, FAR char *argv[]) -#endif { int rc = 0; int step_rc = 0; diff --git a/examples/lvgldemo/Makefile b/examples/lvgldemo/Makefile index c55e13738..16cf72396 100644 --- a/examples/lvgldemo/Makefile +++ b/examples/lvgldemo/Makefile @@ -37,12 +37,10 @@ include $(TOPDIR)/Make.defs # LittleVGL demo built-in application info -CONFIG_EXAMPLES_LVGLDEMO_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_LVGLDEMO_STACKSIZE ?= 32768 - -APPNAME = lvgldemo +PROGNAME = lvgldemo PRIORITY = $(CONFIG_EXAMPLES_LVGLDEMO_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_LVGLDEMO_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_LVGLDEMO) # LittleVGL demo Example @@ -60,13 +58,8 @@ endif MAINSRC = lvgldemo.c -CONFIG_EXAMPLES_LVGLDEMO_PROGNAME ?= lvgldemo$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_LVGLDEMO_PROGNAME) - LVGLDIR=$(APPDIR)/graphics/littlevgl/lvgl CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(LVGLDIR)"} CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(LVGLDIR)"} -MODULE = CONFIG_EXAMPLES_LVGLDEMO - include $(APPDIR)/Application.mk diff --git a/examples/lvgldemo/lvgldemo.c b/examples/lvgldemo/lvgldemo.c index 3f818776c..74d179044 100644 --- a/examples/lvgldemo/lvgldemo.c +++ b/examples/lvgldemo/lvgldemo.c @@ -144,11 +144,7 @@ static FAR void *tick_func(void *data) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int lvgldemo_main(int argc, char *argv[]) -#endif { lv_disp_drv_t disp_drv; pthread_t tick_thread; diff --git a/examples/max31855/Kconfig b/examples/max31855/Kconfig index 0b869f3fc..7db092318 100644 --- a/examples/max31855/Kconfig +++ b/examples/max31855/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_MAX31855 config EXAMPLES_MAX31855_PROGNAME string "Program name" default "max31855" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/max31855/Makefile b/examples/max31855/Makefile index 85f00ef12..284388755 100644 --- a/examples/max31855/Makefile +++ b/examples/max31855/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # max31855 built-in application info -CONFIG_EXAMPLES_MAX31855_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_MAX31855_STACKSIZE ?= 2048 - -APPNAME = max31855 +PROGNAME = $(CONFIG_EXAMPLES_MAX31855_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_MAX31855_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_MAX31855_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_MAX31855) # max31855 Example MAINSRC = max31855_main.c -CONFIG_EXAMPLES_MAX31855_PROGNAME ?= max31855$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_MAX31855_PROGNAME) - -MODULE = CONFIG_EXAMPLES_MAX31855 - include $(APPDIR)/Application.mk diff --git a/examples/max31855/max31855_main.c b/examples/max31855/max31855_main.c index 47c281a3f..b82ca9851 100644 --- a/examples/max31855/max31855_main.c +++ b/examples/max31855/max31855_main.c @@ -49,11 +49,7 @@ * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int max31855_main(int argc, char *argv[]) -#endif { /* In this app, only two devices are registered to each SSP channel */ diff --git a/examples/media/Kconfig b/examples/media/Kconfig index 37a163b05..ac52227fd 100644 --- a/examples/media/Kconfig +++ b/examples/media/Kconfig @@ -65,7 +65,6 @@ config EXAMPLES_MEDIA_BLOCKSIZE config EXAMPLES_MEDIA_PROGNAME string "Program name" default "media" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/media/Makefile b/examples/media/Makefile index f14ad7583..1edfdb9a7 100644 --- a/examples/media/Makefile +++ b/examples/media/Makefile @@ -37,17 +37,13 @@ include $(TOPDIR)/Make.defs # Media test application info -APPNAME = media +PROGNAME = $(CONFIG_EXAMPLES_MEDIA_PROGNAME) PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_MEDIA) # Media test application files MAINSRC = media_main.c -CONFIG_EXAMPLES_MEDIA_PROGNAME ?= media$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_MEDIA_PROGNAME) - -MODULE = CONFIG_EXAMPLES_MEDIA - include $(APPDIR)/Application.mk diff --git a/examples/media/media_main.c b/examples/media/media_main.c index 5c35a7969..207451776 100644 --- a/examples/media/media_main.c +++ b/examples/media/media_main.c @@ -124,11 +124,7 @@ static void get_blocksize(int fd, FAR struct media_info_s *info) * media_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int media_main(int argc, FAR char *argv[]) -#endif { FAR uint8_t *txbuffer; FAR uint8_t *rxbuffer; diff --git a/examples/mld/Kconfig b/examples/mld/Kconfig index 2a4e2cfd2..b5e8c13e8 100644 --- a/examples/mld/Kconfig +++ b/examples/mld/Kconfig @@ -15,19 +15,10 @@ if EXAMPLES_MLD config EXAMPLES_MLD_PROGNAME string "Program name" default "mld" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. -config EXAMPLES_MLD_APPNAME - string "NSH builtin name" - default "mld" - depends on CONFIG_NSH_BUILTIN_APPS - ---help--- - This is the name of the application that will be used when running - from the NSH command line - config EXAMPLES_MLD_PRIORITY int "MLD example task priority" default 100 @@ -40,7 +31,6 @@ config EXAMPLES_MLD_INIT bool "Initialize network" default n if NSH_BUILTIN_APPS default y if !NSH_BUILTIN_APPS - depends on !BUILD_LOADABLE ---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/mld/Makefile b/examples/mld/Makefile index 9671e1008..de7f12622 100644 --- a/examples/mld/Makefile +++ b/examples/mld/Makefile @@ -37,19 +37,11 @@ include $(TOPDIR)/Make.defs # MLD Networking Example -CONFIG_EXAMPLES_MLD_PROGNAME ?= mld$(EXEEXT) -CONFIG_EXAMPLES_MLD_APPNAME ?= mld -CONFIG_EXAMPLES_MLD_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_MLD_STACKSIZE ?= 2048 - -APPNAME = $(CONFIG_EXAMPLES_MLD_APPNAME) +PROGNAME = $(CONFIG_EXAMPLES_MLD_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_MLD_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_MLD_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_MLD) MAINSRC = mld_main.c -PROGNAME = $(CONFIG_EXAMPLES_MLD_PROGNAME) - -MODULE = CONFIG_EXAMPLES_MLD - include $(APPDIR)/Application.mk diff --git a/examples/mld/mld_main.c b/examples/mld/mld_main.c index 3a08e6f8c..5918a34e8 100644 --- a/examples/mld/mld_main.c +++ b/examples/mld/mld_main.c @@ -268,11 +268,7 @@ void mld_catfile(FAR const char *filepath, FAR char **iobuffer) * mld_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int mld_main(int argc, char *argv[]) -#endif { FAR char *iobuffer = NULL; struct sockaddr_in6 host; diff --git a/examples/mlx90614/Kconfig b/examples/mlx90614/Kconfig index ce2226f21..5ab94a07c 100644 --- a/examples/mlx90614/Kconfig +++ b/examples/mlx90614/Kconfig @@ -15,7 +15,6 @@ if EXAMPLES_MLX90614 config EXAMPLES_MLX90614_PROGNAME string "Program name" default "MLX90614 Test Example" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/mlx90614/Makefile b/examples/mlx90614/Makefile index a2750d7d2..4e25ad105 100644 --- a/examples/mlx90614/Makefile +++ b/examples/mlx90614/Makefile @@ -37,17 +37,13 @@ include $(TOPDIR)/Make.defs # MLX90614 built-in application info -APPNAME = mlx90614 +PROGNAME = $(CONFIG_EXAMPLES_MLX90614_PROGNAME) PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_MLX90614) # MLX90614 Test MAINSRC = mlx90614_main.c -CONFIG_EXAMPLES_MLX90614_PROGNAME ?= mlx90614$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_MLX90614_PROGNAME) - -MODULE = CONFIG_EXAMPLES_MLX90614 - include $(APPDIR)/Application.mk diff --git a/examples/mlx90614/mlx90614_main.c b/examples/mlx90614/mlx90614_main.c index 249950408..023c1e604 100644 --- a/examples/mlx90614/mlx90614_main.c +++ b/examples/mlx90614/mlx90614_main.c @@ -79,11 +79,7 @@ * mlx90614_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int mlx90614_main(int argc, char *argv[]) -#endif { FAR struct mlx90614_temp_s temp; float ta; diff --git a/examples/mm/Makefile b/examples/mm/Makefile index d42c07a46..bee79d401 100644 --- a/examples/mm/Makefile +++ b/examples/mm/Makefile @@ -37,18 +37,11 @@ include $(TOPDIR)/Make.defs # Memory Management Test -CONFIG_EXAMPLES_MM_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_MM_STACKSIZE ?= 2048 - -APPNAME = mm -PRIORITY = $(CONFIG_EXAMPLES_MM_PRIORITY) -STACKSIZE = $(CONFIG_EXAMPLES_MM_STACKSIZE) +PROGNAME = mm +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_MM) MAINSRC = mm_main.c -CONFIG_EXAMPLES_MM_PROGNAME ?= mm$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_MM_PROGNAME) - -MODULE = CONFIG_EXAMPLES_MM - include $(APPDIR)/Application.mk diff --git a/examples/mm/mm_main.c b/examples/mm/mm_main.c index fd78522fe..2f179e0b5 100644 --- a/examples/mm/mm_main.c +++ b/examples/mm/mm_main.c @@ -287,11 +287,7 @@ static void do_frees(void **mem, const int *size, const int *seq, int n) * Name: mm_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int mm_main(int argc, char *argv[]) -#endif { mm_showmallinfo(); diff --git a/examples/modbus/Kconfig b/examples/modbus/Kconfig index eeeef00df..6716fa370 100644 --- a/examples/modbus/Kconfig +++ b/examples/modbus/Kconfig @@ -4,7 +4,7 @@ # config EXAMPLES_MODBUS - bool "FreeModBus example" + tristate "FreeModBus example" default n ---help--- Enable the FreeModBus example diff --git a/examples/modbus/Makefile b/examples/modbus/Makefile index 72d759919..b234d69d8 100644 --- a/examples/modbus/Makefile +++ b/examples/modbus/Makefile @@ -37,15 +37,13 @@ include $(TOPDIR)/Make.defs # FreeModBus demo built-in application info -APPNAME = modbus +PROGNAME = modbus PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_MODBUS) # FreeModBus demo MAINSRC = modbus_main.c -CONFIG_XYZ_PROGNAME ?= modbus$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - include $(APPDIR)/Application.mk diff --git a/examples/modbus/modbus_main.c b/examples/modbus/modbus_main.c index a3f1df8a1..0d91902d0 100644 --- a/examples/modbus/modbus_main.c +++ b/examples/modbus/modbus_main.c @@ -359,11 +359,7 @@ static void modbus_showusage(FAR const char *progname, int exitcode) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int modbus_main(int argc, char *argv[]) -#endif { int option; int ret; diff --git a/examples/modbusmaster/Kconfig b/examples/modbusmaster/Kconfig index f02538291..f875270af 100644 --- a/examples/modbusmaster/Kconfig +++ b/examples/modbusmaster/Kconfig @@ -4,7 +4,7 @@ # config EXAMPLES_MODBUSMASTER - bool "Modbus Master example" + tristate "Modbus Master example" default n ---help--- Enable the Modbus Master example @@ -14,7 +14,6 @@ if EXAMPLES_MODBUSMASTER config EXAMPLES_MODBUSMASTER_PROGNAME string "Program name" default "modbusmaster" - depends on BUILD_KERNEL ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/modbusmaster/Makefile b/examples/modbusmaster/Makefile index b7f85670f..d9d7df688 100644 --- a/examples/modbusmaster/Makefile +++ b/examples/modbusmaster/Makefile @@ -37,18 +37,13 @@ include $(TOPDIR)/Make.defs # Modbus Master built-in application info -CONFIG_EXAMPLES_MODBUSMASTER_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_MODBUSMASTER_STACKSIZE ?= 2048 - -APPNAME = mbmaster +PROGNAME = $(CONFIG_EXAMPLES_MODBUSMASTER_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_MODBUSMASTER_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_MODBUSMASTER_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_MODBUSMASTER) # Modbus Master Example MAINSRC = mbmaster_main.c -CONFIG_EXAMPLES_MODBUSMASTER_PROGNAME ?= mbmaster$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_MODBUSMASTER_PROGNAME) - include $(APPDIR)/Application.mk diff --git a/examples/modbusmaster/mbmaster_main.c b/examples/modbusmaster/mbmaster_main.c index 0f76031b0..2b7ded17c 100644 --- a/examples/modbusmaster/mbmaster_main.c +++ b/examples/modbusmaster/mbmaster_main.c @@ -261,11 +261,7 @@ eMBErrorCode eMBMasterRegHoldingCB(FAR uint8_t *buffer, * Name: main/mbmaster_main ****************************************************************************/ -#ifdef CONFIG_BUILD_KERNEL int main(int argc, FAR char *argv[]) -#else -int mbmaster_main(int argc, FAR char *argv[]) -#endif { eMBMasterReqErrCode mberr; int reqcounter = 0; diff --git a/examples/module/Makefile b/examples/module/Makefile index b96215310..9cd834c26 100644 --- a/examples/module/Makefile +++ b/examples/module/Makefile @@ -37,9 +37,10 @@ include $(TOPDIR)/Make.defs # Module example built-in application info -APPNAME = module +PROGNAME = module PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_MODULE) # Module Example @@ -49,9 +50,6 @@ ifeq ($(CONFIG_BUILD_FLAT),y) CSRCS += mod_symtab.c endif -CONFIG_XYZ_PROGNAME ?= module$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - VPATH += drivers ROOTDEPPATH += --dep-path drivers @@ -63,6 +61,4 @@ context:: clean:: @$(MAKE) -C drivers TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) clean -MODULE = CONFIG_EXAMPLES_MODULE - include $(APPDIR)/Application.mk diff --git a/examples/module/module_main.c b/examples/module/module_main.c index 2d198b925..d5213106d 100644 --- a/examples/module/module_main.c +++ b/examples/module/module_main.c @@ -143,11 +143,7 @@ extern const int g_mod_nexports; * Name: module_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int module_main(int argc, char *argv[]) -#endif { #ifdef CONFIG_BUILD_FLAT struct boardioc_symtab_s symdesc; diff --git a/examples/mount/Makefile b/examples/mount/Makefile index 2de06fe45..3bd7c4f98 100644 --- a/examples/mount/Makefile +++ b/examples/mount/Makefile @@ -37,14 +37,12 @@ include $(TOPDIR)/Make.defs # mount() test -APPNAME = mount +PROGNAME = mount +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_MOUNT) CSRCS = ramdisk.c MAINSRC = mount_main.c -CONFIG_XYZ_PROGNAME ?= mount$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_MOUNT - include $(APPDIR)/Application.mk diff --git a/examples/mount/mount_main.c b/examples/mount/mount_main.c index 4dee45b25..5184c6508 100644 --- a/examples/mount/mount_main.c +++ b/examples/mount/mount_main.c @@ -596,11 +596,7 @@ static void succeed_stat(const char *path) * Name: mount_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int mount_main(int argc, char *argv[]) -#endif { int ret; diff --git a/examples/mtdpart/Makefile b/examples/mtdpart/Makefile index c302bf209..0b743cd71 100644 --- a/examples/mtdpart/Makefile +++ b/examples/mtdpart/Makefile @@ -37,13 +37,11 @@ include $(TOPDIR)/Make.defs # MTD Partition Example -APPNAME = mtdpart +PROGNAME = mtdpart +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_MTDPART) MAINSRC = mtdpart_main.c -CONFIG_XYZ_PROGNAME ?= mtdpart$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_MTDPART - include $(APPDIR)/Application.mk diff --git a/examples/mtdpart/mtdpart_main.c b/examples/mtdpart/mtdpart_main.c index 912a2d7bf..b4075d1da 100644 --- a/examples/mtdpart/mtdpart_main.c +++ b/examples/mtdpart/mtdpart_main.c @@ -136,11 +136,7 @@ extern FAR struct mtd_dev_s *mtdpart_archinitialize(void); * Name: mtdpart_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int mtdpart_main(int argc, char *argv[]) -#endif { FAR struct mtd_dev_s *master; FAR struct mtd_dev_s *part[CONFIG_EXAMPLES_MTDPART_NPARTITIONS + 1]; diff --git a/examples/mtdrwb/Kconfig b/examples/mtdrwb/Kconfig index 952676635..1ce5949b5 100644 --- a/examples/mtdrwb/Kconfig +++ b/examples/mtdrwb/Kconfig @@ -18,7 +18,6 @@ if EXAMPLES_MTDRWB config EXAMPLES_MTDRWB_PROGNAME string "Program name" default "mtdrwb" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/mtdrwb/Makefile b/examples/mtdrwb/Makefile index e1fa4447c..7f9266506 100644 --- a/examples/mtdrwb/Makefile +++ b/examples/mtdrwb/Makefile @@ -37,13 +37,11 @@ include $(TOPDIR)/Make.defs # MTD R/W buffer test Example -APPNAME = mtdrwb +PROGNAME = $(CONFIG_EXAMPLES_MTDRWB_PROGNAME) +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_MTDRWB) MAINSRC = mtdrwb_main.c -CONFIG_EXAMPLES_MTDRWB_PROGNAME ?= mtdrwb$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_MTDRWB - include $(APPDIR)/Application.mk diff --git a/examples/mtdrwb/mtdrwb_main.c b/examples/mtdrwb/mtdrwb_main.c index 9da60afe8..f967a2aad 100644 --- a/examples/mtdrwb/mtdrwb_main.c +++ b/examples/mtdrwb/mtdrwb_main.c @@ -132,11 +132,7 @@ extern FAR struct mtd_dev_s *mtdrwb_archinitialize(void); * Name: mtdrwb_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int mtdrwb_main(int argc, char *argv[]) -#endif { FAR struct mtd_dev_s *mtdraw; FAR struct mtd_dev_s *mtdrwb; diff --git a/examples/netloop/Kconfig b/examples/netloop/Kconfig index e7c94fc28..bbb6ae615 100644 --- a/examples/netloop/Kconfig +++ b/examples/netloop/Kconfig @@ -11,7 +11,6 @@ config EXAMPLES_NETLOOP Enable the local loopback example if EXAMPLES_NETLOOP -if NSH_BUILTIN_APPS config EXAMPLES_NETLOOP_KEEPALIVE bool "Enable TCP KeepAlive test" @@ -26,5 +25,4 @@ config EXAMPLES_NETLOOP_PRIORITY int "Loopback test task priority" default 100 -endif # NSH_BUILTIN_APPS endif # EXAMPLES_NETLOOP diff --git a/examples/netloop/Makefile b/examples/netloop/Makefile index 322a61b7b..70c191b3d 100644 --- a/examples/netloop/Makefile +++ b/examples/netloop/Makefile @@ -40,16 +40,9 @@ include $(TOPDIR)/Make.defs CSRCS = lo_listener.c MAINSRC = lo_main.c -CONFIG_EXAMPLES_NETLOOP_STACKSIZE ?= 2048 -CONFIG_EXAMPLES_NETLOOP_PRIORITY ?= 100 - -APPNAME = netloop +PROGNAME = netloop PRIORITY = $(CONFIG_EXAMPLES_NETLOOP_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_NETLOOP_STACKSIZE) - -CONFIG_XYZ_PROGNAME ?= netloop$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_NETLOOP +MODULE = $(CONFIG_EXAMPLES_NETLOOP) include $(APPDIR)/Application.mk diff --git a/examples/netloop/lo_main.c b/examples/netloop/lo_main.c index dfc0d6e82..1c25c365c 100644 --- a/examples/netloop/lo_main.c +++ b/examples/netloop/lo_main.c @@ -249,11 +249,7 @@ errout_with_socket: * Name: netloop_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int netloop_main(int argc, char *argv[]) -#endif { pthread_t tid; int ret; diff --git a/examples/netpkt/Makefile b/examples/netpkt/Makefile index 1b8b06b37..0679528f0 100644 --- a/examples/netpkt/Makefile +++ b/examples/netpkt/Makefile @@ -37,17 +37,13 @@ include $(TOPDIR)/Make.defs # Network packet socket example -APPNAME = netpkt +PROGNAME = netpkt PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_NETPKT) # MDIO tool MAINSRC = netpkt_main.c -CONFIG_XYZ_PROGNAME ?= netpkt$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_NETPKT - include $(APPDIR)/Application.mk diff --git a/examples/netpkt/netpkt_main.c b/examples/netpkt/netpkt_main.c index f0dc2ea7a..821925d99 100644 --- a/examples/netpkt/netpkt_main.c +++ b/examples/netpkt/netpkt_main.c @@ -129,11 +129,7 @@ static void netpkt_usage(void) * Name: netpkt_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int netpkt_main(int argc, char **argv) -#endif { int sd; int i; diff --git a/examples/nettest/Kconfig b/examples/nettest/Kconfig index 2ef5e81ac..d7620d905 100644 --- a/examples/nettest/Kconfig +++ b/examples/nettest/Kconfig @@ -23,8 +23,8 @@ config EXAMPLES_NETTEST_SENDSIZE config EXAMPLES_NETTEST_PROGNAME1 string "Target1 program name" - default "nettest" - depends on BUILD_LOADABLE + default "nettest" if !EXAMPLES_NETTEST_TARGET2 + default "nettest1" if EXAMPLES_NETTEST_TARGET2 ---help--- This is the name of the program that will be used when the Nettest program is installed. @@ -49,7 +49,7 @@ config EXAMPLES_NETTEST_LOOPBACK if !EXAMPLES_NETTEST_LOOPBACK -config EXAMPLES_NETTEST_SERVER1 +config EXAMPLES_NETTEST_SERVER bool "Target1 is server" default n depends on !EXAMPLES_NETTEST_LOOPBACK @@ -71,9 +71,7 @@ if EXAMPLES_NETTEST_TARGET2 config EXAMPLES_NETTEST_PROGNAME2 string "Target2 program name" - default "tcpserver" if !EXAMPLES_NETTEST_SERVER2 - default "tcpclient" if EXAMPLES_NETTEST_SERVER2 - depends on BUILD_LOADABLE + default "nettest2" ---help--- This is the name of the Target2 program that will be used when the NSH ELF program is installed. diff --git a/examples/nettest/Makefile b/examples/nettest/Makefile index c0462dfac..ecccaa447 100644 --- a/examples/nettest/Makefile +++ b/examples/nettest/Makefile @@ -55,14 +55,6 @@ MAINSRC = nettest_target1.c # Target 1 Application Info -ifeq ($(CONFIG_EXAMPLES_NETTEST_SERVER1),y) -CONFIG_EXAMPLES_NETTEST_PROGNAME1 ?= tcpserver -else -CONFIG_EXAMPLES_NETTEST_PROGNAME1 ?= tcpclient -endif -CONFIG_EXAMPLES_NETTEST_PRIORITY1 ?= 100 -CONFIG_EXAMPLES_NETTEST_STACKSIZE1 ?= 2048 - PROGNAME = $(CONFIG_EXAMPLES_NETTEST_PROGNAME1) PRIORITY = $(CONFIG_EXAMPLES_NETTEST_PRIORITY1) STACKSIZE = $(CONFIG_EXAMPLES_NETTEST_STACKSIZE1) @@ -71,7 +63,7 @@ STACKSIZE = $(CONFIG_EXAMPLES_NETTEST_STACKSIZE1) ifeq ($(CONFIG_EXAMPLES_NETTEST_TARGET2),y) -ifeq ($(CONFIG_EXAMPLES_NETTEST_SERVER1),y) +ifeq ($(CONFIG_EXAMPLES_NETTEST_SERVER),y) CSRCS += nettest_client.c else CSRCS += nettest_server.c @@ -80,26 +72,12 @@ MAINSRC += nettest_target2.c # Target 2 Application Info -ifeq ($(CONFIG_EXAMPLES_NETTEST_SERVER1),y) -CONFIG_EXAMPLES_NETTEST_PROGNAME2 ?= tcpclient -else -CONFIG_EXAMPLES_NETTEST_PROGNAME2 ?= tcpserver -endif -CONFIG_EXAMPLES_NETTEST_PRIORITY2 ?= 100 -CONFIG_EXAMPLES_NETTEST_STACKSIZE2 ?= 2048 - PROGNAME += $(CONFIG_EXAMPLES_NETTEST_PROGNAME2) PRIORITY += $(CONFIG_EXAMPLES_NETTEST_PRIORITY2) STACKSIZE += $(CONFIG_EXAMPLES_NETTEST_STACKSIZE2) endif -ifeq ($(CONFIG_EXAMPLES_NETTEST_TARGET2),y) -APPNAME = nettest1 nettest2 -else -APPNAME = nettest -endif - # Host ifneq ($(CONFIG_EXAMPLES_NETTEST_TARGET2),y) @@ -125,47 +103,31 @@ ifneq ($(CONFIG_EXAMPLES_NETTEST_LOOPBACK),y) HOSTOBJEXT ?= hobj HOST_OBJS = $(HOST_SRCS:.c=.$(HOSTOBJEXT)) -endif -endif - # Common build -ifneq ($(CONFIG_EXAMPLES_NETTEST_TARGET2),y) -ifneq ($(CONFIG_EXAMPLES_NETTEST_LOOPBACK),y) - $(HOST_OBJS): %.$(HOSTOBJEXT): %.c @echo "CC: $<" $(Q) $(HOSTCC) -c $(HOSTCFLAGS) $< -o $@ -endif -endif - config.h: $(TOPDIR)/include/nuttx/config.h @echo "CP: $<" $(Q) cp $< $@ -ifneq ($(CONFIG_EXAMPLES_NETTEST_TARGET2),y) -ifneq ($(CONFIG_EXAMPLES_NETTEST_LOOPBACK),y) - $(HOST_BIN): config.h $(HOST_OBJS) @echo "LD: $@" $(Q) $(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@ -endif -endif - context:: config.h $(HOST_BIN) clean:: -ifneq ($(CONFIG_EXAMPLES_NETTEST_TARGET2),y) -ifneq ($(CONFIG_EXAMPLES_NETTEST_LOOPBACK),y) $(call DELFILE, *.$(HOSTOBJEXT)) $(call DELFILE, $(HOST_BIN)) -endif -endif $(call DELFILE, *.dSYM) $(call DELFILE, config.h) -MODULE = CONFIG_EXAMPLES_NETTEST +endif +endif + +MODULE = $(CONFIG_EXAMPLES_NETTEST) include $(APPDIR)/Application.mk diff --git a/examples/nettest/nettest_target1.c b/examples/nettest/nettest_target1.c index 9eaf3ea1a..795dc831d 100644 --- a/examples/nettest/nettest_target1.c +++ b/examples/nettest/nettest_target1.c @@ -69,13 +69,7 @@ static int server_child(int argc, char *argv[]) * nettest_main ****************************************************************************/ -#if defined(BUILD_MODULE) int main(int argc, FAR char *argv[]) -#elif defined(CONFIG_EXAMPLES_NETTEST_TARGET2) -int nettest1_main(int argc, char *argv[]) -#else -int nettest_main(int argc, char *argv[]) -#endif { #ifdef CONFIG_EXAMPLES_NETTEST_LOOPBACK pid_t child; diff --git a/examples/nettest/nettest_target2.c b/examples/nettest/nettest_target2.c index 2e9e9bdb1..40468b787 100644 --- a/examples/nettest/nettest_target2.c +++ b/examples/nettest/nettest_target2.c @@ -45,11 +45,7 @@ * nettest_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int nettest2_main(int argc, char *argv[]) -#endif { /* Parse any command line options */ diff --git a/examples/nrf24l01_term/Makefile b/examples/nrf24l01_term/Makefile index dc4aaf9d5..a71a5b778 100644 --- a/examples/nrf24l01_term/Makefile +++ b/examples/nrf24l01_term/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = nrf24l01_term.c -CONFIG_XYZ_PROGNAME ?= nrf24l01_term$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # built-in application info -APPNAME = nrf24l01_term +PROGNAME = nrf24l01_term PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_NRF24L01TERM +MODULE = $(CONFIG_EXAMPLES_NRF24L01TERM) include $(APPDIR)/Application.mk diff --git a/examples/nrf24l01_term/nrf24l01_term.c b/examples/nrf24l01_term/nrf24l01_term.c index 3b49a5598..8a8d96547 100644 --- a/examples/nrf24l01_term/nrf24l01_term.c +++ b/examples/nrf24l01_term/nrf24l01_term.c @@ -256,11 +256,7 @@ void usage(void) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int nrf24l01_term_main(int argc, char *argv[]) -#endif { int ret; bool quit = false; diff --git a/examples/null/Makefile b/examples/null/Makefile index da4d2ff63..628393d9f 100644 --- a/examples/null/Makefile +++ b/examples/null/Makefile @@ -37,17 +37,13 @@ include $(TOPDIR)/Make.defs # The NULL example built-in application info -APPNAME = null +PROGNAME = null PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_NULL) # The smallest thing you can build -- the NULL example. MAINSRC = null_main.c -CONFIG_XYZ_PROGNAME ?= null$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_NULL - include $(APPDIR)/Application.mk diff --git a/examples/null/null_main.c b/examples/null/null_main.c index 426418505..83e3d741b 100644 --- a/examples/null/null_main.c +++ b/examples/null/null_main.c @@ -63,11 +63,7 @@ * Name: null_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, char *argv[]) -#else -int null_main(int argc, char *argv[]) -#endif { return 0; } diff --git a/examples/nunchuck/Makefile b/examples/nunchuck/Makefile index 099941531..21ebad4e3 100644 --- a/examples/nunchuck/Makefile +++ b/examples/nunchuck/Makefile @@ -39,16 +39,12 @@ include $(TOPDIR)/Make.defs MAINSRC = nunchuck_main.c -CONFIG_NUNCHUCK_PROGNAME ?= nunchuck$(EXEEXT) -PROGNAME = $(CONFIG_NUNCHUCK_PROGNAME) - # Nunchuck application info -APPNAME = nunchuck +PROGNAME = nunchuck PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_NUNCHUCK +MODULE = $(CONFIG_EXAMPLES_NUNCHUCK) include $(APPDIR)/Application.mk diff --git a/examples/nunchuck/nunchuck_main.c b/examples/nunchuck/nunchuck_main.c index 1fe21cd4b..0f81f4aca 100644 --- a/examples/nunchuck/nunchuck_main.c +++ b/examples/nunchuck/nunchuck_main.c @@ -379,11 +379,7 @@ static int nunchuck_calibrate(int fd) * nunchuck_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int nunchuck_main(int argc, char *argv[]) -#endif { int fd; int tmp; diff --git a/examples/nx/Makefile b/examples/nx/Makefile index c8e9fe378..7ce59b05c 100644 --- a/examples/nx/Makefile +++ b/examples/nx/Makefile @@ -40,15 +40,11 @@ include $(TOPDIR)/Make.defs CSRCS = nx_events.c nx_kbdin.c MAINSRC = nx_main.c -CONFIG_XYZ_PROGNAME ?= nx$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # NX built-in application info -APPNAME = nx +PROGNAME = nx PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_NX +MODULE = $(CONFIG_EXAMPLES_NX) include $(APPDIR)/Application.mk diff --git a/examples/nx/nx_main.c b/examples/nx/nx_main.c index c1a38e04f..b619fe5e9 100644 --- a/examples/nx/nx_main.c +++ b/examples/nx/nx_main.c @@ -517,11 +517,7 @@ static int nxeg_initialize(void) * Name: nx_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int nx_main(int argc, char *argv[]) -#endif { NXEGWINDOW hwnd1; NXEGWINDOW hwnd2; diff --git a/examples/nxdemo/Makefile b/examples/nxdemo/Makefile index 50e2559d0..23636d142 100644 --- a/examples/nxdemo/Makefile +++ b/examples/nxdemo/Makefile @@ -40,18 +40,11 @@ include $(TOPDIR)/Make.defs CSRCS = nxdemo_bkgd.c nxdemo_listener.c MAINSRC = nxdemo_main.c -CONFIG_EXAMPLES_NXDEMO_PROGNAME ?= nxdemo$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_NXDEMO_PROGNAME) - # NXDEMO built-in application info -CONFIG_EXAMPLES_NXDEMO_STACKSIZE ?= 2048 -CONFIG_EXAMPLES_NXDEMO_PRIORITY ?= 100 - -APPNAME = nxdemo -PRIORITY = $(CONFIG_EXAMPLES_NXDEMO_PRIORITY) -STACKSIZE = $(CONFIG_EXAMPLES_NXDEMO_STACKSIZE) - -MODULE = CONFIG_EXAMPLES_NXDEMO +PROGNAME = nxdemo +PRIORITY = 100 +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_NXDEMO) include $(APPDIR)/Application.mk diff --git a/examples/nxdemo/nxdemo_main.c b/examples/nxdemo/nxdemo_main.c index d3f130ef9..56c76b5d9 100644 --- a/examples/nxdemo/nxdemo_main.c +++ b/examples/nxdemo/nxdemo_main.c @@ -208,11 +208,7 @@ static inline int nxdemo_initialize(void) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int nxdemo_main(int argc, char *argv[]) -#endif { int ret; diff --git a/examples/nxflat/Kconfig b/examples/nxflat/Kconfig index d4fab63c5..de59ba940 100644 --- a/examples/nxflat/Kconfig +++ b/examples/nxflat/Kconfig @@ -4,7 +4,7 @@ # config EXAMPLES_NXFLAT - bool "NXFLAT example" + tristate "NXFLAT example" default n select LIBC_EXECFUNCS depends on NXFLAT diff --git a/examples/nxflat/Makefile b/examples/nxflat/Makefile index 5dda8be98..6162c6cbc 100644 --- a/examples/nxflat/Makefile +++ b/examples/nxflat/Makefile @@ -39,8 +39,10 @@ include $(TOPDIR)/Make.defs MAINSRC = nxflat_main.c -CONFIG_XYZ_PROGNAME ?= nxflat$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) +PROGNAME = nxflat +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_NXFLAT) context:: @$(MAKE) -C tests TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) diff --git a/examples/nxflat/nxflat_main.c b/examples/nxflat/nxflat_main.c index 8cbc56ebf..a2d965a67 100644 --- a/examples/nxflat/nxflat_main.c +++ b/examples/nxflat/nxflat_main.c @@ -152,11 +152,7 @@ static inline void testheader(FAR const char *progname) * Name: nxflat_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int nxflat_main(int argc, char *argv[]) -#endif { FAR char *args[1]; int ret; diff --git a/examples/nxhello/Kconfig b/examples/nxhello/Kconfig index 26b608226..d9140e72a 100644 --- a/examples/nxhello/Kconfig +++ b/examples/nxhello/Kconfig @@ -16,7 +16,6 @@ if EXAMPLES_NXHELLO config EXAMPLES_NXHELLO_PROGNAME string "NX Hello Program name" default "nxhello" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/nxhello/Makefile b/examples/nxhello/Makefile index f8fc55699..8a694564c 100644 --- a/examples/nxhello/Makefile +++ b/examples/nxhello/Makefile @@ -40,18 +40,11 @@ include $(TOPDIR)/Make.defs CSRCS = nxhello_bkgd.c nxhello_listener.c MAINSRC = nxhello_main.c -CONFIG_EXAMPLES_NXHELLO_PROGNAME ?= nxhello$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_NXHELLO_PROGNAME) - # NXHELLO built-in application info -CONFIG_EXAMPLES_NXHELLO_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_NXHELLO_STACKSIZE ?= 2048 - -APPNAME = nxhello +PROGNAME = $(CONFIG_EXAMPLES_NXHELLO_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_NXHELLO_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_NXHELLO_STACKSIZE) - -MODULE = CONFIG_EXAMPLES_NXHELLO +MODULE = $(CONFIG_EXAMPLES_NXHELLO) include $(APPDIR)/Application.mk diff --git a/examples/nxhello/nxhello_main.c b/examples/nxhello/nxhello_main.c index c7be3b656..986b65ffd 100644 --- a/examples/nxhello/nxhello_main.c +++ b/examples/nxhello/nxhello_main.c @@ -181,11 +181,7 @@ static inline int nxhello_initialize(void) * Name: nxhello_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int nxhello_main(int argc, char *argv[]) -#endif { nxgl_mxpixel_t color; int ret; diff --git a/examples/nximage/Kconfig b/examples/nximage/Kconfig index 538a79d39..c0310d5a5 100644 --- a/examples/nximage/Kconfig +++ b/examples/nximage/Kconfig @@ -16,7 +16,6 @@ if EXAMPLES_NXIMAGE config EXAMPLES_NXIMAGE_PROGNAME string "NX Image Program name" default "nxhello" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/nximage/Makefile b/examples/nximage/Makefile index d83959ee5..b51a268aa 100644 --- a/examples/nximage/Makefile +++ b/examples/nximage/Makefile @@ -40,18 +40,11 @@ include $(TOPDIR)/Make.defs CSRCS = nximage_bkgd.c nximage_bitmap.c nximage_listener.c MAINSRC = nximage_main.c -CONFIG_EXAMPLES_NXIMAGE_PROGNAME ?= nxhello$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_NXIMAGE_PROGNAME) - # NXIMAGE built-in application info -CONFIG_EXAMPLES_NXIMAGE_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_NXIMAGE_STACKSIZE ?= 2048 - -APPNAME = nximage +PROGNAME = $(CONFIG_EXAMPLES_NXIMAGE_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_NXIMAGE_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_NXIMAGE_STACKSIZE) - -MODULE = CONFIG_EXAMPLES_NXIMAGE +MODULE = $(CONFIG_EXAMPLES_NXIMAGE) include $(APPDIR)/Application.mk diff --git a/examples/nximage/nximage_main.c b/examples/nximage/nximage_main.c index 7d365222a..83210c635 100644 --- a/examples/nximage/nximage_main.c +++ b/examples/nximage/nximage_main.c @@ -189,11 +189,7 @@ static inline int nximage_initialize(void) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int nximage_main(int argc, char *argv[]) -#endif { nxgl_mxpixel_t color; int ret; diff --git a/examples/nxlines/Kconfig b/examples/nxlines/Kconfig index 3a7326088..52297e43a 100644 --- a/examples/nxlines/Kconfig +++ b/examples/nxlines/Kconfig @@ -16,7 +16,6 @@ if EXAMPLES_NXLINES config EXAMPLES_NXLINES_PROGNAME string "NX lines program name" default "nxhello" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/nxlines/Makefile b/examples/nxlines/Makefile index bd3067553..69e69caf4 100644 --- a/examples/nxlines/Makefile +++ b/examples/nxlines/Makefile @@ -40,18 +40,11 @@ include $(TOPDIR)/Make.defs CSRCS = nxlines_bkgd.c nxlines_listener.c MAINSRC = nxlines_main.c -CONFIG_EXAMPLES_NXLINES_PROGNAME ?= nxhello$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_NXLINES_PROGNAME) - # NXLINES built-in application info -CONFIG_EXAMPLES_NXLINES_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_NXLINES_STACKSIZE ?= 2048 - -APPNAME = nxlines +PROGNAME = $(CONFIG_EXAMPLES_NXLINES_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_NXLINES_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_NXLINES_STACKSIZE) - -MODULE = CONFIG_EXAMPLES_NXLINES +MODULE = $(CONFIG_EXAMPLES_NXLINES) include $(APPDIR)/Application.mk diff --git a/examples/nxlines/nxlines_main.c b/examples/nxlines/nxlines_main.c index 094b5781b..8c2e5f086 100644 --- a/examples/nxlines/nxlines_main.c +++ b/examples/nxlines/nxlines_main.c @@ -207,11 +207,7 @@ static inline int nxlines_initialize(void) * Name: nxlines_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int nxlines_main(int argc, char *argv[]) -#endif { nxgl_mxpixel_t color; int ret; diff --git a/examples/nxterm/Kconfig b/examples/nxterm/Kconfig index 2ac1e23ec..44bc3b455 100644 --- a/examples/nxterm/Kconfig +++ b/examples/nxterm/Kconfig @@ -16,7 +16,6 @@ if EXAMPLES_NXTERM config EXAMPLES_NXTERM_PROGNAME string "Program name" default "nxterm" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/nxterm/Makefile b/examples/nxterm/Makefile index 2d54a7e29..e3aa446f2 100644 --- a/examples/nxterm/Makefile +++ b/examples/nxterm/Makefile @@ -40,17 +40,11 @@ include $(TOPDIR)/Make.defs CSRCS = nxterm_toolbar.c nxterm_wndo.c nxterm_listener.c MAINSRC = nxterm_main.c -CONFIG_NXTERM_PROGNAME ?= nxterm$(EXEEXT) -PROGNAME = $(CONFIG_NXTERM_PROGNAME) - # NX built-in application info -APPNAME = nxterm -CONFIG_NXTERM_PRIORITY ?= SCHED_PRIORITY_DEFAULT +PROGNAME = $(CONFIG_NXTERM_PROGNAME) PRIORITY = $(CONFIG_NXTERM_PRIORITY) -CONFIG_NXTERM_STACKSIZE ?= 2048 STACKSIZE = $(CONFIG_NXTERM_STACKSIZE) - -MODULE = CONFIG_EXAMPLES_NXTERM +MODULE = $(CONFIG_EXAMPLES_NXTERM) include $(APPDIR)/Application.mk diff --git a/examples/nxterm/nxterm_main.c b/examples/nxterm/nxterm_main.c index 38e98df37..614c152de 100644 --- a/examples/nxterm/nxterm_main.c +++ b/examples/nxterm/nxterm_main.c @@ -225,11 +225,7 @@ static int nxterm_task(int argc, char **argv) * Name: nxterm_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int nxterm_main(int argc, char **argv) -#endif { struct boardioc_nxterm_create_s nxcreate; nxgl_mxpixel_t color; diff --git a/examples/nxtext/Makefile b/examples/nxtext/Makefile index f7e89dd17..345a1f8bb 100644 --- a/examples/nxtext/Makefile +++ b/examples/nxtext/Makefile @@ -37,18 +37,14 @@ include $(TOPDIR)/Make.defs # NuttX NX Graphics Example. -CSRCS = nxtext_bkgd.c nxtext_popup.c nxtext_putc.c -MAINSRC = nxtext_main.c nxtext_listener.c - -CONFIG_EXAMPLES_NXTERM_PROGNAME ?= nxtext$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_NXTERM_PROGNAME) +CSRCS = nxtext_bkgd.c nxtext_popup.c nxtext_putc.c nxtext_listener.c +MAINSRC = nxtext_main.c # NXTEXT built-in application info -APPNAME = nxtext +PROGNAME = nxtext PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_NXTEXT +MODULE = $(CONFIG_EXAMPLES_NXTEXT) include $(APPDIR)/Application.mk diff --git a/examples/nxtext/nxtext_main.c b/examples/nxtext/nxtext_main.c index 8f8d8a13b..5935e7b25 100644 --- a/examples/nxtext/nxtext_main.c +++ b/examples/nxtext/nxtext_main.c @@ -266,11 +266,7 @@ static int nxtext_initialize(void) * Name: nxtext_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int nxtext_main(int argc, char **argv) -#endif { FAR struct nxtext_state_s *bgstate; NXWINDOW hwnd = NULL; diff --git a/examples/obd2/Makefile b/examples/obd2/Makefile index 2f38467c3..5eea86629 100644 --- a/examples/obd2/Makefile +++ b/examples/obd2/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # OBD2 application info -CONFIG_EXAMPLES_OBD2_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_OBD2_STACKSIZE ?= 2048 - -APPNAME = obd2 -PRIORITY = $(CONFIG_EXAMPLES_OBD2_PRIORITY) -STACKSIZE = $(CONFIG_EXAMPLES_OBD2_STACKSIZE) +PROGNAME = obd2 +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_OBD2) # OBD2 Example MAINSRC = obd2_main.c -CONFIG_EXAMPLES_OBD2_PROGNAME ?= obd2$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_OBD2_PROGNAME) - -MODULE = CONFIG_EXAMPLES_OBD2 - include $(APPDIR)/Application.mk diff --git a/examples/obd2/obd2_main.c b/examples/obd2/obd2_main.c index cb2d1d1af..9de5ea3e7 100644 --- a/examples/obd2/obd2_main.c +++ b/examples/obd2/obd2_main.c @@ -52,11 +52,7 @@ * obd2_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int obd2_main(int argc, char *argv[]) -#endif { struct obd_dev_s *dev; int ret; diff --git a/examples/oneshot/Kconfig b/examples/oneshot/Kconfig index 3dc966d48..d453ac960 100644 --- a/examples/oneshot/Kconfig +++ b/examples/oneshot/Kconfig @@ -33,31 +33,21 @@ config EXAMPLES_ONESHOT_SIGNO This is the number of the signal that will be used in the oneshot notification. -config EXAMPLES_ONESHOT_APPNAME - string "Oneshot timer executable name" - default "oneshot" - depends on NSH_BUILTIN_APPS - ---help--- - This is the name of the built-in application - config EXAMPLES_ONESHOT_STACKSIZE int "Oneshot timer stack size" default 2048 - depends on NSH_BUILTIN_APPS ---help--- This is the stack size allocated when the oneshot timer task runs config EXAMPLES_ONESHOT_PRIORITY int "Oneshot timer task priority" default 100 - depends on NSH_BUILTIN_APPS ---help--- This is the priority of the oneshot timer task config EXAMPLES_ONESHOT_PROGNAME string "Oneshot timer program name" default "oneshot" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/oneshot/Makefile b/examples/oneshot/Makefile index 049f90aff..008a6a475 100644 --- a/examples/oneshot/Makefile +++ b/examples/oneshot/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # Oneshot timer built-in application info -CONFIG_EXAMPLES_ONESHOT_APPNAME ?= "oneshot" -CONFIG_EXAMPLES_ONESHOT_STACKSIZE ?= 2048 -CONFIG_EXAMPLES_ONESHOT_PRIORITY ?= 100 -CONFIG_EXAMPLES_ONESHOT_PROGNAME ?= "oneshot" - -APPNAME = $(CONFIG_EXAMPLES_ONESHOT_APPNAME) +PROGNAME = $(CONFIG_EXAMPLES_ONESHOT_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_ONESHOT_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_ONESHOT_STACKSIZE) -PROGNAME = $(CONFIG_EXAMPLES_ONESHOT_PROGNAME) +MODULE = $(CONFIG_EXAMPLES_ONESHOT) # Oneshot timer example MAINSRC = oneshot_main.c -MODULE = CONFIG_EXAMPLES_ONESHOT - include $(APPDIR)/Application.mk diff --git a/examples/oneshot/oneshot_main.c b/examples/oneshot/oneshot_main.c index a99c4b177..02d7d948d 100644 --- a/examples/oneshot/oneshot_main.c +++ b/examples/oneshot/oneshot_main.c @@ -106,11 +106,7 @@ static void show_usage(FAR const char *progname) * Name: oneshot_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int oneshot_main(int argc, char *argv[]) -#endif { FAR const char *devname = CONFIG_EXAMPLES_ONESHOT_DEVNAME; unsigned long usecs = CONFIG_EXAMPLES_ONESHOT_DELAY; diff --git a/examples/pashello/Makefile b/examples/pashello/Makefile index 4539185f1..f11badbdf 100644 --- a/examples/pashello/Makefile +++ b/examples/pashello/Makefile @@ -37,7 +37,10 @@ include $(TOPDIR)/Make.defs # Pascal Add-On Example -APPNAME = pashello +PROGNAME = pashello +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_PASHELLO) ifeq ($(WINTOOL),y) INCDIROPT = -w @@ -50,9 +53,4 @@ CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \ CSRCS = device.c MAINSRC = pashello.c -CONFIG_XYZ_PROGNAME ?= pashello$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_PASHELLO - include $(APPDIR)/Application.mk diff --git a/examples/pashello/pashello.c b/examples/pashello/pashello.c index c6e3d8a8a..9d4b6fc82 100644 --- a/examples/pashello/pashello.c +++ b/examples/pashello/pashello.c @@ -75,11 +75,7 @@ * pashello_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int pashello_main(int argc, FAR char *argv[]) -#endif { int exitcode = EXIT_SUCCESS; int ret; diff --git a/examples/pca9635/Kconfig b/examples/pca9635/Kconfig index 8050411db..b406017a5 100644 --- a/examples/pca9635/Kconfig +++ b/examples/pca9635/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_PCA9635 config EXAMPLES_PCA9635_PROGNAME string "Program name" default "pca9635" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/pca9635/Makefile b/examples/pca9635/Makefile index 6c274336e..1bfe16156 100644 --- a/examples/pca9635/Makefile +++ b/examples/pca9635/Makefile @@ -37,17 +37,13 @@ include $(TOPDIR)/Make.defs # PCA9635 built-in application info -APPNAME = pca9635 +PROGNAME = $(CONFIG_EXAMPLES_PCA9635_PROGNAME) PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_PCA9635) # PCA9635 Test MAINSRC = pca9635_main.c -CONFIG_EXAMPLES_PCA9635_PROGNAME ?= pca9635$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_PCA9635_PROGNAME) - -MODULE = CONFIG_EXAMPLES_PCA9635 - include $(APPDIR)/Application.mk diff --git a/examples/pca9635/pca9635_main.c b/examples/pca9635/pca9635_main.c index 1046df937..0746e0592 100644 --- a/examples/pca9635/pca9635_main.c +++ b/examples/pca9635/pca9635_main.c @@ -66,11 +66,7 @@ * pca9635_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int pca9635_main(int argc, char *argv[]) -#endif { struct pca9635pw_setled_brightness_arg_s ledbright; int led; diff --git a/examples/pdcurses/Makefile b/examples/pdcurses/Makefile index e350ddf64..e3f2ce105 100644 --- a/examples/pdcurses/Makefile +++ b/examples/pdcurses/Makefile @@ -37,23 +37,15 @@ include $(TOPDIR)/Make.defs # pdcurses demo programs -CONFIG_EXAMPLES_PDCURSES_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_PDCURSES_STACKSIZE ?= 2048 - +PROGNAME = charset firework newdemo panel +PROGNAME += rain testcurs tui worm xmas PRIORITY = $(CONFIG_EXAMPLES_PDCURSES_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_PDCURSES_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_PDCURSES) CSRCS = tui.c MAINSRC = charset_main.c firework_main.c newdemo_main.c panel_main.c MAINSRC += rain_main.c testcurs_main.c tui_main.c worm_main.c xmas_main.c -APPNAME = charset firework newdemo panel -APPNAME += rain testcurs tui worm xmas - -PROGNAME = charset$(EXEEXT) firework$(EXEEXT) newdemo$(EXEEXT) panel$(EXEEXT) -PROGNAME += rain$(EXEEXT) testcurs$(EXEEXT) tui$(EXEEXT) worm$(EXEEXT) xmas$(EXEEXT) - -MODULE = CONFIG_EXAMPLES_PDCURSES - include $(APPDIR)/Application.mk diff --git a/examples/pdcurses/charset_main.c b/examples/pdcurses/charset_main.c index cb7e4903c..7d947d23c 100644 --- a/examples/pdcurses/charset_main.c +++ b/examples/pdcurses/charset_main.c @@ -61,11 +61,7 @@ static short color_table[] = * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int charset_main(int argc, char *argv[]) -#endif { chtype ch; int lastch; diff --git a/examples/pdcurses/firework_main.c b/examples/pdcurses/firework_main.c index cbc6fad14..86dd0ca1b 100644 --- a/examples/pdcurses/firework_main.c +++ b/examples/pdcurses/firework_main.c @@ -147,11 +147,7 @@ static void explode(int row, int col) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int firework_main(int argc, char *argv[]) -#endif { int start; int end; diff --git a/examples/pdcurses/newdemo_main.c b/examples/pdcurses/newdemo_main.c index 440009e42..daeb90f32 100644 --- a/examples/pdcurses/newdemo_main.c +++ b/examples/pdcurses/newdemo_main.c @@ -302,11 +302,7 @@ static int bouncing_balls(WINDOW *win) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int newdemo_main(int argc, char *argv[]) -#endif { WINDOW *win; chtype save[80]; diff --git a/examples/pdcurses/panel_main.c b/examples/pdcurses/panel_main.c index c057eb5fe..ba175bd06 100644 --- a/examples/pdcurses/panel_main.c +++ b/examples/pdcurses/panel_main.c @@ -172,11 +172,7 @@ static void fill_panel(PANEL *pan) } } -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int panel_main(int argc, char *argv[]) -#endif { int itmp, y; diff --git a/examples/pdcurses/rain_main.c b/examples/pdcurses/rain_main.c index 3d233e8f6..4c7ac93cd 100644 --- a/examples/pdcurses/rain_main.c +++ b/examples/pdcurses/rain_main.c @@ -75,11 +75,7 @@ static int next_j(int j) return j; } -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int rain_main(int argc, char *argv[]) -#endif { int x, y, j, r, c, seed; static int xpos[5], ypos[5]; diff --git a/examples/pdcurses/testcurs_main.c b/examples/pdcurses/testcurs_main.c index 73d8d9b15..524b73240 100644 --- a/examples/pdcurses/testcurs_main.c +++ b/examples/pdcurses/testcurs_main.c @@ -1226,11 +1226,7 @@ void display_menu(int old_option, int new_option) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int testcurs_main(int argc, char *argv[]) -#endif { WINDOW *win; int key; diff --git a/examples/pdcurses/tui_main.c b/examples/pdcurses/tui_main.c index 7281d53e6..1aa20d0c9 100644 --- a/examples/pdcurses/tui_main.c +++ b/examples/pdcurses/tui_main.c @@ -281,11 +281,7 @@ static void subsub(void) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int tui_main(int argc, char *argv[]) -#endif { #ifdef CONFIG_LIBC_LOCALE setlocale(LC_ALL, ""); diff --git a/examples/pdcurses/worm_main.c b/examples/pdcurses/worm_main.c index 0ec3f7824..811d213f2 100644 --- a/examples/pdcurses/worm_main.c +++ b/examples/pdcurses/worm_main.c @@ -602,11 +602,7 @@ static void cleanup(void) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int worm_main(int argc, char *argv[]) -#endif { const struct options *op; struct worm *w; diff --git a/examples/pdcurses/xmas_main.c b/examples/pdcurses/xmas_main.c index e4be0c97b..daa703e5d 100644 --- a/examples/pdcurses/xmas_main.c +++ b/examples/pdcurses/xmas_main.c @@ -783,11 +783,7 @@ static void reindeer(void) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int xmas_main(int argc, char *argv[]) -#endif { int loopy; #ifdef CONFIG_PDCURSES_MULTITHREAD diff --git a/examples/pf_ieee802154/Kconfig b/examples/pf_ieee802154/Kconfig index 22af89bbc..b43145283 100644 --- a/examples/pf_ieee802154/Kconfig +++ b/examples/pf_ieee802154/Kconfig @@ -15,7 +15,6 @@ if EXAMPLES_PFIEEE802154 config EXAMPLES_PFIEEE802154_PROGNAME1 string "Target1 program name" default "pfserver" - depends on BUILD_LOADABLE ---help--- This is the name of the Target1 program that will be used when the NSH ELF program is installed. @@ -31,7 +30,6 @@ config EXAMPLES_PFIEEE802154_STACKSIZE1 config EXAMPLES_PFIEEE802154_PROGNAME2 string "Target2 program name" default "pfclient" - depends on BUILD_LOADABLE ---help--- This is the name of the Target2 program that will be used when the NSH ELF program is installed. diff --git a/examples/pf_ieee802154/Makefile b/examples/pf_ieee802154/Makefile index e40f6867d..c1e6a1db3 100644 --- a/examples/pf_ieee802154/Makefile +++ b/examples/pf_ieee802154/Makefile @@ -40,21 +40,14 @@ include $(TOPDIR)/Make.defs CSRCS = pf_cmdline.c MAINSRC = pf_server.c pf_client.c -APPNAME = pfserver pfclient -PROGNAME = pfserver$(EXEEXT) pfclient$(EXEEXT) - -CONFIG_EXAMPLES_PFIEEE802154_PRIORITY1 ?= 100 -CONFIG_EXAMPLES_PFIEEE802154_STACKSIZE1 ?= 2048 +PROGNAME = pfserver pfclient PRIORITY = $(CONFIG_EXAMPLES_PFIEEE802154_PRIORITY1) STACKSIZE = $(CONFIG_EXAMPLES_PFIEEE802154_STACKSIZE1) -CONFIG_EXAMPLES_PFIEEE802154_PRIORITY2 ?= 100 -CONFIG_EXAMPLES_PFIEEE802154_STACKSIZE2 ?= 2048 - PRIORITY += $(CONFIG_EXAMPLES_PFIEEE802154_PRIORITY2) STACKSIZE += $(CONFIG_EXAMPLES_PFIEEE802154_STACKSIZE2) -MODULE = CONFIG_EXAMPLES_PFIEEE802154 +MODULE = $(CONFIG_EXAMPLES_PFIEEE802154) include $(APPDIR)/Application.mk diff --git a/examples/pf_ieee802154/pf_client.c b/examples/pf_ieee802154/pf_client.c index f360650f6..8d72df28a 100644 --- a/examples/pf_ieee802154/pf_client.c +++ b/examples/pf_ieee802154/pf_client.c @@ -108,11 +108,7 @@ static inline void fill_buffer(unsigned char *buf, int offset) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int pfclient_main(int argc, char *argv[]) -#endif { struct sockaddr_ieee802154_s server; unsigned char outbuf[SENDSIZE]; diff --git a/examples/pf_ieee802154/pf_server.c b/examples/pf_ieee802154/pf_server.c index f4b64dad6..f476b6679 100644 --- a/examples/pf_ieee802154/pf_server.c +++ b/examples/pf_ieee802154/pf_server.c @@ -84,11 +84,7 @@ static inline int check_buffer(unsigned char *buf) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int pfserver_main(int argc, char *argv[]) -#endif { struct sockaddr_ieee802154_s server; struct sockaddr_ieee802154_s client; diff --git a/examples/pipe/Makefile b/examples/pipe/Makefile index 7b593b801..338ea4661 100644 --- a/examples/pipe/Makefile +++ b/examples/pipe/Makefile @@ -37,14 +37,12 @@ include $(TOPDIR)/Make.defs # Pipe Example -APPNAME = pipe +PROGNAME = pipe +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_PIPE) CSRCS = transfer_test.c interlock_test.c redirect_test.c MAINSRC = pipe_main.c -CONFIG_XYZ_PROGNAME ?= pipe$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_PIPE - include $(APPDIR)/Application.mk diff --git a/examples/pipe/pipe_main.c b/examples/pipe/pipe_main.c index 6decd614c..8259077e8 100644 --- a/examples/pipe/pipe_main.c +++ b/examples/pipe/pipe_main.c @@ -56,11 +56,7 @@ * Name: pipe_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int pipe_main(int argc, char *argv[]) -#endif { #if CONFIG_DEV_FIFO_SIZE > 0 || CONFIG_DEV_PIPE_SIZE > 0 int fd[2]; diff --git a/examples/poll/Kconfig b/examples/poll/Kconfig index 30ffcc0c7..983ee43e4 100644 --- a/examples/poll/Kconfig +++ b/examples/poll/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_POLL tristate "Poll example" default n - depends on !NSH_BUILTIN_APPS && PIPES + depends on PIPES ---help--- Enable the poll example diff --git a/examples/poll/Makefile b/examples/poll/Makefile index 5025488e2..1c6d09c93 100644 --- a/examples/poll/Makefile +++ b/examples/poll/Makefile @@ -38,9 +38,9 @@ include $(TOPDIR)/Make.defs CSRCS = poll_listener.c select_listener.c net_listener.c net_reader.c MAINSRC = poll_main.c -CONFIG_XYZ_PROGNAME ?= poll$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_POLL +PROGNAME = poll +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_POLL) include $(APPDIR)/Application.mk diff --git a/examples/poll/poll_main.c b/examples/poll/poll_main.c index 85539e732..50c089614 100644 --- a/examples/poll/poll_main.c +++ b/examples/poll/poll_main.c @@ -77,11 +77,7 @@ * Name: poll_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int poll_main(int argc, char *argv[]) -#endif { char buffer[64]; ssize_t nbytes; diff --git a/examples/popen/Kconfig b/examples/popen/Kconfig index 183202bc8..0292dfcf4 100644 --- a/examples/popen/Kconfig +++ b/examples/popen/Kconfig @@ -15,7 +15,6 @@ if EXAMPLES_POPEN config EXAMPLES_POPEN_PROGNAME string "Program name" default "popen" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/popen/Makefile b/examples/popen/Makefile index 446b23c56..935a3a7e4 100644 --- a/examples/popen/Makefile +++ b/examples/popen/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # popen() built-in application info -CONFIG_EXAMPLES_POPEN_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_POPEN_STACKSIZE ?= 2048 - -APPNAME = popen +PROGNAME = $(CONFIG_EXAMPLES_POPEN_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_POPEN_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_POPEN_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_POPEN) # popen() Example MAINSRC = popen_main.c -CONFIG_EXAMPLES_POPEN_PROGNAME ?= popen$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_POPEN_PROGNAME) - -MODULE = CONFIG_EXAMPLES_POPEN - include $(APPDIR)/Application.mk diff --git a/examples/popen/popen_main.c b/examples/popen/popen_main.c index be769e772..21587e4bb 100644 --- a/examples/popen/popen_main.c +++ b/examples/popen/popen_main.c @@ -52,11 +52,7 @@ * Name: popen_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int popen_main(int argc, char *argv[]) -#endif { struct itimerspec value; struct sigevent ev; diff --git a/examples/posix_spawn/Kconfig b/examples/posix_spawn/Kconfig index bcae1c1a1..1d3824e46 100644 --- a/examples/posix_spawn/Kconfig +++ b/examples/posix_spawn/Kconfig @@ -4,7 +4,7 @@ # config EXAMPLES_POSIXSPAWN - bool "posix_spawn Unit Test" + tristate "posix_spawn Unit Test" default n ---help--- Enable the posix_spawn() unit test diff --git a/examples/posix_spawn/Makefile b/examples/posix_spawn/Makefile index f3da52eb3..8fb6a9625 100644 --- a/examples/posix_spawn/Makefile +++ b/examples/posix_spawn/Makefile @@ -40,8 +40,10 @@ include $(TOPDIR)/Make.defs CSRCS = symtab.c MAINSRC = spawn_main.c -CONFIG_XYZ_PROGNAME ?= posix_spawn$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) +PROGNAME = posix_spawn +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_POSIXSPAWN) ROOTDEPPATH += --dep-path filesystem diff --git a/examples/posix_spawn/spawn_main.c b/examples/posix_spawn/spawn_main.c index abbb8cff8..326e8231b 100644 --- a/examples/posix_spawn/spawn_main.c +++ b/examples/posix_spawn/spawn_main.c @@ -226,11 +226,7 @@ static inline void testheader(FAR const char *progname) * Name: spawn_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int spawn_main(int argc, char *argv[]) -#endif { struct boardioc_symtab_s symdesc; posix_spawn_file_actions_t file_actions; diff --git a/examples/powerled/Makefile b/examples/powerled/Makefile index ecd5ae125..306133618 100644 --- a/examples/powerled/Makefile +++ b/examples/powerled/Makefile @@ -37,16 +37,11 @@ include $(TOPDIR)/Make.defs # Powerled Example -APPNAME = powerled - MAINSRC = powerled_main.c -CONFIG_EXAMPLES_POWERLED_PROGNAME ?= powerled$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_POWERLED_PROGNAME) - +PROGNAME = powerled PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 1024 - -MODULE = CONFIG_EXAMPLES_POWERLED +MODULE = $(CONFIG_EXAMPLES_POWERLED) include $(APPDIR)/Application.mk diff --git a/examples/powerled/powerled_main.c b/examples/powerled/powerled_main.c index c2c739658..60dcafc5f 100644 --- a/examples/powerled/powerled_main.c +++ b/examples/powerled/powerled_main.c @@ -431,7 +431,7 @@ errout: * Name: powerled_main ****************************************************************************/ -int powerled_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { struct powerled_limits_s powerled_limits; struct powerled_params_s powerled_params; diff --git a/examples/powermonitor/Makefile b/examples/powermonitor/Makefile index 31610d5ea..58eab7094 100644 --- a/examples/powermonitor/Makefile +++ b/examples/powermonitor/Makefile @@ -34,17 +34,13 @@ include $(TOPDIR)/Make.defs -APPNAME = powermonitor +PROGNAME = powermonitor PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 768 +MODULE = $(CONFIG_EXAMPLES_POWERMONITOR) MAINSRC = powermonitor_main.c CFLAGS += -I../../../nuttx/arch/arm/src -I../../../nuttx/arch/arm/src/common -CONFIG_EXAMPLES_POWERMONITOR_PROGNAME ?= temperature$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_POWERMONITOR_PROGNAME) - -MODULE = CONFIG_EXAMPLES_POWERMONITOR - include $(APPDIR)/Application.mk diff --git a/examples/powermonitor/powermonitor_main.c b/examples/powermonitor/powermonitor_main.c index df7b4d80b..eb910310e 100644 --- a/examples/powermonitor/powermonitor_main.c +++ b/examples/powermonitor/powermonitor_main.c @@ -62,11 +62,7 @@ * Public Functions ******************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, char *argv[]) -#else -int powermonitor_main(int argc, char *argv[]) -#endif { static FAR const char *pwrmntr_dev = "/dev/pwrmntr0"; float float_current; diff --git a/examples/pppd/Makefile b/examples/pppd/Makefile index 3557c0834..8d2947695 100644 --- a/examples/pppd/Makefile +++ b/examples/pppd/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = pppd_main.c -CONFIG_EXAMPLES_PPPD_PROGNAME ?= pppd$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_PPPD_PROGNAME) - # PPPD built-in application info -APPNAME = pppd +PROGNAME = pppd PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = CONFIG_EXAMPLES_PPPD_STACKSIZE - -MODULE = CONFIG_EXAMPLES_PPPD +STACKSIZE = $(CONFIG_EXAMPLES_PPPD_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_PPPD) include $(APPDIR)/Application.mk diff --git a/examples/pppd/pppd_main.c b/examples/pppd/pppd_main.c index ac081e00d..b91b9fd75 100644 --- a/examples/pppd/pppd_main.c +++ b/examples/pppd/pppd_main.c @@ -70,7 +70,7 @@ static FAR const char disconnect_script[] = * Name: pppd_main ****************************************************************************/ -int pppd_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { const struct pppd_settings_s pppd_settings = { diff --git a/examples/pty_test/Kconfig b/examples/pty_test/Kconfig index 2612c66d2..be9b2caa3 100644 --- a/examples/pty_test/Kconfig +++ b/examples/pty_test/Kconfig @@ -16,7 +16,6 @@ if EXAMPLES_PTYTEST config EXAMPLES_PTYTEST_PROGNAME string "Program name" default "pts" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. @@ -41,8 +40,4 @@ config EXAMPLES_PTYTEST_DAEMONPRIO int "PTY_Test daemon task priority" default 100 -config EXAMPLES_PTYTEST_STACKSIZE - int "PTY_Test daemon stack size" - default 2048 - endif diff --git a/examples/pty_test/Makefile b/examples/pty_test/Makefile index 01773baad..a0e5a2fd1 100644 --- a/examples/pty_test/Makefile +++ b/examples/pty_test/Makefile @@ -37,21 +37,14 @@ include $(TOPDIR)/Make.defs # Hello, World! built-in application info -CONFIG_EXAMPLES_PTYTEST_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_PTYTEST_STACKSIZE ?= 8192 - -APPNAME = pty_test +PROGNAME = $(CONFIG_EXAMPLES_PTYTEST_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_PTYTEST_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_PTYTEST_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_PTYTEST) # PTY Test! Example CFLAGS += -I$(APPDIR)/include MAINSRC = pty_test.c -CONFIG_EXAMPLES_PTYTEST_PROGNAME ?= pty_test$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_PTYTEST_PROGNAME) - -MODULE = CONFIG_EXAMPLES_PTYTEST - include $(APPDIR)/Application.mk diff --git a/examples/pty_test/pty_test.c b/examples/pty_test/pty_test.c index 86d44d080..ce65e7a76 100644 --- a/examples/pty_test/pty_test.c +++ b/examples/pty_test/pty_test.c @@ -252,11 +252,7 @@ static void serial_out(struct term_pair_s *tp) * Name: pty_test_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int pty_test_main(int argc, char *argv[]) -#endif { struct term_pair_s termpair; struct termios tio; diff --git a/examples/pwfb/Kconfig b/examples/pwfb/Kconfig index 8de700104..bd997d20b 100644 --- a/examples/pwfb/Kconfig +++ b/examples/pwfb/Kconfig @@ -102,7 +102,6 @@ comment "Tasking options" config EXAMPLES_PWFB_PROGNAME string "Program name" default "pwfb" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/pwfb/Makefile b/examples/pwfb/Makefile index e2bebaca0..c4de192f2 100644 --- a/examples/pwfb/Makefile +++ b/examples/pwfb/Makefile @@ -43,18 +43,11 @@ CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(NXGLYPHS)$(DELIM)include"} CSRCS = pwfb_events.c pwfb_motion.c MAINSRC = pwfb_main.c -CONFIG_EXAMPLES_PWFB_PROGNAME ?= pwfb$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_PWFB_PROGNAME) - # Per-Window frame buffer built-in application info -CONFIG_EXAMPLES_PWFB_CLIENT_PRIO ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_PWFB_CLIENT_STACKSIZE ?= 2048 - -APPNAME = pwfb +PROGNAME = $(CONFIG_EXAMPLES_PWFB_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_PWFB_CLIENT_PRIO) STACKSIZE = $(CONFIG_EXAMPLES_PWFB_CLIENT_STACKSIZE) - -MODULE = CONFIG_EXAMPLES_PWFB +MODULE = $(CONFIG_EXAMPLES_PWFB) include $(APPDIR)/Application.mk diff --git a/examples/pwfb/pwfb_main.c b/examples/pwfb/pwfb_main.c index f5f2fcfc4..a8a99a127 100644 --- a/examples/pwfb/pwfb_main.c +++ b/examples/pwfb/pwfb_main.c @@ -575,11 +575,7 @@ static bool pwfb_configure_cursor(FAR struct pwfb_state_s *st, * Name: pwfb_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int pwfb_main(int argc, char *argv[]) -#endif { struct pwfb_state_s wstate; struct nxgl_size_s size; diff --git a/examples/pwlines/Kconfig b/examples/pwlines/Kconfig index 868f55a78..0561ea62b 100644 --- a/examples/pwlines/Kconfig +++ b/examples/pwlines/Kconfig @@ -101,7 +101,6 @@ comment "Tasking options" config EXAMPLES_PWLINES_PROGNAME string "Program name" default "pwlines" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/pwlines/Makefile b/examples/pwlines/Makefile index f197f1a31..ff7b4c4a2 100644 --- a/examples/pwlines/Makefile +++ b/examples/pwlines/Makefile @@ -40,18 +40,11 @@ include $(TOPDIR)/Make.defs CSRCS = pwlines_events.c pwlines_motion.c pwlines_update.c MAINSRC = pwlines_main.c -CONFIG_EXAMPLES_PWLINES_PROGNAME ?= pwlines$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_PWLINES_PROGNAME) - # NX built-in application info -CONFIG_EXAMPLES_PWLINES_CLIENT_PRIO ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_PWLINES_CLIENT_STACKSIZE ?= 2048 - -APPNAME = pwlines +PROGNAME = $(CONFIG_EXAMPLES_PWLINES_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_PWLINES_CLIENT_PRIO) STACKSIZE = $(CONFIG_EXAMPLES_PWLINES_CLIENT_STACKSIZE) - -MODULE = CONFIG_EXAMPLES_PWLINES +MODULE = $(CONFIG_EXAMPLES_PWLINES) include $(APPDIR)/Application.mk diff --git a/examples/pwlines/pwlines_main.c b/examples/pwlines/pwlines_main.c index 8474a4ce4..b418051d1 100644 --- a/examples/pwlines/pwlines_main.c +++ b/examples/pwlines/pwlines_main.c @@ -308,11 +308,7 @@ errout_with_hwnd: * Name: pwlines_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int pwlines_main(int argc, char *argv[]) -#endif { struct pwlines_state_s wstate; struct nxgl_size_s size; diff --git a/examples/pwm/Kconfig b/examples/pwm/Kconfig index 2c3b21427..3b406e3ab 100644 --- a/examples/pwm/Kconfig +++ b/examples/pwm/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_PWM tristate "Pulse width modulation (PWM) example" default n - depends on PWM && NSH_BUILTIN_APPS + depends on PWM ---help--- Enable the Pulse width modulation (PWM) example diff --git a/examples/pwm/Makefile b/examples/pwm/Makefile index 8203a73eb..42987ab23 100644 --- a/examples/pwm/Makefile +++ b/examples/pwm/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = pwm_main.c -CONFIG_XYZ_PROGNAME ?= pwm$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # PWM built-in application info -APPNAME = pwm +PROGNAME = pwm PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_PWM +MODULE = $(CONFIG_EXAMPLES_PWM) include $(APPDIR)/Application.mk diff --git a/examples/pwm/pwm.h b/examples/pwm/pwm.h index c1e1b02ab..01bba0356 100644 --- a/examples/pwm/pwm.h +++ b/examples/pwm/pwm.h @@ -47,8 +47,6 @@ ****************************************************************************/ /* Configuration ************************************************************/ /* CONFIG_NSH_BUILTIN_APPS - Build the PWM test as an NSH built-in function. - * Default: Not built! The example can only be used as an NSH built-in - * application * CONFIG_EXAMPLES_PWM_DEVPATH - The path to the PWM device. Default: /dev/pwm0 * CONFIG_EXAMPLES_PWM_FREQUENCY - The initial PWM frequency. Default: 100 Hz * CONFIG_EXAMPLES_PWM_DUTYPCT - The initial PWM duty as a percentage. Default: 50% @@ -64,10 +62,6 @@ # error "PWM device support is not enabled (CONFIG_PWM)" #endif -#ifndef CONFIG_NSH_BUILTIN_APPS -# warning "The PWM example only works as an NSH built-in application (CONFIG_NSH_BUILTIN_APPS)" -#endif - #ifndef CONFIG_EXAMPLES_PWM_DEVPATH # define CONFIG_EXAMPLES_PWM_DEVPATH "/dev/pwm0" #endif diff --git a/examples/pwm/pwm_main.c b/examples/pwm/pwm_main.c index c39f61d7d..7a808dd2e 100644 --- a/examples/pwm/pwm_main.c +++ b/examples/pwm/pwm_main.c @@ -396,11 +396,7 @@ static void parse_args(FAR struct pwm_state_s *pwm, int argc, FAR char **argv) * Name: pwm_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int pwm_main(int argc, char *argv[]) -#endif { struct pwm_info_s info; int fd; diff --git a/examples/qencoder/Makefile b/examples/qencoder/Makefile index fbda93afb..90443929f 100644 --- a/examples/qencoder/Makefile +++ b/examples/qencoder/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = qe_main.c -CONFIG_XYZ_PROGNAME ?= qencoder$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # Quadrature Encoder built-in application info -APPNAME = qe +PROGNAME = qe PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_QENCODER +MODULE = $(CONFIG_EXAMPLES_QENCODER) include $(APPDIR)/Application.mk diff --git a/examples/qencoder/qe_main.c b/examples/qencoder/qe_main.c index d060e6bbc..a9ac8d06b 100644 --- a/examples/qencoder/qe_main.c +++ b/examples/qencoder/qe_main.c @@ -238,11 +238,7 @@ static void parse_args(int argc, FAR char **argv) * Name: qe_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int qe_main(int argc, FAR char *argv[]) -#endif { int32_t position; int fd; diff --git a/examples/random/Makefile b/examples/random/Makefile index f4060907e..ada1f1973 100644 --- a/examples/random/Makefile +++ b/examples/random/Makefile @@ -37,15 +37,11 @@ include $(TOPDIR)/Make.defs # /dev/random test -APPNAME = rand +PROGNAME = rand PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_RANDOM) MAINSRC = random_main.c -CONFIG_XYZ_PROGNAME ?= random$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_RANDOM - include $(APPDIR)/Application.mk diff --git a/examples/random/random_main.c b/examples/random/random_main.c index 53cf8e3d5..2dc9e1890 100644 --- a/examples/random/random_main.c +++ b/examples/random/random_main.c @@ -77,11 +77,7 @@ * rand_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int rand_main(int argc, char *argv[]) -#endif { uint32_t buffer[CONFIG_EXAMPLES_MAXSAMPLES]; int nsamples = CONFIG_EXAMPLES_NSAMPLES; diff --git a/examples/relays/Makefile b/examples/relays/Makefile index 5a950fef3..45da6da1b 100644 --- a/examples/relays/Makefile +++ b/examples/relays/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = relays_main.c -CONFIG_XYZ_PROGNAME ?= relays$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # Buttons built-in application info -APPNAME = relays +PROGNAME = relays PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 512 - -MODULE = CONFIG_EXAMPLES_RELAYS +MODULE = $(CONFIG_EXAMPLES_RELAYS) include $(APPDIR)/Application.mk diff --git a/examples/relays/relays_main.c b/examples/relays/relays_main.c index a4beee24d..aa409dac7 100644 --- a/examples/relays/relays_main.c +++ b/examples/relays/relays_main.c @@ -85,11 +85,7 @@ * Name: relays_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int relays_main(int argc, char *argv[]) -#endif { char *stat = NULL; char *no = NULL; diff --git a/examples/rfid_readuid/Kconfig b/examples/rfid_readuid/Kconfig index 8e2c81b44..511fa9f9b 100644 --- a/examples/rfid_readuid/Kconfig +++ b/examples/rfid_readuid/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_RFID_READUID config EXAMPLES_RFID_READUID_PROGNAME string "Program name" default "rfid_readuid" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/rfid_readuid/Makefile b/examples/rfid_readuid/Makefile index 6cb54fdd7..069e6c4e9 100644 --- a/examples/rfid_readuid/Makefile +++ b/examples/rfid_readuid/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # RFID Read UID built-in application info -CONFIG_EXAMPLES_RFID_READUID_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_RFID_READUID_STACKSIZE ?= 2048 - -APPNAME = rfid_readuid +PROGNAME = $(CONFIG_EXAMPLES_RFID_READUID_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_RFID_READUID_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_RFID_READUID_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_RFID_READUID) # RFID Read UID Example MAINSRC = rfid_readuid.c -CONFIG_EXAMPLES_RFID_READUID_PROGNAME ?= rfid_readuid$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_RFID_READUID_PROGNAME) - -MODULE = CONFIG_EXAMPLES_RFID_READUID - include $(APPDIR)/Application.mk diff --git a/examples/rfid_readuid/rfid_readuid.c b/examples/rfid_readuid/rfid_readuid.c index 65c5e08fe..9e652180b 100644 --- a/examples/rfid_readuid/rfid_readuid.c +++ b/examples/rfid_readuid/rfid_readuid.c @@ -67,11 +67,7 @@ * rfid_readuid_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int rfid_readuid_main(int argc, char *argv[]) -#endif { int fd; int ret; diff --git a/examples/rgbled/Kconfig b/examples/rgbled/Kconfig index e9200968f..0c4ccf646 100644 --- a/examples/rgbled/Kconfig +++ b/examples/rgbled/Kconfig @@ -18,7 +18,6 @@ config EXAMPLES_RGBLED_DEVNAME config EXAMPLES_RGBLED_PROGNAME string "Program name" default "rgbled" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/rgbled/Makefile b/examples/rgbled/Makefile index dca48ddb1..95c3cf35f 100644 --- a/examples/rgbled/Makefile +++ b/examples/rgbled/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # RGBLED built-in application info -CONFIG_EXAMPLES_RGBLED_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_RGBLED_STACKSIZE ?= 2048 - -APPNAME = rgbled +PROGNAME = $(CONFIG_EXAMPLES_RGBLED_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_RGBLED_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_RGBLED_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_RGBLED) # RGBLED Example MAINSRC = rgbled.c -CONFIG_EXAMPLES_RGBLED_PROGNAME ?= rgbled$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_RGBLED_PROGNAME) - -MODULE = CONFIG_EXAMPLES_RGBLED - include $(APPDIR)/Application.mk diff --git a/examples/rgbled/rgbled.c b/examples/rgbled/rgbled.c index 279590d3a..1df5f56b8 100644 --- a/examples/rgbled/rgbled.c +++ b/examples/rgbled/rgbled.c @@ -59,11 +59,7 @@ * rgbled_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int rgbled_main(int argc, char *argv[]) -#endif { int red = 255; int green = 0; diff --git a/examples/romfs/Makefile b/examples/romfs/Makefile index 116eaa69b..47ea0c8f1 100644 --- a/examples/romfs/Makefile +++ b/examples/romfs/Makefile @@ -37,17 +37,15 @@ include $(TOPDIR)/Make.defs # ROMFS built-in application info -APPNAME = romfs +PROGNAME = romfs PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_ROMFS) # ROMFS File System Example MAINSRC = romfs_main.c -CONFIG_XYZ_PROGNAME ?= romfs$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # Common build checkgenromfs: @@ -72,6 +70,4 @@ distclean:: $(call DELFILE, testdir.img) $(call DELFILE, romfs_testdir.h) -MODULE = CONFIG_EXAMPLES_ROMFS - include $(APPDIR)/Application.mk diff --git a/examples/romfs/romfs_main.c b/examples/romfs/romfs_main.c index fd9f362f6..e15154c4b 100644 --- a/examples/romfs/romfs_main.c +++ b/examples/romfs/romfs_main.c @@ -456,11 +456,7 @@ static void checkdirectories(struct node_s *entry) * Name: romfs_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int romfs_main(int argc, char *argv[]) -#endif { int ret; diff --git a/examples/sendmail/Makefile b/examples/sendmail/Makefile index eabbbb6ea..66914bba1 100644 --- a/examples/sendmail/Makefile +++ b/examples/sendmail/Makefile @@ -37,13 +37,11 @@ include $(TOPDIR)/Make.defs # Sendmail SMTP Example -APPNAME = sendmail +PROGNAME = sendmail +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_SENDMAIL) MAINSRC = sendmail_main.c -CONFIG_XYZ_PROGNAME ?= sendmail$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_SENDMAIL - include $(APPDIR)/Application.mk diff --git a/examples/sendmail/sendmail_main.c b/examples/sendmail/sendmail_main.c index 9330720f0..99ca4fa73 100644 --- a/examples/sendmail/sendmail_main.c +++ b/examples/sendmail/sendmail_main.c @@ -106,11 +106,7 @@ static const char g_msg_body[] = CONFIG_EXAMPLES_SENDMAIL_BODY "\r\n"; * Name: sendmail_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int sendmail_main(int argc, char *argv[]) -#endif { struct in_addr addr; #if defined(CONFIG_EXAMPLES_SENDMAIL_NOMAC) diff --git a/examples/serialblaster/Makefile b/examples/serialblaster/Makefile index 3f6ea4e22..a4c2a8b1c 100644 --- a/examples/serialblaster/Makefile +++ b/examples/serialblaster/Makefile @@ -39,18 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = serialblaster_main.c -CONFIG_XYZ_PROGNAME ?= serialblaster$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # Built-in application info -CONFIG_EXAMPLES_SERIALBLASTER_PRIORITY ?= 50 -CONFIG_EXAMPLES_SERIALBLASTER_STACKSIZE ?= 2048 - -APPNAME = serialblaster +PROGNAME = serialblaster PRIORITY = $(CONFIG_EXAMPLES_SERIALBLASTER_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_SERIALBLASTER_STACKSIZE) - -MODULE = CONFIG_EXAMPLES_SERIALBLASTER +MODULE = $(CONFIG_EXAMPLES_SERIALBLASTER) include $(APPDIR)/Application.mk diff --git a/examples/serialblaster/serialblaster_main.c b/examples/serialblaster/serialblaster_main.c index 36f38e293..624c937bb 100644 --- a/examples/serialblaster/serialblaster_main.c +++ b/examples/serialblaster/serialblaster_main.c @@ -67,11 +67,7 @@ static const char s[] = "abcdefghijklmnopqrstuvwxyz"; * serialblaster_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int serialblaster_main(int argc, char *argv[]) -#endif { int ret; diff --git a/examples/serialrx/Makefile b/examples/serialrx/Makefile index 3e78e67fd..a332b5445 100644 --- a/examples/serialrx/Makefile +++ b/examples/serialrx/Makefile @@ -39,18 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = serialrx_main.c -CONFIG_XYZ_PROGNAME ?= serialrx$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # Built-in application info -CONFIG_EXAMPLES_SERIALRX_PRIORITY ?= 50 -CONFIG_EXAMPLES_SERIALRX_STACKSIZE ?= 2048 - -APPNAME = serialrx +PROGNAME = serialrx PRIORITY = $(CONFIG_EXAMPLES_SERIALRX_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_SERIALRX_STACKSIZE) - -MODULE = CONFIG_EXAMPLES_SERIALRX +MODULE = $(CONFIG_EXAMPLES_SERIALRX) include $(APPDIR)/Application.mk diff --git a/examples/serialrx/serialrx_main.c b/examples/serialrx/serialrx_main.c index 4dc208749..40b051560 100644 --- a/examples/serialrx/serialrx_main.c +++ b/examples/serialrx/serialrx_main.c @@ -65,11 +65,7 @@ * serialrx_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int serialrx_main(int argc, char *argv[]) -#endif { #ifdef CONFIG_EXAMPLES_SERIALRX_BUFFERED FAR FILE *f; diff --git a/examples/serloop/Makefile b/examples/serloop/Makefile index a41e4c91b..d10658e3f 100644 --- a/examples/serloop/Makefile +++ b/examples/serloop/Makefile @@ -37,13 +37,11 @@ include $(TOPDIR)/Make.defs # Mindlessly simple console loopack test -APPNAME = serloop +PROGNAME = serloop +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_SERLOOP) MAINSRC = serloop_main.c -CONFIG_XYZ_PROGNAME ?= serloop$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_SERLOOP - include $(APPDIR)/Application.mk diff --git a/examples/serloop/serloop_main.c b/examples/serloop/serloop_main.c index d2b95afe5..cd087a97f 100644 --- a/examples/serloop/serloop_main.c +++ b/examples/serloop/serloop_main.c @@ -59,11 +59,7 @@ * serloop_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int serloop_main(int argc, char *argv[]) -#endif { #ifdef CONFIG_EXAMPLES_SERLOOP_BUFIO int ch; diff --git a/examples/slcd/Makefile b/examples/slcd/Makefile index d3def576b..868153c4c 100644 --- a/examples/slcd/Makefile +++ b/examples/slcd/Makefile @@ -37,17 +37,13 @@ include $(TOPDIR)/Make.defs # Hello, World! built-in application info -APPNAME = slcd +PROGNAME = slcd PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_SLCD) # Hello, World! Example MAINSRC = slcd_main.c -CONFIG_XYZ_PROGNAME ?= slcd$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_SLCD - include $(APPDIR)/Application.mk diff --git a/examples/slcd/slcd_main.c b/examples/slcd/slcd_main.c index 85f7ec78d..f4838f7e8 100644 --- a/examples/slcd/slcd_main.c +++ b/examples/slcd/slcd_main.c @@ -246,11 +246,7 @@ static void slcd_puts(FAR struct lib_outstream_s *outstream, * slcd_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int slcd_main(int argc, char *argv[]) -#endif { FAR struct slcd_test_s *priv = &g_slcdtest; FAR const char *str = g_slcdhello; diff --git a/examples/smps/Makefile b/examples/smps/Makefile index b8decb642..ff134d007 100644 --- a/examples/smps/Makefile +++ b/examples/smps/Makefile @@ -37,16 +37,11 @@ include $(TOPDIR)/Make.defs # Smps Example -APPNAME = smps - MAINSRC = smps_main.c -CONFIG_EXAMPLES_SMPS_PROGNAME ?= smps$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_SMPS_PROGNAME) - +PROGNAME = smps PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 1024 - -MODULE = CONFIG_EXAMPLES_SMPS +MODULE = $(CONFIG_EXAMPLES_SMPS) include $(APPDIR)/Application.mk diff --git a/examples/smps/smps_main.c b/examples/smps/smps_main.c index d78b1aa8b..97e4f6f64 100644 --- a/examples/smps/smps_main.c +++ b/examples/smps/smps_main.c @@ -445,7 +445,7 @@ static void print_info(struct smps_limits_s *limits, struct smps_params_s *param * Name: smps_main ****************************************************************************/ -int smps_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { struct smps_limits_s smps_limits; struct smps_params_s smps_params; diff --git a/examples/sotest/Makefile b/examples/sotest/Makefile index 8b37be7de..8e8a98eff 100644 --- a/examples/sotest/Makefile +++ b/examples/sotest/Makefile @@ -40,18 +40,16 @@ DELIM ?= / # Shared library example built-in application info -APPNAME = sotest +PROGNAME = sotest PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_SOTEST) # Shared Library Example CSRCS = sot_symtab.c MAINSRC = sotest_main.c -CONFIG_XYZ_PROGNAME ?= sotest$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - ROOTDEPPATH += --dep-path lib # Build targets @@ -64,6 +62,4 @@ context:: clean:: @$(MAKE) -C lib TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) clean -MODULE = CONFIG_EXAMPLES_SOTEST - include $(APPDIR)/Application.mk diff --git a/examples/sotest/sotest_main.c b/examples/sotest/sotest_main.c index 1e2688cb5..f6bedcdf9 100644 --- a/examples/sotest/sotest_main.c +++ b/examples/sotest/sotest_main.c @@ -110,11 +110,7 @@ extern const int g_sot_nexports; * Name: sotest_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int sotest_main(int argc, char *argv[]) -#endif { #if CONFIG_MODLIB_MAXDEPEND > 0 FAR void *handle1; diff --git a/examples/stat/Kconfig b/examples/stat/Kconfig index a179d690e..fb00e3278 100644 --- a/examples/stat/Kconfig +++ b/examples/stat/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_STAT config EXAMPLES_STAT_PROGNAME string "Program name" default "stat" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/stat/Makefile b/examples/stat/Makefile index a15f2a9cf..3101302fb 100644 --- a/examples/stat/Makefile +++ b/examples/stat/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # Stat built-in application info -CONFIG_EXAMPLES_STAT_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_STAT_STACKSIZE ?= 2048 - -APPNAME = stat +PROGNAME = $(CONFIG_EXAMPLES_STAT_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_STAT_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_STAT_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_STAT) # Stat test MAINSRC = stat_main.c -CONFIG_EXAMPLES_STAT_PROGNAME ?= stat$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_STAT_PROGNAME) - -MODULE = CONFIG_EXAMPLES_STAT - include $(APPDIR)/Application.mk diff --git a/examples/stat/stat_main.c b/examples/stat/stat_main.c index d1ec9e47a..b4596dbac 100644 --- a/examples/stat/stat_main.c +++ b/examples/stat/stat_main.c @@ -228,11 +228,7 @@ static void dump_statfs(FAR struct statfs *buf) * stat_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int stat_main(int argc, char *argv[]) -#endif { FAR const char *path; struct stat statbuf; diff --git a/examples/sx127x_demo/Kconfig b/examples/sx127x_demo/Kconfig index 7de72c2ea..14fe86000 100644 --- a/examples/sx127x_demo/Kconfig +++ b/examples/sx127x_demo/Kconfig @@ -4,7 +4,7 @@ # config EXAMPLES_SX127X - bool "SX127x example" + tristate "SX127x example" default n depends on LPWAN_SX127X diff --git a/examples/sx127x_demo/Makefile b/examples/sx127x_demo/Makefile index 09204c3cb..db110665e 100644 --- a/examples/sx127x_demo/Makefile +++ b/examples/sx127x_demo/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = sx127x_demo.c -CONFIG_XYZ_PROGNAME ?= sx127x_demo$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # built-in application info -APPNAME = sx127x +PROGNAME = sx127x PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_SX127X +MODULE = $(CONFIG_EXAMPLES_SX127X) include $(APPDIR)/Application.mk diff --git a/examples/sx127x_demo/sx127x_demo.c b/examples/sx127x_demo/sx127x_demo.c index f5b193c95..44b922f30 100644 --- a/examples/sx127x_demo/sx127x_demo.c +++ b/examples/sx127x_demo/sx127x_demo.c @@ -435,11 +435,7 @@ errout: * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int sx127x_main(int argc, char *argv[]) -#endif { struct sx127x_read_hdr_s data; struct sx127x_chanscan_ioc_s chanscan; diff --git a/examples/system/Kconfig b/examples/system/Kconfig index f89758c79..39ed93cdd 100644 --- a/examples/system/Kconfig +++ b/examples/system/Kconfig @@ -15,7 +15,6 @@ if EXAMPLES_SYSTEM config EXAMPLES_SYSTEM_PROGNAME string "Program name" default "system" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/system/Makefile b/examples/system/Makefile index ed4e8975b..b8737eb5c 100644 --- a/examples/system/Makefile +++ b/examples/system/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # system() built-in application info -CONFIG_EXAMPLES_SYSTEM_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_SYSTEM_STACKSIZE ?= 2048 - -APPNAME = system +PROGNAME = $(CONFIG_EXAMPLES_SYSTEM_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_SYSTEM_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_SYSTEM_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_SYSTEM) # system() Example MAINSRC = system_main.c -CONFIG_EXAMPLES_SYSTEM_PROGNAME ?= system$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_SYSTEM_PROGNAME) - -MODULE = CONFIG_EXAMPLES_SYSTEM - include $(APPDIR)/Application.mk diff --git a/examples/system/system_main.c b/examples/system/system_main.c index 6b69a02af..882e3f493 100644 --- a/examples/system/system_main.c +++ b/examples/system/system_main.c @@ -46,11 +46,7 @@ * Name: system_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int system_main(int argc, char *argv[]) -#endif { printf("Calling system(\"ls -Rl /\")\n"); int ret = system("ls -Rl /"); diff --git a/examples/tcpblaster/Kconfig b/examples/tcpblaster/Kconfig index 14b443c07..8f5c9f892 100644 --- a/examples/tcpblaster/Kconfig +++ b/examples/tcpblaster/Kconfig @@ -21,9 +21,8 @@ config EXAMPLES_TCPBLASTER_SENDSIZE config EXAMPLES_TCPBLASTER_PROGNAME1 string "Target1 program name" - default "tcpserver" if !EXAMPLES_TCPBLASTER_SERVER - default "tcpclient" if EXAMPLES_TCPBLASTER_SERVER - depends on BUILD_KERNEL + default "tcpserver" if EXAMPLES_TCPBLASTER_SERVER + default "tcpclient" if !EXAMPLES_TCPBLASTER_SERVER ---help--- This is the name of the program that will be used when the TcpBlaster program is installed for target1. @@ -90,7 +89,6 @@ config EXAMPLES_TCPBLASTER_PROGNAME2 string "Target2 program name" default "tcpserver" if !EXAMPLES_TCPBLASTER_SERVER default "tcpclient" if EXAMPLES_TCPBLASTER_SERVER - depends on BUILD_KERNEL ---help--- This is the name of the Target2 program that will be used when the NSH ELF program is installed. diff --git a/examples/tcpblaster/Makefile b/examples/tcpblaster/Makefile index 426a54460..6277ca43c 100644 --- a/examples/tcpblaster/Makefile +++ b/examples/tcpblaster/Makefile @@ -55,14 +55,6 @@ MAINSRC = tcpblaster_target1.c # Target 1 Application Info -ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER),y) -CONFIG_EXAMPLES_TCPBLASTER_PROGNAME1 ?= tcpserver -else -CONFIG_EXAMPLES_TCPBLASTER_PROGNAME1 ?= tcpclient -endif -CONFIG_EXAMPLES_TCPBLASTER_PRIORITY1 ?= 100 -CONFIG_EXAMPLES_TCPBLASTER_STACKSIZE1 ?= 2048 - PROGNAME = $(CONFIG_EXAMPLES_TCPBLASTER_PROGNAME1) PRIORITY = $(CONFIG_EXAMPLES_TCPBLASTER_PRIORITY1) STACKSIZE = $(CONFIG_EXAMPLES_TCPBLASTER_STACKSIZE1) @@ -80,28 +72,12 @@ MAINSRC += tcpblaster_target2.c # Target 2 Application Info -ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_SERVER),y) -CONFIG_EXAMPLES_TCPBLASTER_PROGNAME2 ?= tcpclient -else -CONFIG_EXAMPLES_TCPBLASTER_PROGNAME2 ?= tcpserver -endif -CONFIG_EXAMPLES_TCPBLASTER_PRIORITY2 ?= 100 -CONFIG_EXAMPLES_TCPBLASTER_STACKSIZE2 ?= 2048 - PROGNAME += $(CONFIG_EXAMPLES_TCPBLASTER_PROGNAME2) PRIORITY += $(CONFIG_EXAMPLES_TCPBLASTER_PRIORITY2) STACKSIZE += $(CONFIG_EXAMPLES_TCPBLASTER_STACKSIZE2) endif -# All targets - -ifeq ($(CONFIG_EXAMPLES_TCPBLASTER_TARGET2),y) -APPNAME = tcpblaster1 tcpblaster2 -else -APPNAME = tcpblaster -endif - # Host ifneq ($(CONFIG_EXAMPLES_TCPBLASTER_TARGET2),y) @@ -124,47 +100,31 @@ ifneq ($(CONFIG_EXAMPLES_TCPBLASTER_LOOPBACK),y) HOSTOBJEXT ?= hobj HOST_OBJS = $(HOST_SRCS:.c=.$(HOSTOBJEXT)) -endif -endif - # Common build -ifneq ($(CONFIG_EXAMPLES_TCPBLASTER_TARGET2),y) -ifneq ($(CONFIG_EXAMPLES_TCPBLASTER_LOOPBACK),y) - $(HOST_OBJS): %.$(HOSTOBJEXT): %.c @echo "CC: $<" $(Q) $(HOSTCC) -c $(HOSTCFLAGS) $< -o $@ -endif -endif - config.h: $(TOPDIR)/include/nuttx/config.h @echo "CP: $<" $(Q) cp $< $@ -ifneq ($(CONFIG_EXAMPLES_TCPBLASTER_TARGET2),y) -ifneq ($(CONFIG_EXAMPLES_TCPBLASTER_LOOPBACK),y) - $(HOST_BIN): config.h $(HOST_OBJS) @echo "LD: $@" $(Q) $(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@ -endif -endif - context:: config.h $(HOST_BIN) clean:: -ifneq ($(CONFIG_EXAMPLES_TCPBLASTER_TARGET2),y) -ifneq ($(CONFIG_EXAMPLES_TCPBLASTER_LOOPBACK),y) $(call DELFILE, *.$(HOSTOBJEXT)) $(call DELFILE, $(HOST_BIN)) -endif -endif $(call DELFILE, *.dSYM) $(call DELFILE, config.h) -MODULE = CONFIG_EXAMPLES_TCPBLASTER +endif +endif + +MODULE = $(CONFIG_EXAMPLES_TCPBLASTER) include $(APPDIR)/Application.mk diff --git a/examples/tcpblaster/tcpblaster_target1.c b/examples/tcpblaster/tcpblaster_target1.c index 4e1be3158..9bc700047 100644 --- a/examples/tcpblaster/tcpblaster_target1.c +++ b/examples/tcpblaster/tcpblaster_target1.c @@ -69,13 +69,7 @@ static int server_child(int argc, char *argv[]) * tcpblaster_main ****************************************************************************/ -#if defined(BUILD_MODULE) int main(int argc, FAR char *argv[]) -#elif defined(CONFIG_EXAMPLES_TCPBLASTER_TARGET2) -int tcpblaster1_main(int argc, char *argv[]) -#else -int tcpblaster_main(int argc, char *argv[]) -#endif { #ifdef CONFIG_EXAMPLES_TCPBLASTER_LOOPBACK pid_t child; diff --git a/examples/tcpblaster/tcpblaster_target2.c b/examples/tcpblaster/tcpblaster_target2.c index ad9abe03c..d9ace1fc6 100644 --- a/examples/tcpblaster/tcpblaster_target2.c +++ b/examples/tcpblaster/tcpblaster_target2.c @@ -45,11 +45,7 @@ * tcpblaster_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int tcpblaster2_main(int argc, char *argv[]) -#endif { /* Parse any command line options */ diff --git a/examples/tcpecho/Makefile b/examples/tcpecho/Makefile index 58025af2d..d09278c5c 100644 --- a/examples/tcpecho/Makefile +++ b/examples/tcpecho/Makefile @@ -40,15 +40,11 @@ include $(TOPDIR)/Make.defs # Discover built-in application info -APPNAME = tcpecho +PROGNAME = tcpecho PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_TCPECHO) MAINSRC = tcpecho_main.c -CONFIG_XYZ_PROGNAME ?= tcpecho$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_TCPECHO - include $(APPDIR)/Application.mk diff --git a/examples/tcpecho/tcpecho_main.c b/examples/tcpecho/tcpecho_main.c index 8daac53a8..11de8132e 100644 --- a/examples/tcpecho/tcpecho_main.c +++ b/examples/tcpecho/tcpecho_main.c @@ -369,11 +369,7 @@ static int tcpecho_server(void) * tcpecho_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int tcpecho_main(int argc, char *argv[]) -#endif { int ret; diff --git a/examples/telnetd/Makefile b/examples/telnetd/Makefile index b8a21f980..d11bf9a44 100644 --- a/examples/telnetd/Makefile +++ b/examples/telnetd/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = telnetd.c -CONFIG_XYZ_PROGNAME ?= telnetd$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # Buttons built-in application info -APPNAME = telnetd +PROGNAME = telnetd PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_TELNETD +MODULE = $(CONFIG_EXAMPLES_TELNETD) include $(APPDIR)/Application.mk diff --git a/examples/telnetd/telnetd.c b/examples/telnetd/telnetd.c index e774948e8..3e9f17920 100644 --- a/examples/telnetd/telnetd.c +++ b/examples/telnetd/telnetd.c @@ -226,11 +226,7 @@ static void telnetd_netinit(void) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int telnetd_main(int argc, char *argv[]) -#endif { struct telnetd_config_s config; int ret; diff --git a/examples/thttpd/Makefile b/examples/thttpd/Makefile index 1fec57d07..4d4012bc3 100644 --- a/examples/thttpd/Makefile +++ b/examples/thttpd/Makefile @@ -46,8 +46,10 @@ else CONTENT_MAKE += -f Makefile.nxflat endif -CONFIG_XYZ_PROGNAME ?= thttpd$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) +PROGNAME = thttp +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_THTTPD) # Common build @@ -63,6 +65,4 @@ depend:: clean:: @$(CONTENT_MAKE) clean TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV) -MODULE = CONFIG_EXAMPLES_THTTPD - include $(APPDIR)/Application.mk diff --git a/examples/thttpd/content/Makefile.binfs b/examples/thttpd/content/Makefile.binfs index 793dd1e16..2a6052d93 100644 --- a/examples/thttpd/content/Makefile.binfs +++ b/examples/thttpd/content/Makefile.binfs @@ -35,10 +35,7 @@ include $(TOPDIR)/Make.defs -CONFIG_THTTPD_CGI_PRIORITY ?= 100 -CONFIG_THTTPD_CGI_STACKSIZE ?= 2048 - -APPNAME = hello tasks +PROGNAME = hello tasks PRIORITY = $(CONFIG_THTTPD_CGI_PRIORITY) STACKSIZE = $(CONFIG_THTTPD_CGI_STACKSIZE) @@ -50,8 +47,6 @@ ROMFS_HDR = $(CONTENT_DIR)/romfs.h CSRCS = hello.c tasks.c -PROGNAME = hello$(EXEEXT) tasks$(EXEEXT) - ROOTDEPPATH += --dep-path hello --dep-path tasks VPATH += :hello:tasks @@ -87,6 +82,4 @@ clean:: $(call DELFILE, $(ROMFS_IMG)) @rm -rf $(ROMFS_DIR) -MODULE = CONFIG_EXAMPLES_THTTPD - include $(APPDIR)/Application.mk diff --git a/examples/thttpd/thttpd_main.c b/examples/thttpd/thttpd_main.c index 3e1fddaf0..60cca282d 100644 --- a/examples/thttpd/thttpd_main.c +++ b/examples/thttpd/thttpd_main.c @@ -190,11 +190,7 @@ int g_thttpdnsymbols; * thttp_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int thttp_main(int argc, char *argv[]) -#endif { struct in_addr addr; #ifdef CONFIG_EXAMPLES_THTTPD_NOMAC diff --git a/examples/tiff/Makefile b/examples/tiff/Makefile index ee6a39032..7998999ac 100644 --- a/examples/tiff/Makefile +++ b/examples/tiff/Makefile @@ -39,13 +39,9 @@ include $(TOPDIR)/Make.defs MAINSRC = tiff_main.c -CONFIG_XYZ_PROGNAME ?= tiff$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -APPNAME = tiff +PROGNAME = tiff PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_TIFF +MODULE = $(CONFIG_EXAMPLES_TIFF) include $(APPDIR)/Application.mk diff --git a/examples/tiff/tiff_main.c b/examples/tiff/tiff_main.c index 9ff3e9d2e..e7d6a7d38 100644 --- a/examples/tiff/tiff_main.c +++ b/examples/tiff/tiff_main.c @@ -51,11 +51,7 @@ /* Configuration ************************************************************/ /* This is a simple unit test for the TIFF creation library at apps/graphic/tiff. * It is configured to work in the Linux user-mode simulation and has not been - * tested in any other environment. Since the example also depends on some - * other logic to mount a file system, currently it will only work as an NSH - * built-on, i.e., if the following is defined: - * - * CONFIG_NSH_BUILTIN_APPS=y + * tested in any other environment. * * Other configuration options: * @@ -104,11 +100,7 @@ * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int tiff_main(int argc, char *argv[]) -#endif { struct tiff_info_s info; uint8_t strip[3*256]; diff --git a/examples/timer/Kconfig b/examples/timer/Kconfig index 7416f6249..c961d3580 100644 --- a/examples/timer/Kconfig +++ b/examples/timer/Kconfig @@ -43,31 +43,21 @@ config EXAMPLES_TIMER_SIGNO This is the signal number that is used to notify the test of timer expiration events. -config EXAMPLES_TIMER_APPNAME - string "Timer executable name" - default "timer" - depends on NSH_BUILTIN_APPS - ---help--- - This is the name of the built-in application - config EXAMPLES_TIMER_STACKSIZE int "Timer stack size" default 2048 - depends on NSH_BUILTIN_APPS ---help--- This is the stack size allocated when the timer task runs config EXAMPLES_TIMER_PRIORITY int "Timer task priority" default 100 - depends on NSH_BUILTIN_APPS ---help--- This is the priority of the timer task config EXAMPLES_TIMER_PROGNAME string "Timer program name" default "timer" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/timer/Makefile b/examples/timer/Makefile index 859a8e96b..a161ff06b 100644 --- a/examples/timer/Makefile +++ b/examples/timer/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # Timer built-in application info -CONFIG_EXAMPLES_TIMER_APPNAME ?= "timer" -CONFIG_EXAMPLES_TIMER_STACKSIZE ?= 2048 -CONFIG_EXAMPLES_TIMER_PRIORITY ?= 100 -CONFIG_EXAMPLES_TIMER_PROGNAME ?= "timer" - -APPNAME = $(CONFIG_EXAMPLES_TIMER_APPNAME) +PROGNAME = $(CONFIG_EXAMPLES_TIMER_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_TIMER_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_TIMER_STACKSIZE) -PROGNAME = $(CONFIG_EXAMPLES_TIMER_PROGNAME) +MODULE = $(CONFIG_EXAMPLES_TIMER) # Timer example MAINSRC = timer_main.c -MODULE = CONFIG_EXAMPLES_TIMER - include $(APPDIR)/Application.mk diff --git a/examples/timer/timer_main.c b/examples/timer/timer_main.c index 0f9a5b0dc..411d6c0fe 100644 --- a/examples/timer/timer_main.c +++ b/examples/timer/timer_main.c @@ -135,11 +135,7 @@ static void timer_status(int fd) * timer_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int timer_main(int argc, char *argv[]) -#endif { struct timer_notify_s notify; struct sigaction act; diff --git a/examples/touchscreen/Makefile b/examples/touchscreen/Makefile index a933baac2..048af30ac 100644 --- a/examples/touchscreen/Makefile +++ b/examples/touchscreen/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = tc_main.c -CONFIG_XYZ_PROGNAME ?= touchscreen$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # Touchscreen built-in application info -APPNAME = tc +PROGNAME = tc PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_TOUCHSCREEN +MODULE = $(CONFIG_EXAMPLES_TOUCHSCREEN) include $(APPDIR)/Application.mk diff --git a/examples/touchscreen/tc_main.c b/examples/touchscreen/tc_main.c index 2724bf2b5..064d4f54b 100644 --- a/examples/touchscreen/tc_main.c +++ b/examples/touchscreen/tc_main.c @@ -88,11 +88,7 @@ * Name: tc_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int tc_main(int argc, char *argv[]) -#endif { #ifdef CONFIG_EXAMPLES_TOUCHSCREEN_MOUSE struct mouse_report_s sample; diff --git a/examples/udgram/Kconfig b/examples/udgram/Kconfig index 74c39d643..d050a3955 100644 --- a/examples/udgram/Kconfig +++ b/examples/udgram/Kconfig @@ -16,63 +16,42 @@ config EXAMPLES_UDGRAM_ADDR string "Unix domain address" default "/dev/fifo" -config EXAMPLES_UDGRAM_SERVER_APPNAME - string "Server executable name" - default "server" - depends on NSH_BUILTIN_APPS - ---help--- - This is the name of the built-in server application - config EXAMPLES_UDGRAM_SERVER_STACKSIZE int "Server stack size" default 4096 - depends on NSH_BUILTIN_APPS ---help--- This is the stack size allocated when the server task runs config EXAMPLES_UDGRAM_SERVER_PRIORITY int "Server task priority" default 100 - depends on NSH_BUILTIN_APPS ---help--- This is the priority of the server task config EXAMPLES_UDGRAM_SERVER_PROGNAME string "Server program name" default "server" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF server program is installed. -config EXAMPLES_UDGRAM_CLIENT_APPNAME - string "Client executable name" - default "client" - depends on NSH_BUILTIN_APPS - ---help--- - This is the name of the built-in client application - config EXAMPLES_UDGRAM_CLIENT_STACKSIZE int "Client stack size" default 4096 - depends on NSH_BUILTIN_APPS ---help--- This is the stack size allocated when the client task runs config EXAMPLES_UDGRAM_CLIENT_PRIORITY int "Client task priority" default 100 - depends on NSH_BUILTIN_APPS ---help--- This is the priority of the client task config EXAMPLES_UDGRAM_CLIENT_PROGNAME string "Client program name" default "client" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF client program is installed. - endif # EXAMPLES_UDGRAM diff --git a/examples/udgram/Makefile b/examples/udgram/Makefile index e6deb6aa4..5b97fcc52 100644 --- a/examples/udgram/Makefile +++ b/examples/udgram/Makefile @@ -39,20 +39,13 @@ include $(TOPDIR)/Make.defs MAINSRC = udgram_client.c udgram_server.c -PROGNAME = client$(EXEEXT) server$(EXEEXT) -APPNAME = client server - -CONFIG_EXAMPLES_UDGRAM_SERVER_STACKSIZE ?= 4096 -CONFIG_EXAMPLES_UDGRAM_SERVER_PRIORITY ?= SCHED_PRIORITY_DEFAULT - -CONFIG_EXAMPLES_UDGRAM_CLIENT_STACKSIZE ?= 2048 -CONFIG_EXAMPLES_UDGRAM_CLIENT_PRIORITY ?= SCHED_PRIORITY_DEFAULT - +PROGNAME = $(CONFIG_EXAMPLES_UDGRAM_CLIENT_PROGNAME) +PROGNAME += $(CONFIG_EXAMPLES_UDGRAM_SERVER_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_UDGRAM_CLIENT_PRIORITY) PRIORITY += $(CONFIG_EXAMPLES_UDGRAM_SERVER_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_UDGRAM_CLIENT_STACKSIZE) STACKSIZE += $(CONFIG_EXAMPLES_UDGRAM_SERVER_STACKSIZE) -MODULE = CONFIG_EXAMPLES_UDGRAM +MODULE = $(CONFIG_EXAMPLES_UDGRAM) include $(APPDIR)/Application.mk diff --git a/examples/udgram/udgram_client.c b/examples/udgram/udgram_client.c index fb33bcac1..8a70e59db 100644 --- a/examples/udgram/udgram_client.c +++ b/examples/udgram/udgram_client.c @@ -75,11 +75,7 @@ static inline void fill_buffer(unsigned char *buf, int offset) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int client_main(int argc, char *argv[]) -#endif { struct sockaddr_un server; unsigned char outbuf[SENDSIZE]; diff --git a/examples/udgram/udgram_server.c b/examples/udgram/udgram_server.c index 8ea33e8ed..85b50f186 100644 --- a/examples/udgram/udgram_server.c +++ b/examples/udgram/udgram_server.c @@ -82,11 +82,7 @@ static inline int check_buffer(unsigned char *buf) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int server_main(int argc, char *argv[]) -#endif { struct sockaddr_un server; struct sockaddr_un client; diff --git a/examples/udp/Kconfig b/examples/udp/Kconfig index 8bef4bed8..8233d71ad 100644 --- a/examples/udp/Kconfig +++ b/examples/udp/Kconfig @@ -22,7 +22,6 @@ config EXAMPLES_UDP_PROGNAME1 string "Target1 program name" default "udpserver" if EXAMPLES_UDP_SERVER1 default "udpclient" if !EXAMPLES_UDP_SERVER1 - depends on BUILD_LOADABLE ---help--- This is the name of the Target1 program that will be used when the NSH ELF program is installed. @@ -49,9 +48,8 @@ if EXAMPLES_UDP_TARGET2 config EXAMPLES_UDP_PROGNAME2 string "Target2 program name" - default "udpserver" if !EXAMPLES_UDP_SERVER2 - default "udpclient" if EXAMPLES_UDP_SERVER2 - depends on BUILD_LOADABLE + default "udpserver" if !EXAMPLES_UDP_SERVER1 + default "udpclient" if EXAMPLES_UDP_SERVER1 ---help--- This is the name of the Target2 program that will be used when the NSH ELF program is installed. diff --git a/examples/udp/Makefile b/examples/udp/Makefile index fb236c257..74fb8fa99 100644 --- a/examples/udp/Makefile +++ b/examples/udp/Makefile @@ -51,14 +51,6 @@ CSRCS += udp_client.c endif MAINSRC = udp_target1.c -ifeq ($(CONFIG_EXAMPLES_UDP_SERVER1),y) -CONFIG_EXAMPLES_UDP_PROGNAME1 ?= udpserver -else -CONFIG_EXAMPLES_UDP_PROGNAME1 ?= udpclient -endif -CONFIG_EXAMPLES_UDP_PRIORITY1 ?= 100 -CONFIG_EXAMPLES_UDP_STACKSIZE1 ?= 2048 - PROGNAME = $(CONFIG_EXAMPLES_UDP_PROGNAME1) PRIORITY = $(CONFIG_EXAMPLES_UDP_PRIORITY1) STACKSIZE = $(CONFIG_EXAMPLES_UDP_STACKSIZE1) @@ -74,14 +66,6 @@ CSRCS += udp_server.c endif MAINSRC += udp_target2.c -ifeq ($(CONFIG_EXAMPLES_UDP_SERVER1),y) -CONFIG_EXAMPLES_UDP_PROGNAME2 ?= udpclient -else -CONFIG_EXAMPLES_UDP_PROGNAME2 ?= udpserver -endif -CONFIG_EXAMPLES_UDP_PRIORITY2 ?= 100 -CONFIG_EXAMPLES_UDP_STACKSIZE2 ?= 2048 - PROGNAME += $(CONFIG_EXAMPLES_UDP_PROGNAME2) PRIORITY += $(CONFIG_EXAMPLES_UDP_PRIORITY2) STACKSIZE += $(CONFIG_EXAMPLES_UDP_STACKSIZE2) @@ -105,41 +89,30 @@ HOST_BIN = udpserver$(EXEEXT) endif HOST_OBJS = $(HOST_SRCS:.c=.$(HOSTOBJSEXT)) -endif - -ifeq ($(CONFIG_EXAMPLES_UDP_TARGET2),y) -APPNAME = udp1 udp2 -else -APPNAME = udp -endif # Common build -ifneq ($(CONFIG_EXAMPLES_UDP_TARGET2),y) $(HOST_OBJS): %.$(HOSTOBJSEXT): %.c @echo "CC: $<" $(Q) $(HOSTCC) -c $(HOSTCFLAGS) $< -o $@ -endif config.h: $(TOPDIR)/include/nuttx/config.h @echo "CP: $<" $(Q) cp $< $@ -ifneq ($(CONFIG_EXAMPLES_UDP_TARGET2),y) $(HOST_BIN): config.h $(HOST_OBJS) $(Q) $(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@ -endif context:: config.h $(HOST_BIN) clean:: -ifneq ($(CONFIG_EXAMPLES_UDP_TARGET2),y) $(call DELFILE, $(HOST_BIN)) $(call DELFILE, *.$(HOSTOBJSEXT)) -endif $(call DELFILE, *.dSYM) $(call DELFILE, config.h) -MODULE = CONFIG_EXAMPLES_UDP +endif + +MODULE = $(CONFIG_EXAMPLES_UDP) include $(APPDIR)/Application.mk diff --git a/examples/udp/udp_target1.c b/examples/udp/udp_target1.c index cabc78f79..151413729 100644 --- a/examples/udp/udp_target1.c +++ b/examples/udp/udp_target1.c @@ -48,13 +48,7 @@ * udp1_main ****************************************************************************/ -#if defined(BUILD_MODULE) int main(int argc, FAR char *argv[]) -#elif defined(CONFIG_EXAMPLES_UDP_TARGET2) -int udp1_main(int argc, char *argv[]) -#else -int udp_main(int argc, char *argv[]) -#endif { /* Parse any command line options */ diff --git a/examples/udp/udp_target2.c b/examples/udp/udp_target2.c index e0a9ecae9..a73abe809 100644 --- a/examples/udp/udp_target2.c +++ b/examples/udp/udp_target2.c @@ -48,11 +48,7 @@ * udp2_main ****************************************************************************/ -#if defined(BUILD_MODULE) int main(int argc, FAR char *argv[]) -#else -int udp2_main(int argc, char *argv[]) -#endif { /* Parse any command line options */ diff --git a/examples/udpblaster/Kconfig b/examples/udpblaster/Kconfig index 969a8c6ad..f634afef9 100644 --- a/examples/udpblaster/Kconfig +++ b/examples/udpblaster/Kconfig @@ -14,8 +14,7 @@ if EXAMPLES_UDPBLASTER config EXAMPLES_UDPBLASTER_PROGNAME string "Program name" - default "nettest" - depends on BUILD_LOADABLE + default "udpblaster" ---help--- This is the name of the program that will be used when the Nettest program is installed. diff --git a/examples/udpblaster/Makefile b/examples/udpblaster/Makefile index 833709cfe..a981104eb 100644 --- a/examples/udpblaster/Makefile +++ b/examples/udpblaster/Makefile @@ -48,15 +48,9 @@ HOSTOBJEXT ?= .hobj HOST_OBJS = $(HOST_SRCS:.c=$(HOSTOBJEXT)) HOST_BIN = host -CONFIG_UPBLASTER_PROGNAME ?= udpblaster$(EXEEXT) -PROGNAME = $(CONFIG_UPBLASTER_PROGNAME) - # NET test built-in application info -CONFIG_EXAMPLES_UDPBLASTER_STACKSIZE ?= 2048 -CONFIG_EXAMPLES_UDPBLASTER_PRIORITY ?= 100 - -APPNAME = udpblaster +PROGNAME = $(CONFIG_UDPBLASTER_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_UDPBLASTER_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_UDPBLASTER_STACKSIZE) @@ -66,28 +60,25 @@ ifneq ($(CONFIG_EXAMPLES_UDPBLASTER_LOOPBACK),y) $(HOST_OBJS): %$(HOSTOBJEXT): %.c @echo "CC: $<" $(Q) $(HOSTCC) -c $(HOSTCFLAGS) $< -o $@ -endif config.h: $(TOPDIR)/include/nuttx/config.h @echo "CP: $<" $(Q) cp $< $@ -ifneq ($(CONFIG_EXAMPLES_UDPBLASTER_LOOPBACK),y) $(HOST_BIN): config.h $(HOST_OBJS) @echo "LD: $@" $(Q) $(HOSTCC) $(HOSTLDFLAGS) $(HOST_OBJS) -o $@ -endif context:: config.h $(HOST_BIN) clean:: -ifneq ($(CONFIG_EXAMPLES_UDPBLASTER_LOOPBACK),y) $(call DELFILE, *$(HOSTOBJEXT)) $(call DELFILE, $(HOST_BIN)) -endif $(call DELFILE, *.dSYM) $(call DELFILE, config.h) -MODULE = CONFIG_EXAMPLES_UDPBLASTER +endif + +MODULE = $(CONFIG_EXAMPLES_UDPBLASTER) include $(APPDIR)/Application.mk diff --git a/examples/udpblaster/udpblaster_target.c b/examples/udpblaster/udpblaster_target.c index 981d121cb..5b1f45bd5 100644 --- a/examples/udpblaster/udpblaster_target.c +++ b/examples/udpblaster/udpblaster_target.c @@ -194,11 +194,7 @@ static void netest_initialize(void) * udpblaster_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int udpblaster_main(int argc, char *argv[]) -#endif { #ifdef CONFIG_EXAMPLES_UDPBLASTER_IPv4 struct sockaddr_in host; diff --git a/examples/uid/Kconfig b/examples/uid/Kconfig index 3ac13c526..302a66584 100644 --- a/examples/uid/Kconfig +++ b/examples/uid/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_UID config EXAMPLES_UID_PROGNAME string "Program name" default "uid" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/uid/Makefile b/examples/uid/Makefile index 8a2e3dafd..e50e8a031 100644 --- a/examples/uid/Makefile +++ b/examples/uid/Makefile @@ -37,21 +37,13 @@ include $(TOPDIR)/Make.defs # UID/GID built-in application info -CONFIG_EXAMPLES_UID_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_UID_STACKSIZE ?= 2048 - -APPNAME = uid - +PROGNAME = $(CONFIG_EXAMPLES_UID_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_UID_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_UID_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_UID) # UID/GID Example MAINSRC = uid_main.c -CONFIG_EXAMPLES_UID_PROGNAME ?= uid$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_UID_PROGNAME) - -MODULE = CONFIG_EXAMPLES_UID - include $(APPDIR)/Application.mk diff --git a/examples/uid/uid_main.c b/examples/uid/uid_main.c index c21e62b9b..e1026887d 100644 --- a/examples/uid/uid_main.c +++ b/examples/uid/uid_main.c @@ -230,11 +230,7 @@ static void show_group_by_name(FAR const char *gname) * uid_main ****************************************************************************/ -#if defined(BUILD_MODULE) int main(int argc, FAR char *argv[]) -#else -int uid_main(int argc, char *argv[]) -#endif { if (argc < 2) { diff --git a/examples/unionfs/Makefile b/examples/unionfs/Makefile index e1d66cf60..35fb021e5 100644 --- a/examples/unionfs/Makefile +++ b/examples/unionfs/Makefile @@ -37,17 +37,15 @@ include $(TOPDIR)/Make.defs # UNIONFS built-in application info -APPNAME = unionfs +PROGNAME = unionfs PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_UNIONFS) # UNIONFS File System Example MAINSRC = unionfs_main.c -CONFIG_XYZ_PROGNAME ?= unionfs$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # Common build checkgenromfs: @@ -75,6 +73,4 @@ distclean:: $(call DELFILE, atestdir.img) $(call DELFILE, btestdir.img) -MODULE = CONFIG_EXAMPLES_UNIONFS - include $(APPDIR)/Application.mk diff --git a/examples/unionfs/unionfs_main.c b/examples/unionfs/unionfs_main.c index 33f927bbf..aea1fd396 100644 --- a/examples/unionfs/unionfs_main.c +++ b/examples/unionfs/unionfs_main.c @@ -129,11 +129,7 @@ * Name: unionfs_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int unionfs_main(int argc, char *argv[]) -#endif { int ret; diff --git a/examples/usbserial/Makefile b/examples/usbserial/Makefile index 039dcb755..73eb9a9ab 100644 --- a/examples/usbserial/Makefile +++ b/examples/usbserial/Makefile @@ -38,15 +38,11 @@ include $(TOPDIR)/Make.defs # USB serial device example # Built-in application info -APPNAME = usbserial +PROGNAME = usbserial PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_USBSERIAL) MAINSRC = usbserial_main.c -CONFIG_XYZ_PROGNAME ?= usbserial$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_USBSERIAL - include $(APPDIR)/Application.mk diff --git a/examples/usbserial/usbserial_main.c b/examples/usbserial/usbserial_main.c index e491a6538..c4d65708a 100644 --- a/examples/usbserial/usbserial_main.c +++ b/examples/usbserial/usbserial_main.c @@ -191,11 +191,7 @@ static void dumptrace(void) * usbserial_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int usbserial_main(int argc, char *argv[]) -#endif { struct boardioc_usbdev_ctrl_s ctrl; FAR void *handle; diff --git a/examples/userfs/Kconfig b/examples/userfs/Kconfig index 701095d48..38c1f8fe4 100644 --- a/examples/userfs/Kconfig +++ b/examples/userfs/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_USERFS config EXAMPLES_USERFS_PROGNAME string "Program name" default "userfs" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/userfs/Makefile b/examples/userfs/Makefile index ac3d3694e..d7e5bafe4 100644 --- a/examples/userfs/Makefile +++ b/examples/userfs/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # UserFS test application info -CONFIG_EXAMPLES_USERFS_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_USERFS_STACKSIZE ?= 2048 - -APPNAME = userfs +PROGNAME = $(CONFIG_EXAMPLES_USERFS_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_USERFS_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_USERFS_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_USERFS) # UserFS test application source files MAINSRC = userfs_main.c -CONFIG_EXAMPLES_USERFS_PROGNAME ?= userfs$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_USERFS_PROGNAME) - -MODULE = CONFIG_EXAMPLES_USERFS - include $(APPDIR)/Application.mk diff --git a/examples/userfs/userfs_main.c b/examples/userfs/userfs_main.c index b62893159..392c3dfac 100644 --- a/examples/userfs/userfs_main.c +++ b/examples/userfs/userfs_main.c @@ -592,11 +592,7 @@ int ufstest_daemon(int argc, char *argv[]) * userfs_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int userfs_main(int argc, char *argv[]) -#endif { FAR char *nshargv[1]; int pid; diff --git a/examples/usrsocktest/Kconfig b/examples/usrsocktest/Kconfig index 0101a3a16..b0539d202 100644 --- a/examples/usrsocktest/Kconfig +++ b/examples/usrsocktest/Kconfig @@ -20,7 +20,6 @@ if EXAMPLES_USRSOCKTEST config EXAMPLES_USRSOCKTEST_PROGNAME string "Program name" default "usrsocktest" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/usrsocktest/Makefile b/examples/usrsocktest/Makefile index cab0028be..4aed0d009 100644 --- a/examples/usrsocktest/Makefile +++ b/examples/usrsocktest/Makefile @@ -37,12 +37,10 @@ include $(TOPDIR)/Make.defs # USRSOCK Test built-in application info -CONFIG_EXAMPLES_USRSOCKTEST_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_USRSOCKTEST_STACKSIZE ?= 4096 - -APPNAME = usrsocktest +PROGNAME = $(CONFIG_EXAMPLES_USRSOCKTEST_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_USRSOCKTEST_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_USRSOCKTEST_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_USRSOCKTEST) # NuttX USRSOCK Test @@ -58,9 +56,4 @@ CSRCS += usrsocktest_remote_disconnect.c usrsocktest_wake_with_signal.c MAINSRC = usrsocktest_main.c -CONFIG_EXAMPLES_USRSOCKTEST_PROGNAME ?= usrsocktest$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_USRSOCKTEST_PROGNAME) - -MODULE = CONFIG_EXAMPLES_USRSOCKTEST - include $(APPDIR)/Application.mk diff --git a/examples/usrsocktest/usrsocktest_main.c b/examples/usrsocktest/usrsocktest_main.c index 3d95d9b20..f5a3ff8d5 100644 --- a/examples/usrsocktest/usrsocktest_main.c +++ b/examples/usrsocktest/usrsocktest_main.c @@ -246,11 +246,7 @@ bool usrsocktest_assert_print_buf(FAR const char *func, * usrsocktest_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int usrsocktest_main(int argc, char *argv[]) -#endif { struct mallinfo mem_before, mem_after; diff --git a/examples/ustream/Makefile b/examples/ustream/Makefile index b9033d1c3..556afd0b1 100644 --- a/examples/ustream/Makefile +++ b/examples/ustream/Makefile @@ -39,12 +39,9 @@ include $(TOPDIR)/Make.defs MAINSRC = ustream_client.c ustream_server.c -PROGNAME = client$(EXEEXT) server$(EXEEXT) -APPNAME = client server - +PROGNAME = client server PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_USTREAM +MODULE = $(CONFIG_EXAMPLES_USTREAM) include $(APPDIR)/Application.mk diff --git a/examples/ustream/ustream_client.c b/examples/ustream/ustream_client.c index 92c6542dc..313641293 100644 --- a/examples/ustream/ustream_client.c +++ b/examples/ustream/ustream_client.c @@ -55,11 +55,7 @@ * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int client_main(int argc, char *argv[]) -#endif { #ifdef CONFIG_EXAMPLES_USTREAM_USE_POLL struct pollfd pfd; diff --git a/examples/ustream/ustream_server.c b/examples/ustream/ustream_server.c index 5fe1a6bd2..76e7486cf 100644 --- a/examples/ustream/ustream_server.c +++ b/examples/ustream/ustream_server.c @@ -56,11 +56,7 @@ * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int server_main(int argc, char *argv[]) -#endif { #ifdef CONFIG_EXAMPLES_USTREAM_USE_POLL struct pollfd pfd; diff --git a/examples/veml6070/Kconfig b/examples/veml6070/Kconfig index b1ffc3b61..9746821ea 100644 --- a/examples/veml6070/Kconfig +++ b/examples/veml6070/Kconfig @@ -15,7 +15,6 @@ if EXAMPLES_VEML6070 config EXAMPLES_VEML6070_PROGNAME string "Program name" default "veml6070" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/veml6070/Makefile b/examples/veml6070/Makefile index 439080f13..7d0274963 100644 --- a/examples/veml6070/Makefile +++ b/examples/veml6070/Makefile @@ -39,20 +39,13 @@ include $(TOPDIR)/Make.defs # VEML6070 UltraViolet sensor example built-in application info -CONFIG_EXAMPLES_VEML6070_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_VEML6070_STACKSIZE ?= 2048 - -APPNAME = veml6070 +PROGNAME = $(CONFIG_EXAMPLES_VEML6070_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_VEML6070_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_VEML6070_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_VEML6070) # VEML6070 UltraViolet sensor example MAINSRC = veml6070_main.c -CONFIG_EXAMPLES_VEML6070_PROGNAME ?= veml6070$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_VEML6070_PROGNAME) - -MODULE = CONFIG_EXAMPLES_VEML6070 - include $(APPDIR)/Application.mk diff --git a/examples/veml6070/veml6070_main.c b/examples/veml6070/veml6070_main.c index e8f62e1af..d4beb86f0 100644 --- a/examples/veml6070/veml6070_main.c +++ b/examples/veml6070/veml6070_main.c @@ -51,11 +51,7 @@ * veml6070_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int veml6070_main(int argc, char *argv[]) -#endif { int fd; int ret; diff --git a/examples/watchdog/Makefile b/examples/watchdog/Makefile index 764171d1f..80bd911a4 100644 --- a/examples/watchdog/Makefile +++ b/examples/watchdog/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = watchdog_main.c -CONFIG_XYZ_PROGNAME ?= watchdog$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # Touchscreen built-in application info -APPNAME = wdog +PROGNAME = wdog PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_WATCHDOG +MODULE = $(CONFIG_EXAMPLES_WATCHDOG) include $(APPDIR)/Application.mk diff --git a/examples/watchdog/watchdog.h b/examples/watchdog/watchdog.h index 1f5e72404..14b78f57e 100644 --- a/examples/watchdog/watchdog.h +++ b/examples/watchdog/watchdog.h @@ -47,8 +47,7 @@ ****************************************************************************/ /* Configuration ************************************************************/ /* CONFIG_NSH_BUILTIN_APPS - Build the WATCHDOG test as an NSH built-in - * function. Default: Not built! The example can only be used as an NSH - * built-in application + * function. * CONFIG_EXAMPLES_WATCHDOG_DEVPATH - The path to the Watchdog device. * Default: /dev/watchdog0 * CONFIG_EXAMPLES_WATCHDOG_PINGTIME - Time in milliseconds that the example @@ -65,10 +64,6 @@ # error "WATCHDOG device support is not enabled (CONFIG_WATCHDOG)" #endif -#ifndef CONFIG_NSH_BUILTIN_APPS -# warning "The WATCHDOG example only works as an NSH built-in application (CONFIG_NSH_BUILTIN_APPS)" -#endif - #ifndef CONFIG_EXAMPLES_WATCHDOG_DEVPATH # define CONFIG_EXAMPLES_WATCHDOG_DEVPATH "/dev/watchdog0" #endif diff --git a/examples/watchdog/watchdog_main.c b/examples/watchdog/watchdog_main.c index 94da27c10..312f6072a 100644 --- a/examples/watchdog/watchdog_main.c +++ b/examples/watchdog/watchdog_main.c @@ -204,11 +204,7 @@ static void parse_args(FAR struct wdog_example_s *wdog, int argc, FAR char **arg * Name: wdog_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int wdog_main(int argc, char *argv[]) -#endif { struct wdog_example_s wdog; #ifdef CONFIG_DEBUG_WATCHDOG diff --git a/examples/webserver/Makefile b/examples/webserver/Makefile index a73e3c7c2..1a2a247ae 100644 --- a/examples/webserver/Makefile +++ b/examples/webserver/Makefile @@ -40,14 +40,12 @@ include $(TOPDIR)/Make.defs CSRCS = cgi.c httpd_fsdata.c MAINSRC = webserver_main.c -CONFIG_EXAMPLES_WEBSERVER_PROGNAME ?= webserver$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_WEBSERVER_PROGNAME) - # Webserver built-in application info -APPNAME = webserver +PROGNAME = webserver PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_WEBSERVER) # Common build @@ -57,6 +55,4 @@ httpd_fsdata.c: httpd-fs/* clean:: $(call DELFILE, httpd_fsdata.c) -MODULE = CONFIG_EXAMPLES_WEBSERVER - include $(APPDIR)/Application.mk diff --git a/examples/webserver/webserver_main.c b/examples/webserver/webserver_main.c index d16b9f23b..6ec19a5b9 100644 --- a/examples/webserver/webserver_main.c +++ b/examples/webserver/webserver_main.c @@ -95,11 +95,7 @@ * webserver_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int webserver_main(int argc, char *argv[]) -#endif { #ifndef CONFIG_NSH_BUILTIN_APPS /* We are running standalone (as opposed to a NSH built-in app). Therefore diff --git a/examples/wget/Kconfig b/examples/wget/Kconfig index ceb76abbb..437ec9471 100644 --- a/examples/wget/Kconfig +++ b/examples/wget/Kconfig @@ -6,7 +6,7 @@ config EXAMPLES_WGET tristate "wget example" default n - depends on NET_TCP && !NSH_BUILTIN_APPS + depends on NET_TCP ---help--- Enable the wget example diff --git a/examples/wget/Makefile b/examples/wget/Makefile index 85bae21f5..b1906e7f4 100644 --- a/examples/wget/Makefile +++ b/examples/wget/Makefile @@ -39,11 +39,9 @@ include $(TOPDIR)/Make.defs MAINSRC = wget_main.c -APPNAME = wget - -CONFIG_XYZ_PROGNAME ?= wget$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_WGET +PROGNAME = wget +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_WGET) include $(APPDIR)/Application.mk diff --git a/examples/wget/wget_main.c b/examples/wget/wget_main.c index 5cefc51e4..434ab4e7f 100644 --- a/examples/wget/wget_main.c +++ b/examples/wget/wget_main.c @@ -106,11 +106,7 @@ static void callback(FAR char **buffer, int offset, int datend, * Name: wget_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int wget_main(int argc, char *argv[]) -#endif { struct in_addr addr; #if defined(CONFIG_EXAMPLES_WGET_NOMAC) diff --git a/examples/wgetjson/Makefile b/examples/wgetjson/Makefile index 69c50384b..3d953a88b 100644 --- a/examples/wgetjson/Makefile +++ b/examples/wgetjson/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = wgetjson_main.c -CONFIG_XYZ_PROGNAME ?= wgetjson$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # Buttons built-in application info -APPNAME = wgetjson +PROGNAME = wgetjson PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_WGETJSON +MODULE = $(CONFIG_EXAMPLES_WGETJSON) include $(APPDIR)/Application.mk diff --git a/examples/wgetjson/wgetjson_main.c b/examples/wgetjson/wgetjson_main.c index 7d18bcc06..95560a741 100644 --- a/examples/wgetjson/wgetjson_main.c +++ b/examples/wgetjson/wgetjson_main.c @@ -295,11 +295,7 @@ static int wgetjson_json_parse(char *text) * Name: wgetjson_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int wgetjson_main(int argc, char *argv[]) -#endif { char *buffer = NULL; int buffer_len = 512; diff --git a/examples/xbc_test/Kconfig b/examples/xbc_test/Kconfig index c318cfb85..e0d17b28d 100644 --- a/examples/xbc_test/Kconfig +++ b/examples/xbc_test/Kconfig @@ -14,7 +14,6 @@ if EXAMPLES_XBC_TEST config EXAMPLES_XBC_TEST_PROGNAME string "Program name" default "xbc_test" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/examples/xbc_test/Makefile b/examples/xbc_test/Makefile index 306fa8e19..035f4fa38 100644 --- a/examples/xbc_test/Makefile +++ b/examples/xbc_test/Makefile @@ -40,20 +40,13 @@ include $(TOPDIR)/Make.defs # XBox controller driver test built-in application info -CONFIG_EXAMPLES_XBC_TEST_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_EXAMPLES_XBC_TEST_STACKSIZE ?= 2048 - -APPNAME = xbc_test +PROGNAME = $(CONFIG_EXAMPLES_XBC_TEST_PROGNAME) PRIORITY = $(CONFIG_EXAMPLES_XBC_TEST_PRIORITY) STACKSIZE = $(CONFIG_EXAMPLES_XBC_TEST_STACKSIZE) +MODULE = $(CONFIG_EXAMPLES_XBC_TEST) # Xbc_Test, World! Example MAINSRC = xbc_test_main.c -CONFIG_EXAMPLES_XBC_TEST_PROGNAME ?= xbc_test$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_XBC_TEST_PROGNAME) - -MODULE = CONFIG_EXAMPLES_XBC_TEST - include $(APPDIR)/Application.mk diff --git a/examples/xbc_test/xbc_test_main.c b/examples/xbc_test/xbc_test_main.c index bef656cb8..ddbdb0bb7 100644 --- a/examples/xbc_test/xbc_test_main.c +++ b/examples/xbc_test/xbc_test_main.c @@ -79,11 +79,7 @@ * hello_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int xbc_test_main(int argc, char *argv[]) -#endif { char buffer[256]; ssize_t nbytes; diff --git a/examples/xmlrpc/Makefile b/examples/xmlrpc/Makefile index c3e862f0e..481d92ef3 100644 --- a/examples/xmlrpc/Makefile +++ b/examples/xmlrpc/Makefile @@ -40,16 +40,12 @@ include $(TOPDIR)/Make.defs # XML RPC built-in application info -APPNAME = xmlrpc +PROGNAME = xmlrpc PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_EXAMPLES_XMLRPC) CSRCS = calls.c MAINSRC = xmlrpc_main.c -CONFIG_XYZ_PROGNAME ?= xmlrpc$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_EXAMPLES_XMLRPC - include $(APPDIR)/Application.mk diff --git a/examples/xmlrpc/xmlrpc_main.c b/examples/xmlrpc/xmlrpc_main.c index 996e59244..d6b195669 100644 --- a/examples/xmlrpc/xmlrpc_main.c +++ b/examples/xmlrpc/xmlrpc_main.c @@ -372,11 +372,7 @@ static int xmlrpc_netinit(void) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int xmlrpc_main(int argc, char *argv[]) -#endif { int listenfd, connfd, on = 1; socklen_t clilen; diff --git a/examples/zerocross/Makefile b/examples/zerocross/Makefile index 2b93de150..a4eb3aff8 100644 --- a/examples/zerocross/Makefile +++ b/examples/zerocross/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = zerocross_main.c -CONFIG_EXAMPLES_ZEROCROSS_PROGNAME ?= zerocross$(EXEEXT) -PROGNAME = $(CONFIG_EXAMPLES_ZEROCROSS_PROGNAME) - # Buttons built-in application info -APPNAME = zerocross +PROGNAME = zerocross PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_EXAMPLES_ZEROCROSS +MODULE = $(CONFIG_EXAMPLES_ZEROCROSS) include $(APPDIR)/Application.mk diff --git a/examples/zerocross/zerocross_main.c b/examples/zerocross/zerocross_main.c index 9aeb5ef1e..16b7c7a41 100644 --- a/examples/zerocross/zerocross_main.c +++ b/examples/zerocross/zerocross_main.c @@ -82,11 +82,7 @@ * zerocross_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int zerocross_main(int argc, char *argv[]) -#endif { struct sigevent event; int fd; diff --git a/graphics/nxwidgets/UnitTests/CButton/Makefile b/graphics/nxwidgets/UnitTests/CButton/Makefile index 20632d353..dd14d2dd8 100644 --- a/graphics/nxwidgets/UnitTests/CButton/Makefile +++ b/graphics/nxwidgets/UnitTests/CButton/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = cbuttontest.cxx MAINSRC = cbutton_main.cxx -APPNAME = cbutton +PROGNAME = cbutton PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CBUTTON +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CBUTTON) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx b/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx index f1d95cc86..7032d98b7 100644 --- a/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx +++ b/graphics/nxwidgets/UnitTests/CButton/cbutton_main.cxx @@ -68,7 +68,7 @@ static const char g_pushme[] = "Push Me"; // Suppress name-mangling -extern "C" int cbutton_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Public Functions @@ -78,7 +78,7 @@ extern "C" int cbutton_main(int argc, char *argv[]); // nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int cbutton_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Create an instance of the font test diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/Makefile b/graphics/nxwidgets/UnitTests/CButtonArray/Makefile index 0a6b8ebcd..1ce356181 100644 --- a/graphics/nxwidgets/UnitTests/CButtonArray/Makefile +++ b/graphics/nxwidgets/UnitTests/CButtonArray/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = cbuttonarraytest.cxx MAINSRC = cbuttonarray_main.cxx -APPNAME = cbuttonarray +PROGNAME = cbuttonarray PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CBUTTONARRAY +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CBUTTONARRAY) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx index 627900578..975ec5cde 100644 --- a/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx +++ b/graphics/nxwidgets/UnitTests/CButtonArray/cbuttonarray_main.cxx @@ -82,7 +82,7 @@ static FAR const char *g_buttonLabels[BUTTONARRAY_NCOLUMNS*BUTTONARRAY_NROWS] = // Suppress name-mangling -extern "C" int cbuttonarray_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -196,7 +196,7 @@ static void checkHighlighting(CButtonArray *buttonArray) // nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int cbuttonarray_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Initialize memory monitor logic diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/Makefile b/graphics/nxwidgets/UnitTests/CCheckBox/Makefile index be4a51a55..9a8ecc8a9 100644 --- a/graphics/nxwidgets/UnitTests/CCheckBox/Makefile +++ b/graphics/nxwidgets/UnitTests/CCheckBox/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = ccheckboxtest.cxx MAINSRC = ccheckbox_main.cxx -APPNAME = ccheckbox +PROGNAME = ccheckbox PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CCHECKBOX +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CCHECKBOX) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx index 642e6a0d5..83f6ad55e 100644 --- a/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx +++ b/graphics/nxwidgets/UnitTests/CCheckBox/ccheckbox_main.cxx @@ -73,7 +73,7 @@ static unsigned int g_mmprevious; // Suppress name-mangling -extern "C" int ccheckbox_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -135,7 +135,7 @@ static void initMemoryUsage(void) // Name: nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int ccheckbox_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Initialize memory monitor logic diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile b/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile index fe423c32d..2d867aacb 100644 --- a/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile +++ b/graphics/nxwidgets/UnitTests/CGlyphButton/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = cglyphbuttontest.cxx MAINSRC = cglyphbutton_main.cxx -APPNAME = cglyphbutton +PROGNAME = cglyphbutton PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CGLYPHBUTTON +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CGLYPHBUTTON) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx index 9f59e9d48..a6b2e36f1 100644 --- a/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx +++ b/graphics/nxwidgets/UnitTests/CGlyphButton/cglyphbutton_main.cxx @@ -72,7 +72,7 @@ static unsigned int g_mmprevious; // Suppress name-mangling -extern "C" int cglyphbutton_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -134,7 +134,7 @@ static void initMemoryUsage(void) // nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int cglyphbutton_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Initialize memory monitor logic diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile index 92191a6f9..0d27f1629 100644 --- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile +++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = cglyphsliderhorizontaltest.cxx MAINSRC = cglyphsliderhorizontal_main.cxx -APPNAME = cglyphsliderhorizontal +PROGNAME = cglyphsliderhorizontal PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CGLYPHSLIDERHORIZONTAL +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CGLYPHSLIDERHORIZONTAL) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx index 282691ac0..be04e46d7 100644 --- a/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx +++ b/graphics/nxwidgets/UnitTests/CGlyphSliderHorizontal/cglyphsliderhorizontal_main.cxx @@ -73,7 +73,7 @@ static unsigned int g_mmprevious; // Suppress name-mangling -extern "C" int cglyphsliderhorizontal_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -135,7 +135,7 @@ static void initMemoryUsage(void) // Name: nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int cglyphsliderhorizontal_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Initialize memory monitor logic diff --git a/graphics/nxwidgets/UnitTests/CImage/Makefile b/graphics/nxwidgets/UnitTests/CImage/Makefile index 0f1fb2aa7..2590b2fa6 100644 --- a/graphics/nxwidgets/UnitTests/CImage/Makefile +++ b/graphics/nxwidgets/UnitTests/CImage/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = cimagetest.cxx MAINSRC = cimage_main.cxx -APPNAME = cimage +PROGNAME = cimage PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CIMAGE +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CIMAGE) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx b/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx index e2b921ddf..e2e38958a 100644 --- a/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx +++ b/graphics/nxwidgets/UnitTests/CImage/cimage_main.cxx @@ -73,7 +73,7 @@ static struct mallinfo g_mmprevious; // Suppress name-mangling -extern "C" int cimage_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -149,7 +149,7 @@ static void initMemoryUsage(void) // Name: nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int cimage_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Initialize memory monitor logic diff --git a/graphics/nxwidgets/UnitTests/CKeypad/Makefile b/graphics/nxwidgets/UnitTests/CKeypad/Makefile index 688152faf..5ddf35baf 100644 --- a/graphics/nxwidgets/UnitTests/CKeypad/Makefile +++ b/graphics/nxwidgets/UnitTests/CKeypad/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = ckeypadtest.cxx MAINSRC = ckeypad_main.cxx -APPNAME = ckeypad +PROGNAME = ckeypad PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CKEYPAD +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CKEYPAD) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx b/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx index 5c28d1b6c..0ac2f6c74 100644 --- a/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx +++ b/graphics/nxwidgets/UnitTests/CKeypad/ckeypad_main.cxx @@ -72,7 +72,7 @@ static unsigned int g_mmPeak; // Suppress name-mangling -extern "C" int ckeypad_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -192,7 +192,7 @@ static void clickButtons(CKeypadTest *test, CKeypad *keypad) // nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int ckeypad_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Initialize memory monitor logic diff --git a/graphics/nxwidgets/UnitTests/CLabel/Makefile b/graphics/nxwidgets/UnitTests/CLabel/Makefile index 60799cb20..76d581f70 100644 --- a/graphics/nxwidgets/UnitTests/CLabel/Makefile +++ b/graphics/nxwidgets/UnitTests/CLabel/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = clabeltest.cxx MAINSRC = clabel_main.cxx -APPNAME = clabel +PROGNAME = clabel PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CLABEL +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CLABEL) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx b/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx index 77f894f5f..4fdfaa65c 100644 --- a/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx +++ b/graphics/nxwidgets/UnitTests/CLabel/clabel_main.cxx @@ -68,7 +68,7 @@ static const char g_hello[] = "Hello, World!"; // Suppress name-mangling -extern "C" int clabel_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Public Functions @@ -78,7 +78,7 @@ extern "C" int clabel_main(int argc, char *argv[]); // nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int clabel_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Create an instance of the font test diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/Makefile b/graphics/nxwidgets/UnitTests/CLatchButton/Makefile index 91b7b9f0e..1b1b6c9f9 100644 --- a/graphics/nxwidgets/UnitTests/CLatchButton/Makefile +++ b/graphics/nxwidgets/UnitTests/CLatchButton/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = clatchbuttontest.cxx MAINSRC = clatchbutton_main.cxx -APPNAME = clatchbutton +PROGNAME = clatchbutton PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTON +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTON) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx index ea19a3641..9366d70e0 100644 --- a/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx +++ b/graphics/nxwidgets/UnitTests/CLatchButton/clatchbutton_main.cxx @@ -68,7 +68,7 @@ static const char g_pushme[] = "Push Me"; // Suppress name-mangling -extern "C" int clatchbutton_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -106,7 +106,7 @@ static void showButtonState(CLatchButton *button, bool &clicked, bool &latched) // nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int clatchbutton_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Create an instance of the font test diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile index 158cc0877..5c841d01d 100644 --- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile +++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = clatchbuttonarraytest.cxx MAINSRC = clatchbuttonarray_main.cxx -APPNAME = clatchbuttonarray +PROGNAME = clatchbuttonarray PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTONARRAY +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CLATCHBUTTONARRAY) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx index 161b86d16..384721f0d 100644 --- a/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx +++ b/graphics/nxwidgets/UnitTests/CLatchButtonArray/clatchbuttonarray_main.cxx @@ -82,7 +82,7 @@ static FAR const char *g_buttonLabels[BUTTONARRAY_NCOLUMNS*BUTTONARRAY_NROWS] = // Suppress name-mangling -extern "C" int clatchbuttonarray_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -174,7 +174,7 @@ static void initMemoryUsage(void) // nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int clatchbuttonarray_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Initialize memory monitor logic diff --git a/graphics/nxwidgets/UnitTests/CListBox/Makefile b/graphics/nxwidgets/UnitTests/CListBox/Makefile index 60a486a60..16bb21691 100644 --- a/graphics/nxwidgets/UnitTests/CListBox/Makefile +++ b/graphics/nxwidgets/UnitTests/CListBox/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = clistboxtest.cxx MAINSRC = clistbox_main.cxx -APPNAME = clistbox +PROGNAME = clistbox PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CLISTBOX +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CLISTBOX) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx b/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx index db42c4505..2a953c6fc 100644 --- a/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx +++ b/graphics/nxwidgets/UnitTests/CListBox/clistbox_main.cxx @@ -108,7 +108,7 @@ static FAR const char *g_options[] = // Suppress name-mangling -extern "C" int clistbox_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -174,7 +174,7 @@ static void initMemoryUsage(void) // Name: clistbox_main ///////////////////////////////////////////////////////////////////////////// -int clistbox_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Initialize memory monitor logic diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/Makefile b/graphics/nxwidgets/UnitTests/CProgressBar/Makefile index c41fa80a5..8da227c37 100644 --- a/graphics/nxwidgets/UnitTests/CProgressBar/Makefile +++ b/graphics/nxwidgets/UnitTests/CProgressBar/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = cprogressbartest.cxx MAINSRC = cprogressbar_main.cxx -APPNAME = cprogressbar +PROGNAME = cprogressbar PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CPROGRESSBAR +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CPROGRESSBAR) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx index fd436a58e..09705c64c 100644 --- a/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx +++ b/graphics/nxwidgets/UnitTests/CProgressBar/cprogressbar_main.cxx @@ -73,7 +73,7 @@ static unsigned int g_mmprevious; // Suppress name-mangling -extern "C" int cprogressbar_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -135,7 +135,7 @@ static void initMemoryUsage(void) // Name: nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int cprogressbar_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Initialize memory monitor logic diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/Makefile b/graphics/nxwidgets/UnitTests/CRadioButton/Makefile index 29c9c7467..bb4367e80 100644 --- a/graphics/nxwidgets/UnitTests/CRadioButton/Makefile +++ b/graphics/nxwidgets/UnitTests/CRadioButton/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = cradiobuttontest.cxx MAINSRC = cradiobutton_main.cxx -APPNAME = cradiobutton +PROGNAME = cradiobutton PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CRADIOBUTTON +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CRADIOBUTTON) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx index b89f8555a..83e3ed8a2 100644 --- a/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx +++ b/graphics/nxwidgets/UnitTests/CRadioButton/cradiobutton_main.cxx @@ -73,7 +73,7 @@ static unsigned int g_mmprevious; // Suppress name-mangling -extern "C" int cradiobutton_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -135,7 +135,7 @@ static void initMemoryUsage(void) // Name: nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int cradiobutton_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Initialize memory monitor logic diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile index 31888a2dc..385d7af70 100644 --- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile +++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = cscrollbarhorizontaltest.cxx MAINSRC = cscrollbarhorizontal_main.cxx -APPNAME = cscrollbarhorizontal +PROGNAME = cscrollbarhorizontal PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARHORIZONTAL +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARHORIZONTAL) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx index 4b163f69f..212a161aa 100644 --- a/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx +++ b/graphics/nxwidgets/UnitTests/CScrollbarHorizontal/cscrollbarhorizontal_main.cxx @@ -73,7 +73,7 @@ static unsigned int g_mmprevious; // Suppress name-mangling -extern "C" int cscrollbarhorizontal_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -135,7 +135,7 @@ static void initMemoryUsage(void) // Name: nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int cscrollbarhorizontal_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Initialize memory monitor logic diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile index 3c9255480..b8fa301e7 100644 --- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile +++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = cscrollbarverticaltest.cxx MAINSRC = cscrollbarvertical_main.cxx -APPNAME = cscrollbarvertical +PROGNAME = cscrollbarvertical PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARVERTICAL +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CSCROLLBARVERTICAL) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx index 6dc61bf9f..f9fa1af22 100644 --- a/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx +++ b/graphics/nxwidgets/UnitTests/CScrollbarVertical/cscrollbarvertical_main.cxx @@ -73,7 +73,7 @@ static unsigned int g_mmprevious; // Suppress name-mangling -extern "C" int cscrollbarvertical_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -135,7 +135,7 @@ static void initMemoryUsage(void) // Name: nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int cscrollbarvertical_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Initialize memory monitor logic diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile index 7f3475d34..f102be7fe 100644 --- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile +++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = csliderhorizontaltest.cxx MAINSRC = csliderhorizontal_main.cxx -APPNAME = csliderhorizontal +PROGNAME = csliderhorizontal PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CSLIDERHORIZONAL +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CSLIDERHORIZONAL) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx index 676f33ec6..cf909a347 100644 --- a/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx +++ b/graphics/nxwidgets/UnitTests/CSliderHorizonal/csliderhorizontal_main.cxx @@ -73,7 +73,7 @@ static unsigned int g_mmprevious; // Suppress name-mangling -extern "C" int csliderhorizontal_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -135,7 +135,7 @@ static void initMemoryUsage(void) // Name: nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int csliderhorizontal_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Initialize memory monitor logic diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile b/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile index 5d394b66e..9a3a43329 100644 --- a/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile +++ b/graphics/nxwidgets/UnitTests/CSliderVertical/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = csliderverticaltest.cxx MAINSRC = cslidervertical_main.cxx -APPNAME = cslidervertical +PROGNAME = cslidervertical PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CSLIDERVERTICAL +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CSLIDERVERTICAL) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx b/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx index 14abe2efc..7f5de6818 100644 --- a/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx +++ b/graphics/nxwidgets/UnitTests/CSliderVertical/cslidervertical_main.cxx @@ -73,7 +73,7 @@ static unsigned int g_mmprevious; // Suppress name-mangling -extern "C" int cslidervertical_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Private Functions @@ -135,7 +135,7 @@ static void initMemoryUsage(void) // Name: nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int cslidervertical_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Initialize memory monitor logic diff --git a/graphics/nxwidgets/UnitTests/CTextBox/Makefile b/graphics/nxwidgets/UnitTests/CTextBox/Makefile index fccae305e..1d90b8879 100644 --- a/graphics/nxwidgets/UnitTests/CTextBox/Makefile +++ b/graphics/nxwidgets/UnitTests/CTextBox/Makefile @@ -40,10 +40,9 @@ include $(TOPDIR)/Make.defs CXXSRCS = ctextboxtest.cxx MAINSRC = ctextbox_main.cxx -APPNAME = ctextbox +PROGNAME = ctextbox PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_NXWIDGETS_UNITTEST_CTEXTBOX +MODULE = $(CONFIG_NXWIDGETS_UNITTEST_CTEXTBOX) include $(APPDIR)/Application.mk diff --git a/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx b/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx index 64d24b8b0..5bcad79b5 100644 --- a/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx +++ b/graphics/nxwidgets/UnitTests/CTextBox/ctextbox_main.cxx @@ -69,7 +69,7 @@ static const char string2[] = "\b\b\bn Doe\r"; // Suppress name-mangling -extern "C" int ctextbox_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Public Functions @@ -79,7 +79,7 @@ extern "C" int ctextbox_main(int argc, char *argv[]); // nxheaders_main ///////////////////////////////////////////////////////////////////////////// -int ctextbox_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { // Create an instance of the font test diff --git a/graphics/nxwm/Makefile b/graphics/nxwm/Makefile index 9528956c7..856320f89 100644 --- a/graphics/nxwm/Makefile +++ b/graphics/nxwm/Makefile @@ -35,6 +35,11 @@ include $(TOPDIR)/Make.defs +PROGNAME = nxwm +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_NXWM) + # Window Manager MAINSRC = nxwm_main.cxx diff --git a/graphics/nxwm/src/nxwm_main.cxx b/graphics/nxwm/src/nxwm_main.cxx index bf8ba18f8..c62662819 100644 --- a/graphics/nxwm/src/nxwm_main.cxx +++ b/graphics/nxwm/src/nxwm_main.cxx @@ -102,7 +102,7 @@ static struct SNxWmTest g_nxwmtest; // Suppress name-mangling -extern "C" int nxwm_main(int argc, char *argv[]); +extern "C" int main(int argc, char *argv[]); ///////////////////////////////////////////////////////////////////////////// // Public Functions @@ -500,7 +500,7 @@ static bool createMediaPlayer(void) // nxwm_main ///////////////////////////////////////////////////////////////////////////// -int nxwm_main(int argc, char *argv[]) +int main(int argc, char *argv[]) { #if defined(CONFIG_HAVE_CXX) && defined(CONFIG_HAVE_CXXINITIALIZE) // Call all C++ static constructors diff --git a/graphics/screenshot/Makefile b/graphics/screenshot/Makefile index bd31fcd48..bdd7c0e2c 100644 --- a/graphics/screenshot/Makefile +++ b/graphics/screenshot/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = screenshot_main.c -CONFIG_XYZ_PROGNAME ?= screenshot$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # TIFF screen built-in application info -APPNAME = screenshot +PROGNAME = screenshot PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 4096 - -MODULE = CONFIG_GRAPHICS_SCREENSHOT +MODULE = $(CONFIG_GRAPHICS_SCREENSHOT) include $(APPDIR)/Application.mk diff --git a/graphics/screenshot/screenshot_main.c b/graphics/screenshot/screenshot_main.c index b251d6dc2..ff481722c 100644 --- a/graphics/screenshot/screenshot_main.c +++ b/graphics/screenshot/screenshot_main.c @@ -245,11 +245,7 @@ int save_screenshot(FAR const char *filename) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int screenshot_main(int argc, char *argv[]) -#endif { if (argc != 2) { diff --git a/graphics/traveler/Makefile b/graphics/traveler/Makefile index 9d613236c..cd5553fb6 100644 --- a/graphics/traveler/Makefile +++ b/graphics/traveler/Makefile @@ -44,9 +44,10 @@ TRAVELER_TOOLS = $(TRAVELER_DIR)/tools # Traveler built-in application info -APPNAME = traveler +PROGNAME = traveler PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_GRAPHICS_TRAVELER) # Traveler files @@ -72,9 +73,6 @@ ROMFS_IMG = trv_romfs.img ROMFS_HDR = trv_romfs.h endif -CONFIG_GRAPHICS_TRAVELER_PROGNAME ?= hello$(EXEEXT) -PROGNAME = $(CONFIG_GRAPHICS_TRAVELER_PROGNAME) - CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" $(TRAVELER_INC)} DEPPATH += --dep-path src @@ -99,6 +97,4 @@ clean:: $(call DELFILE, $(ROMFS_IMG)) $(call DELFILE, $(ROMFS_HDR)) -MODULE = CONFIG_GRAPHICS_TRAVELER - include $(APPDIR)/Application.mk diff --git a/graphics/traveler/src/trv_main.c b/graphics/traveler/src/trv_main.c index 783609d84..d17ee8231 100644 --- a/graphics/traveler/src/trv_main.c +++ b/graphics/traveler/src/trv_main.c @@ -244,11 +244,7 @@ errout: * Description: ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int traveler_main(int argc, char *argv[]) -#endif { FAR const char *wldpath; FAR const char *wldfile; diff --git a/graphics/twm4nx/Kconfig b/graphics/twm4nx/Kconfig index 25b6de80f..2d27f3885 100644 --- a/graphics/twm4nx/Kconfig +++ b/graphics/twm4nx/Kconfig @@ -22,7 +22,6 @@ comment "Twm4Nx Core Configuration" config TWM4NX_PROGNAME string "Twm4Nx program name" default "twm4nx" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/graphics/twm4nx/Makefile b/graphics/twm4nx/Makefile index 789a6845c..685e14273 100644 --- a/graphics/twm4nx/Makefile +++ b/graphics/twm4nx/Makefile @@ -41,13 +41,11 @@ CXXFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" "$(APPDIR)/graphics/nxglyphs/ # Twm4Nx built-in application info -CONFIG_TWM4NX_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_TWM4NX_STACKSIZE ?= 2048 - -APPNAME = twm4nx - +PROGNAME = $(CONFIG_TWM4NX_PROGNAME) PRIORITY = $(CONFIG_TWM4NX_PRIORITY) STACKSIZE = $(CONFIG_TWM4NX_STACKSIZE) +MODULE = $(CONFIG_GRAPHICS_TWM4NX) + # Twm4Nx @@ -77,9 +75,4 @@ MAINSRC = ctwm4nx.cxx VPATH = src:apps -CONFIG_TWM4NX_PROGNAME ?= hello$(EXEEXT) -PROGNAME = $(CONFIG_TWM4NX_PROGNAME) - -MODULE = CONFIG_GRAPHICS_TWM4NX - include $(APPDIR)/Application.mk diff --git a/graphics/twm4nx/src/twm4nx_main.cxx b/graphics/twm4nx/src/twm4nx_main.cxx index 9e0ad80b4..ae41de9fc 100644 --- a/graphics/twm4nx/src/twm4nx_main.cxx +++ b/graphics/twm4nx/src/twm4nx_main.cxx @@ -64,11 +64,7 @@ // Suppress name-mangling -#ifdef BUILD_MODULE extern "C" int main(int argc, FAR char *argv[]); -#else -extern "C" int twm4nx_main(int argc, char *argv[]); -#endif ///////////////////////////////////////////////////////////////////////////// // Public Functions @@ -84,11 +80,7 @@ using namespace Twm4Nx; // ///////////////////////////////////////////////////////////////////////////// -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int twm4nx_main(int argc, char *argv[]) -#endif { int display = 0; diff --git a/industry/abnt_codi/Kconfig b/industry/abnt_codi/Kconfig index 7fd33b605..9a7ed0ca6 100644 --- a/industry/abnt_codi/Kconfig +++ b/industry/abnt_codi/Kconfig @@ -4,7 +4,7 @@ # config INDUSTRY_ABNT_CODI_LIB - tristate "ABNT CODI Library" + bool "ABNT CODI Library" default n ---help--- Enable or disable the ABNT CODI Library diff --git a/interpreters/bas/Makefile b/interpreters/bas/Makefile index 2282d609d..2f6501932 100644 --- a/interpreters/bas/Makefile +++ b/interpreters/bas/Makefile @@ -46,17 +46,11 @@ endif MAINSRC = bas_main.c -PROGNAME = bas$(EXEEXT) - # BAS built-in application info -CONFIG_INTERPRETER_BAS_PRIORITY ?= 100 -CONFIG_INTERPRETER_BAS_STACKSIZE ?= 4096 - -APPNAME = bas +PROGNAME = bas PRIORITY = $(CONFIG_INTERPRETER_BAS_PRIORITY) STACKSIZE = $(CONFIG_INTERPRETER_BAS_STACKSIZE) - -MODULE = CONFIG_INTERPRETERS_BAS +MODULE = $(CONFIG_INTERPRETERS_BAS) include $(APPDIR)/Application.mk diff --git a/interpreters/bas/bas_main.c b/interpreters/bas/bas_main.c index 324bf6121..4e357f362 100644 --- a/interpreters/bas/bas_main.c +++ b/interpreters/bas/bas_main.c @@ -82,11 +82,7 @@ * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int bas_main(int argc, char *argv[]) -#endif { char *runFile = (char *)0; const char *lp = "/dev/null"; diff --git a/interpreters/minibasic/Makefile b/interpreters/minibasic/Makefile index e5b4583fd..13c721e07 100644 --- a/interpreters/minibasic/Makefile +++ b/interpreters/minibasic/Makefile @@ -41,17 +41,11 @@ CSRCS = basic.c MAINSRC = script.c -PROGNAME = basic - # Mini Basic built-in application info -CONFIG_INTERPRETER_MINIBASIC_PRIORITY ?= 100 -CONFIG_INTERPRETER_MINIBASIC_STACKSIZE ?= 4096 - -APPNAME = basic$(EXEEXT) +PROGNAME = basic PRIORITY = $(CONFIG_INTERPRETER_MINIBASIC_PRIORITY) STACKSIZE = $(CONFIG_INTERPRETER_MINIBASIC_STACKSIZE) - -MODULE = CONFIG_INTERPRETERS_MINIBASIC +MODULE = $(CONFIG_INTERPRETERS_MINIBASIC) include $(APPDIR)/Application.mk diff --git a/interpreters/minibasic/script.c b/interpreters/minibasic/script.c index 8ef07c8f1..87531a38c 100644 --- a/interpreters/minibasic/script.c +++ b/interpreters/minibasic/script.c @@ -151,11 +151,7 @@ static void usage(void) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int basic_main(int argc, char *argv[]) -#endif { FAR char *scr; diff --git a/netutils/libcurl4nx/Kconfig b/netutils/libcurl4nx/Kconfig index c1f8765d3..173737771 100644 --- a/netutils/libcurl4nx/Kconfig +++ b/netutils/libcurl4nx/Kconfig @@ -4,7 +4,7 @@ # config NETUTILS_LIBCURL4NX - tristate "cURL4nx HTTP client library" + bool "cURL4nx HTTP client library" default n depends on NET_TCP select LIBC_NETDB diff --git a/netutils/thttpd/Kconfig b/netutils/thttpd/Kconfig index d46c18097..0b36c3959 100644 --- a/netutils/thttpd/Kconfig +++ b/netutils/thttpd/Kconfig @@ -4,7 +4,7 @@ # config NETUTILS_THTTPD - tristate "THTTPD webserver" + bool "THTTPD webserver" default n depends on NXFLAT || FS_BINFS ---help--- diff --git a/netutils/thttpd/Makefile b/netutils/thttpd/Makefile index 950925174..c950650fd 100644 --- a/netutils/thttpd/Makefile +++ b/netutils/thttpd/Makefile @@ -39,13 +39,9 @@ include $(TOPDIR)/Make.defs ifeq ($(CONFIG_NET_TCP),y) CSRCS += libhttpd.c thttpd_cgi.c thttpd_alloc.c thttpd_strings.c timers.c - CSRCS += fdwatch.c tdate_parse.c - MAINSRC += thttpd.c + CSRCS += fdwatch.c tdate_parse.c thttpd.c endif -CONFIG_XYZ_PROGNAME ?= thttpd$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # CGI binaries (examples only, not used in the build) ifeq ($(CONFIG_THTTPD_NXFLAT),y) @@ -59,19 +55,12 @@ ifeq ($(CONFIG_THTTPD_BINFS),y) CSRCS += phf.c redirect.c ssi.c DEPPATHS += --dep-path cgi-src VPATH += :cgi-src + + PROGNAME = phf redirect ssi + PRIORITY = $(CONFIG_THTTPD_CGI_PRIORITY) + STACKSIZE = $(CONFIG_THTTPD_CGI_STACKSIZE) endif -ifneq ($(CONFIG_BUILD_LOADABLE),y) - OBJS += $(MAINOBJ) -endif - -CONFIG_THTTPD_CGI_PRIORITY ?= 100 -CONFIG_THTTPD_CGI_STACKSIZE ?= 2048 - -APPNAME = phf redirect ssi -PRIORITY = $(CONFIG_THTTPD_CGI_PRIORITY) -STACKSIZE = $(CONFIG_THTTPD_CGI_STACKSIZE) - context:: $(SUBDIR_BIN) ifeq ($(CONFIG_THTTPD_NXFLAT),y) @@ -97,6 +86,4 @@ cgi-bin$(DELIM)$(SUBDIR_BIN3): cgi-bin cgi-src$(DELIM)$(SUBDIR_BIN3) $(Q) cp -a cgi-src$(DELIM)$(SUBDIR_BIN3) $@ endif -MODULE = CONFIG_NETUTILS_THTTPD - include $(APPDIR)/Application.mk diff --git a/netutils/thttpd/thttpd.c b/netutils/thttpd/thttpd.c index 13d7038ad..cbd06b14b 100644 --- a/netutils/thttpd/thttpd.c +++ b/netutils/thttpd/thttpd.c @@ -652,11 +652,7 @@ static void occasional(ClientData client_data, struct timeval *nowP) * ****************************************************************************/ -#ifdef BUILD_MODULE -int main(int argc, FAR char *argv[]) -#else int thttpd_main(int argc, char **argv) -#endif { int num_ready; int cnum; diff --git a/system/cdcacm/Makefile b/system/cdcacm/Makefile index b4c2dbd1b..cca164324 100644 --- a/system/cdcacm/Makefile +++ b/system/cdcacm/Makefile @@ -39,14 +39,9 @@ include $(TOPDIR)/Make.defs MAINSRC = cdcacm_main.c -CONFIG_XYZ_PROGNAME ?= cdcacm$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -APPNAME = sercon serdis - +PROGNAME = sercon serdis PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_SYSTEM_CDCACM +MODULE = $(CONFIG_SYSTEM_CDCACM) include $(APPDIR)/Application.mk diff --git a/system/cdcacm/README.txt b/system/cdcacm/README.txt index 7bb961372..c9a3ab64b 100644 --- a/system/cdcacm/README.txt +++ b/system/cdcacm/README.txt @@ -13,7 +13,6 @@ system/cdcacm CONFIG_USBDEV=y : USB device support must be enabled CONFIG_CDCACM=y : The CDC/ACM driver must be built - CONFIG_NSH_BUILTIN_APPS : NSH built-in application support must be enabled Configuration options specific to this add-on: diff --git a/system/cdcacm/cdcacm.h b/system/cdcacm/cdcacm.h index 79ca68749..87ace19f9 100644 --- a/system/cdcacm/cdcacm.h +++ b/system/cdcacm/cdcacm.h @@ -60,10 +60,6 @@ # error "CONFIG_CDCACM is not defined" #endif -#ifndef CONFIG_NSH_BUILTIN_APPS -# error "This add-on can only be built as an NSH built-in application" -#endif - /* Default configuration values */ #ifndef CONFIG_SYSTEM_CDCACM_DEVMINOR diff --git a/system/cdcacm/cdcacm_main.c b/system/cdcacm/cdcacm_main.c index 67b799ca4..50b97642f 100644 --- a/system/cdcacm/cdcacm_main.c +++ b/system/cdcacm/cdcacm_main.c @@ -72,11 +72,7 @@ static struct cdcacm_state_s g_cdcacm; * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int sercon_main(int argc, char *argv[]) -#endif { struct boardioc_usbdev_ctrl_s ctrl; int ret; @@ -125,11 +121,7 @@ int sercon_main(int argc, char *argv[]) * device. ****************************************************************************/ -#ifdef BUILD_MODULE -int main(int argc, FAR char **argv) -#else int serdis_main(int argc, char *argv[]) -#endif { struct boardioc_usbdev_ctrl_s ctrl; diff --git a/system/cfgdata/Kconfig b/system/cfgdata/Kconfig index d2f5b9898..a2c5e9369 100644 --- a/system/cfgdata/Kconfig +++ b/system/cfgdata/Kconfig @@ -6,7 +6,7 @@ config SYSTEM_CFGDATA tristate "Cfgdata Command" default n - depends on MTD_CONFIG && NSH_BUILTIN_APPS + depends on MTD_CONFIG ---help--- Enable support for the CFGDATA tool. diff --git a/system/cfgdata/Makefile b/system/cfgdata/Makefile index 9983b1f3b..37ab3d80f 100644 --- a/system/cfgdata/Makefile +++ b/system/cfgdata/Makefile @@ -41,20 +41,12 @@ include $(TOPDIR)/Make.defs # config Application -# TODO: appname can be automatically extracted from the directory name -CONFIG_SYSTEM_CFGDATA_STACKSIZE ?= 2048 -CONFIG_SYSTEM_CFGDATA_PRIORITY ?= SCHED_PRIORITY_DEFAULT - -APPNAME = cfgdata +PROGNAME = cfgdata PRIORITY = $(CONFIG_SYSTEM_CFGDATA_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_CFGDATA_STACKSIZE) +MODULE = $(CONFIG_SYSTEM_CFGDATA) MAINSRC = cfgdata_main.c -CONFIG_XYZ_PROGNAME ?= cfgdata$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_SYSTEM_CFGDATA - include $(APPDIR)/Application.mk diff --git a/system/cfgdata/cfgdata_main.c b/system/cfgdata/cfgdata_main.c index 500ba255d..c10d456d5 100644 --- a/system/cfgdata/cfgdata_main.c +++ b/system/cfgdata/cfgdata_main.c @@ -661,11 +661,7 @@ static void cfgdatacmd_show_all_config_items(void) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int cfgdata_main(int argc, char *argv[]) -#endif { /* Argument given? */ diff --git a/system/composite/Makefile b/system/composite/Makefile index 1bec72226..ce494be2d 100644 --- a/system/composite/Makefile +++ b/system/composite/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = composite_main.c -CONFIG_XYZ_PROGNAME ?= composite$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # USB storage built-in application info -APPNAME = conn disconn +PROGNAME = conn disconn PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_SYSTEM_COMPOSITE +MODULE = $(CONFIG_SYSTEM_COMPOSITE) include $(APPDIR)/Application.mk diff --git a/system/composite/composite_main.c b/system/composite/composite_main.c index 115544af9..b43a5bc79 100644 --- a/system/composite/composite_main.c +++ b/system/composite/composite_main.c @@ -521,11 +521,7 @@ static int echo_serial(void) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int conn_main(int argc, char *argv[]) -#endif { struct boardioc_usbdev_ctrl_s ctrl; int config = CONFIG_SYSTEM_COMPOSITE_DEFCONFIG; @@ -709,18 +705,13 @@ errout: * * Description: * This is a program entry point that will disconnect the USB mass storage - * device. This program is only available if CONFIG_NSH_BUILTIN_APPS + * device. This program is only available if CONFIG_SYSTEM_COMPOSITE = y * is defined in the NuttX configuration. In that case, this program can * be executed by entering the "msdis" command at the NSH console. * ****************************************************************************/ -#ifdef CONFIG_NSH_BUILTIN_APPS -#ifdef BUILD_MODULE -int main(int argc, FAR char **argv) -#else int disconn_main(int argc, char *argv[]) -#endif { struct boardioc_usbdev_ctrl_s ctrl; int config = CONFIG_SYSTEM_COMPOSITE_DEFCONFIG; @@ -766,4 +757,3 @@ int disconn_main(int argc, char *argv[]) final_memory_usage("Final memory usage"); return 0; } -#endif diff --git a/system/critmon/Kconfig b/system/critmon/Kconfig index e88331b4c..b7979126d 100644 --- a/system/critmon/Kconfig +++ b/system/critmon/Kconfig @@ -6,7 +6,7 @@ menuconfig SYSTEM_CRITMONITOR tristate "Critcal Section Monitor" default n - depends on FS_PROCFS && !_FS_PROCFS_EXCLUDE_PROCESS && SCHED_CRITMONITOR + depends on FS_PROCFS && !FS_PROCFS_EXCLUDE_PROCESS && SCHED_CRITMONITOR ---help--- If the critical section monitor is enabled (CONFIGSCHED_CRITMONITOR) this option will enable a critical section monitor daemon. This daemon diff --git a/system/critmon/Makefile b/system/critmon/Makefile index 206884a7f..f6eac2670 100644 --- a/system/critmon/Makefile +++ b/system/critmon/Makefile @@ -37,19 +37,11 @@ include $(TOPDIR)/Make.defs # Stack Monitor Application -CONFIG_SYSTEM_CRITMONITOR_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_SYSTEM_CRITMONITOR_STACKSIZE ?= 2048 - +PROGNAME = critmon_start critmon_stop PRIORITY = $(CONFIG_SYSTEM_CRITMONITOR_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_CRITMONITOR_STACKSIZE) +MODULE = $(CONFIG_SYSTEM_CRITMONITOR) MAINSRC = critmon.c -CONFIG_XYZ_PROGNAME ?= critmon$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -APPNAME = critmon_start critmon_stop - -MODULE = CONFIG_SYSTEM_CRITMONITOR - include $(APPDIR)/Application.mk diff --git a/system/critmon/critmon.c b/system/critmon/critmon.c index b98d53673..afe4b4305 100644 --- a/system/critmon/critmon.c +++ b/system/critmon/critmon.c @@ -496,7 +496,7 @@ static int critmon_daemon(int argc, char **argv) * Public Functions ****************************************************************************/ -int critmon_start_main(int argc, char **argv) +int main(int argc, char **argv) { /* Has the monitor already started? */ diff --git a/system/cu/Makefile b/system/cu/Makefile index d6dfc68a9..6a88cfee5 100644 --- a/system/cu/Makefile +++ b/system/cu/Makefile @@ -37,16 +37,9 @@ include $(TOPDIR)/Make.defs MAINSRC = cu_main.c -CONFIG_XYZ_PROGNAME ?= cu$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -CONFIG_SYSTEM_CUTERM_STACKSIZE ?= 2048 -CONFIG_SYSTEM_CUTERM_PRIORITY ?= SCHED_PRIORITY_DEFAULT - -APPNAME = cu +PROGNAME = cu PRIORITY = $(CONFIG_SYSTEM_CUTERM_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_CUTERM_STACKSIZE) - -MODULE = CONFIG_SYSTEM_CUTERM +MODULE = $(CONFIG_SYSTEM_CUTERM) include $(APPDIR)/Application.mk diff --git a/system/cu/cu_main.c b/system/cu/cu_main.c index aa00766a9..5413c84a4 100644 --- a/system/cu/cu_main.c +++ b/system/cu/cu_main.c @@ -266,11 +266,7 @@ static int cu_cmd(char bcmd) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int cu_main(int argc, FAR char *argv[]) -#endif { pthread_attr_t attr; struct sigaction sa; diff --git a/system/dhcpc/Kconfig b/system/dhcpc/Kconfig index 8a505ac70..13c775b15 100644 --- a/system/dhcpc/Kconfig +++ b/system/dhcpc/Kconfig @@ -16,7 +16,6 @@ if SYSTEM_DHCPC_RENEW config DHCPC_RENEW_PROGNAME string "Program name" default "renew" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/system/dhcpc/Makefile b/system/dhcpc/Makefile index 05a72efaf..6281f63ef 100644 --- a/system/dhcpc/Makefile +++ b/system/dhcpc/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # DHCPC address renewal built-in application info -CONFIG_DHCPC_RENEW_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_DHCPC_RENEW_STACKSIZE ?= 2048 - -APPNAME = renew +PROGNAME = $(CONFIG_DHCPC_RENEW_PROGNAME) PRIORITY = $(CONFIG_DHCPC_RENEW_PRIORITY) STACKSIZE = $(CONFIG_DHCPC_RENEW_STACKSIZE) - -CONFIG_DHCPC_RENEW_PROGNAME ?= renew$(EXEEXT) -PROGNAME = $(CONFIG_DHCPC_RENEW_PROGNAME) +MODULE = $(CONFIG_SYSTEM_DHCPC_RENEW) # DHCPC address renewal MAINSRC = renew_main.c -MODULE = CONFIG_SYSTEM_DHCPC_RENEW - include $(APPDIR)/Application.mk diff --git a/system/dhcpc/renew_main.c b/system/dhcpc/renew_main.c index 718d4f162..33c8250a5 100644 --- a/system/dhcpc/renew_main.c +++ b/system/dhcpc/renew_main.c @@ -69,11 +69,7 @@ static void dhcpc_showusage(FAR const char *progname, int exitcode) * renew_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int renew_main(int argc, char *argv[]) -#endif { FAR const char *devname; FAR void *handle; diff --git a/system/flash_eraseall/Kconfig b/system/flash_eraseall/Kconfig index e4d8d768c..e2314e94d 100644 --- a/system/flash_eraseall/Kconfig +++ b/system/flash_eraseall/Kconfig @@ -6,7 +6,7 @@ config SYSTEM_FLASH_ERASEALL tristate "FLASH Erase-all Command" default n - depends on MTD && NSH_BUILTIN_APPS + depends on MTD select FSUTILS_FLASH_ERASEALL ---help--- Enable support for the FLASH eraseall tool. diff --git a/system/flash_eraseall/Makefile b/system/flash_eraseall/Makefile index 5106f336e..1b318c35a 100644 --- a/system/flash_eraseall/Makefile +++ b/system/flash_eraseall/Makefile @@ -35,23 +35,15 @@ # ############################################################################ -# TODO, this makefile should run make under the app dirs, instead of -# sourcing the Make.defs! - include $(TOPDIR)/Make.defs # flash_eraseall Application -# TODO: appname can be automatically extracted from the directory name -APPNAME = flash_eraseall +PROGNAME = flash_eraseall PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 1024 +MODULE = $(CONFIG_SYSTEM_FLASH_ERASEALL) MAINSRC = flash_eraseall_main.c -CONFIG_XYZ_PROGNAME ?= flash_eraseall$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_SYSTEM_FLASH_ERASEALL - include $(APPDIR)/Application.mk diff --git a/system/flash_eraseall/flash_eraseall_main.c b/system/flash_eraseall/flash_eraseall_main.c index 5a15cdaf9..ab5aecd1e 100644 --- a/system/flash_eraseall/flash_eraseall_main.c +++ b/system/flash_eraseall/flash_eraseall_main.c @@ -49,11 +49,7 @@ * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int flash_eraseall_main(int argc, char *argv[]) -#endif { /* Argument given? */ diff --git a/system/hex2bin/Kconfig b/system/hex2bin/Kconfig index 5d346ed8d..79c670ab5 100644 --- a/system/hex2bin/Kconfig +++ b/system/hex2bin/Kconfig @@ -15,7 +15,6 @@ if SYSTEM_HEX2BIN config SYSTEM_HEX2BIN_BUILTIN bool "NSH hex2bin Built-In" default n - depends on NSH_BUILTIN_APPS ---help--- By default, a flexible hex2bin library function built. An NSH builtin function can also be generated to convert Intel HEX file @@ -67,7 +66,6 @@ endif # SYSTEM_HEX2BIN_BUILTIN config SYSTEM_HEX2MEM_BUILTIN bool "NSH hex2mem Built-In" default n - depends on NSH_BUILTIN_APPS ---help--- By default, a flexible hex2bin library function built. An NSH builtin function can also be generated to copy Intel HEX files diff --git a/system/hex2bin/Makefile b/system/hex2bin/Makefile index 2b0405bad..05a91bb2c 100644 --- a/system/hex2bin/Makefile +++ b/system/hex2bin/Makefile @@ -37,38 +37,20 @@ include $(TOPDIR)/Make.defs # Hex2bin utility -CONFIG_SYSTEM_HEX2BIN_PROGNAME ?= hex2bin$(EXEEXT) -CONFIG_SYSTEM_HEX2BIN_STACKSIZE ?= 1536 -CONFIG_SYSTEM_HEX2BIN_PRIORITY ?= 100 - -CONFIG_SYSTEM_HEX2MEM_PROGNAME ?= hex2mem$(EXEEXT) -CONFIG_SYSTEM_HEX2MEM_STACKSIZE ?= 1536 -CONFIG_SYSTEM_HEX2MEM_PRIORITY ?= 100 - -ifeq ($(CONFIG_SYSTEM_HEX2BIN),m) - MAINSRC = hex2bin_main.c hex2mem_main.c - PROGNAME = $(CONFIG_SYSTEM_HEX2BIN_PROGNAME) $(CONFIG_SYSTEM_HEX2MEM_PROGNAME) - APPNAME = hex2bin hex2mem - STACKSIZE = $(CONFIG_SYSTEM_HEX2BIN_STACKSIZE) $(CONFIG_SYSTEM_HEX2MEM_STACKSIZE) - PRIORITY = $(CONFIG_SYSTEM_HEX2BIN_PRIORITY) $(CONFIG_SYSTEM_HEX2MEM_PRIORITY) -else - ifeq ($(CONFIG_SYSTEM_HEX2BIN_BUILTIN),y) - MAINSRC = hex2bin_main.c - PROGNAME = $(CONFIG_SYSTEM_HEX2BIN_PROGNAME) - APPNAME = hex2bin - STACKSIZE = $(CONFIG_SYSTEM_HEX2BIN_STACKSIZE) - PRIORITY = $(CONFIG_SYSTEM_HEX2BIN_PRIORITY) - endif - - ifeq ($(CONFIG_SYSTEM_HEX2MEM_BUILTIN),y) - MAINSRC += hex2mem_main.c - PROGNAME += $(CONFIG_SYSTEM_HEX2MEM_PROGNAME) - APPNAME += hex2mem - STACKSIZE += $(CONFIG_SYSTEM_HEX2MEM_STACKSIZE) - PRIORITY += $(CONFIG_SYSTEM_HEX2MEM_PRIORITY) - endif +ifeq ($(CONFIG_SYSTEM_HEX2BIN_BUILTIN),y) + MAINSRC = hex2bin_main.c + PROGNAME = hex2bin + STACKSIZE = $(CONFIG_SYSTEM_HEX2BIN_STACKSIZE) + PRIORITY = $(CONFIG_SYSTEM_HEX2BIN_PRIORITY) endif -MODULE = CONFIG_SYSTEM_HEX2BIN +ifeq ($(CONFIG_SYSTEM_HEX2MEM_BUILTIN),y) + MAINSRC += hex2mem_main.c + PROGNAME = hex2mem + STACKSIZE += $(CONFIG_SYSTEM_HEX2MEM_STACKSIZE) + PRIORITY += $(CONFIG_SYSTEM_HEX2MEM_PRIORITY) +endif + +MODULE = $(CONFIG_SYSTEM_HEX2BIN) include $(APPDIR)/Application.mk diff --git a/system/hex2bin/hex2bin_main.c b/system/hex2bin/hex2bin_main.c index 40150991e..86e750593 100644 --- a/system/hex2bin/hex2bin_main.c +++ b/system/hex2bin/hex2bin_main.c @@ -109,11 +109,7 @@ static void show_usage(FAR const char *progname, int exitcode) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int hex2bin_main(int argc, char **argv) -#endif { struct lib_stdinstream_s stdinstream; struct lib_stdsostream_s stdoutstream; diff --git a/system/hex2bin/hex2mem_main.c b/system/hex2bin/hex2mem_main.c index 0ee8a4cd6..cbe18cf07 100644 --- a/system/hex2bin/hex2mem_main.c +++ b/system/hex2bin/hex2mem_main.c @@ -104,11 +104,7 @@ static void show_usage(FAR const char *progname, int exitcode) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int hex2mem_main(int argc, char **argv) -#endif { struct lib_stdinstream_s stdinstream; struct lib_memsostream_s memoutstream; diff --git a/system/hexed/Makefile b/system/hexed/Makefile index 991da7c0b..c415b0fa4 100644 --- a/system/hexed/Makefile +++ b/system/hexed/Makefile @@ -37,25 +37,18 @@ include $(TOPDIR)/Make.defs # hexed Application -CONFIG_SYSTEM_HEXED_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_SYSTEM_HEXED_STACKSIZE ?= 2048 - -APPNAME = hexed +PROGNAME = hexed PRIORITY = $(CONFIG_SYSTEM_HEXED_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_HEXED_STACKSIZE) +MODULE = $(CONFIG_SYSTEM_HEXED) CSRCS = bfile.c cmdargs.c hexcopy.c hexdump.c hexenter.c hexhelp.c CSRCS += hexinsert.c hexmove.c hexremove.c hexword.c MAINSRC = hexed.c -CONFIG_XYZ_PROGNAME ?= hexed$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" include} VPATH += :src ROOTDEPPATH += --dep-path src -MODULE = CONFIG_SYSTEM_HEXED - include $(APPDIR)/Application.mk diff --git a/system/hexed/src/hexed.c b/system/hexed/src/hexed.c index 6bf4eba0b..1e9499d14 100644 --- a/system/hexed/src/hexed.c +++ b/system/hexed/src/hexed.c @@ -371,11 +371,7 @@ int runargs(void) /* hexed - Hexadecimal File Editor */ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int hexed_main(int argc, char *argv[]) -#endif { struct cmdargs_s args; diff --git a/system/i2c/Makefile b/system/i2c/Makefile index 519bf4b1d..4bd63918f 100644 --- a/system/i2c/Makefile +++ b/system/i2c/Makefile @@ -40,13 +40,9 @@ CSRCS = i2c_bus.c i2c_common.c i2c_dev.c i2c_get.c i2c_set.c i2c_verf.c CSRCS += i2c_devif.c MAINSRC = i2c_main.c -CONFIG_XYZ_PROGNAME ?= i2c$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -APPNAME = i2c +PROGNAME = i2c PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_SYSTEM_I2CTOOL +MODULE = $(CONFIG_SYSTEM_I2CTOOL) include $(APPDIR)/Application.mk diff --git a/system/i2c/i2c_main.c b/system/i2c/i2c_main.c index 56727d34e..8ee550f37 100644 --- a/system/i2c/i2c_main.c +++ b/system/i2c/i2c_main.c @@ -347,11 +347,7 @@ static void i2c_teardown(FAR struct i2ctool_s *i2ctool) * Name: i2c_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int i2c_main(int argc, char *argv[]) -#endif { /* Verify settings */ diff --git a/system/lm75/Makefile b/system/lm75/Makefile index 9a2e379ef..14138f28e 100644 --- a/system/lm75/Makefile +++ b/system/lm75/Makefile @@ -37,18 +37,11 @@ include $(TOPDIR)/Make.defs # LM-75 Temperature Sensor Application -CONFIG_SYSTEM_LM75_PRIORITY ?= 100 -CONFIG_SYSTEM_LM75_STACKSIZE ?= 1024 - -APPNAME = lm75 +PROGNAME = lm75 PRIORITY = $(CONFIG_SYSTEM_LM75_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_LM75_STACKSIZE) +MODULE = $(CONFIG_SYSTEM_LM75) MAINSRC = lm75.c -CONFIG_XYZ_PROGNAME ?= lm75$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_SYSTEM_LM75 - include $(APPDIR)/Application.mk diff --git a/system/lm75/lm75.c b/system/lm75/lm75.c index e85e41940..46ba971e5 100644 --- a/system/lm75/lm75.c +++ b/system/lm75/lm75.c @@ -183,11 +183,7 @@ static void parse_args(int argc, FAR char **argv) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int lm75_main(int argc, char *argv[]) -#endif { #ifdef CONFIG_LIBC_FLOATINGPOINT double temp; diff --git a/system/lzf/Kconfig b/system/lzf/Kconfig index 9b519041e..17c126224 100644 --- a/system/lzf/Kconfig +++ b/system/lzf/Kconfig @@ -32,7 +32,6 @@ config SYSTEM_LZF_BLOG config SYSTEM_LZF_PROGNAME string "Program name" default "lzf" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/system/lzf/Makefile b/system/lzf/Makefile index 4ecf1a738..296a4596c 100644 --- a/system/lzf/Makefile +++ b/system/lzf/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # LZF built-in application info -CONFIG_SYSTEM_LZF_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_SYSTEM_LZF_STACKSIZE ?= 20480 - -APPNAME = lzf +PROGNAME = $(CONFIG_SYSTEM_LZF_PROGNAME) PRIORITY = $(CONFIG_SYSTEM_LZF_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_LZF_STACKSIZE) +MODULE = $(CONFIG_SYSTEM_LZF) # LZF compression example tool MAINSRC = lzf_main.c -CONFIG_SYSTEM_LZF_PROGNAME ?= lzf$(EXEEXT) -PROGNAME = $(CONFIG_SYSTEM_LZF_PROGNAME) - -MODULE = CONFIG_SYSTEM_LZF - include $(APPDIR)/Application.mk diff --git a/system/lzf/lzf_main.c b/system/lzf/lzf_main.c index 36b508d00..19097e26f 100644 --- a/system/lzf/lzf_main.c +++ b/system/lzf/lzf_main.c @@ -433,11 +433,7 @@ static int run_file(FAR const char *fname) * lzf_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int lzf_main(int argc, FAR char *argv[]) -#endif { FAR char *p = argv[0]; int optc; diff --git a/system/mdio/Makefile b/system/mdio/Makefile index d533fdc91..cdfa0be91 100644 --- a/system/mdio/Makefile +++ b/system/mdio/Makefile @@ -37,17 +37,13 @@ include $(TOPDIR)/Make.defs # MDIO tool built-in application info -APPNAME = mdio +PROGNAME = mdio PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_SYSTEM_MDIO) # MDIO tool MAINSRC = mdio_main.c -CONFIG_XYZ_PROGNAME ?= mdio$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_SYSTEM_MDIO - include $(APPDIR)/Application.mk diff --git a/system/mdio/mdio_main.c b/system/mdio/mdio_main.c index 847896425..011dfa59e 100644 --- a/system/mdio/mdio_main.c +++ b/system/mdio/mdio_main.c @@ -159,11 +159,7 @@ int set_phy_reg(uint16_t phy_id, uint16_t reg_num, uint16_t val) * mdio_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int mdio_main(int argc, char *argv[]) -#endif { int ret; int i; diff --git a/system/netdb/Makefile b/system/netdb/Makefile index bed7169ff..8507a798e 100644 --- a/system/netdb/Makefile +++ b/system/netdb/Makefile @@ -37,17 +37,11 @@ include $(TOPDIR)/Make.defs # netdb Application -PROGNAME = netdb$(EXEEXT) - -CONFIG_SYSTEM_NETDB_STACKSIZE ?= 2048 -CONFIG_SYSTEM_NETDB_PRIORITY ?= 100 - -APPNAME = netdb +PROGNAME = netdb PRIORITY = $(CONFIG_SYSTEM_NETDB_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_NETDB_STACKSIZE) +MODULE = $(CONFIG_SYSTEM_NETDB) MAINSRC = netdb_main.c -MODULE = CONFIG_SYSTEM_NETDB - include $(APPDIR)/Application.mk diff --git a/system/netdb/netdb_main.c b/system/netdb/netdb_main.c index 253feb8fa..306316721 100644 --- a/system/netdb/netdb_main.c +++ b/system/netdb/netdb_main.c @@ -94,11 +94,7 @@ static void show_usage(FAR const char *progname, int exitcode) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int netdb_main(int argc, char **argv) -#endif { FAR struct hostent *host; FAR const char *addrtype; diff --git a/system/nsh/Kconfig b/system/nsh/Kconfig index 127cdcadb..da55e326e 100644 --- a/system/nsh/Kconfig +++ b/system/nsh/Kconfig @@ -72,7 +72,6 @@ endif # SYSTEM_NSH_SYMTAB config SYSTEM_NSH_PROGNAME string "Program name" default "nsh" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/system/nsh/Makefile b/system/nsh/Makefile index 66297af04..86d149e2d 100644 --- a/system/nsh/Makefile +++ b/system/nsh/Makefile @@ -39,15 +39,9 @@ include $(TOPDIR)/Make.defs 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 - -MODULE = CONFIG_SYSTEM_NSH +MODULE = $(CONFIG_SYSTEM_NSH) include $(APPDIR)/Application.mk diff --git a/system/nsh/nsh_main.c b/system/nsh/nsh_main.c index 8a64b4760..047b91db7 100644 --- a/system/nsh/nsh_main.c +++ b/system/nsh/nsh_main.c @@ -258,11 +258,7 @@ static int nsh_task(void) * Name: nsh_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int nsh_main(int argc, char *argv[]) -#endif { struct sched_param param; diff --git a/system/ntpc/Makefile b/system/ntpc/Makefile index 2e43b89ca..c64123afa 100644 --- a/system/ntpc/Makefile +++ b/system/ntpc/Makefile @@ -37,18 +37,13 @@ include $(TOPDIR)/Make.defs # NTPC address renewal built-in application info -CONFIG_SYSTEM_NTPC_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_SYSTEM_NTPC_STACKSIZE ?= 2048 - +PROGNAME = ntpcstart ntpcstop PRIORITY = $(CONFIG_SYSTEM_NTPC_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_NTPC_STACKSIZE) +MODULE = $(CONFIG_SYSTEM_NTPC) # NTPC address renewal MAINSRC = ntpcstart_main.c ntpcstop_main.c -APPNAME = ntpcstart ntpcstop -PROGNAME = ntpcstart$(EXEEXT) ntpcstop$(EXEEXT) - -MODULE = CONFIG_SYSTEM_NTPC include $(APPDIR)/Application.mk diff --git a/system/ntpc/ntpcstart_main.c b/system/ntpc/ntpcstart_main.c index 87f1c2ebf..d94d6ee88 100644 --- a/system/ntpc/ntpcstart_main.c +++ b/system/ntpc/ntpcstart_main.c @@ -52,11 +52,7 @@ * ntpcstart_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int ntpcstart_main(int argc, char *argv[]) -#endif { int pid = ntpc_start(); if (pid < 0) diff --git a/system/ntpc/ntpcstop_main.c b/system/ntpc/ntpcstop_main.c index 4f20d0110..9e44eb7b4 100644 --- a/system/ntpc/ntpcstop_main.c +++ b/system/ntpc/ntpcstop_main.c @@ -52,11 +52,7 @@ * ntpcstop_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int ntpcstop_main(int argc, char *argv[]) -#endif { int ret = ntpc_stop(); if (ret < 0) diff --git a/system/nxplayer/Kconfig b/system/nxplayer/Kconfig index eb35fd258..39558bc10 100644 --- a/system/nxplayer/Kconfig +++ b/system/nxplayer/Kconfig @@ -4,7 +4,7 @@ # config SYSTEM_NXPLAYER - tristate "NxPlayer Media Player" + bool "NxPlayer Media Player" default n depends on AUDIO ---help--- @@ -26,7 +26,7 @@ config NXPLAYER_PLAYTHREAD_STACKSIZE Stack size to use with the NxPlayer play thread. config NXPLAYER_COMMAND_LINE - bool "Include nxplayer command line application" + tristate "Include nxplayer command line application" default y ---help--- Compiles in code for the nxplayer command line control. diff --git a/system/nxplayer/Makefile b/system/nxplayer/Makefile index 1d8beb0e9..1e4f7538d 100644 --- a/system/nxplayer/Makefile +++ b/system/nxplayer/Makefile @@ -41,40 +41,13 @@ include $(TOPDIR)/Make.defs CSRCS = nxplayer.c -# NxPlayer Application -# Make be built as a library: -# CONFIG_SYSTEM_NXPLAYER=y -# CONFIG_NXPLAYER_COMMAND_LINE=n -# As an NSH built-in task: -# CONFIG_SYSTEM_NXPLAYER=y -# CONFIG_NXPLAYER_COMMAND_LINE=y -# As an loadable module -# CONFIG_SYSTEM_NXPLAYER=m -# CONFIG_NXPLAYER_COMMAND_LINE=y - -# Assume building as a library (with no main entry point) - -MAINSRC = -MODULE = -APPNAME = -PRIORITY = -STACKSIZE = - -ifeq ($(CONFIG_SYSTEM_NXPLAYER),m) -# Build as a loadable module - -MAINSRC = nxplayer_main.c +ifneq ($(CONFIG_NXPLAYER_COMMAND_LINE),) PROGNAME = nxplayer -MODULE = m - -else ifeq ($(CONFIG_NXPLAYER_COMMAND_LINE),y) -# Build as an NSH built-in application +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = $(CONFIG_NXPLAYER_MAINTHREAD_STACKSIZE) +MODULE = $(CONFIG_NXPLAYER_COMMAND_LINE) MAINSRC = nxplayer_main.c -APPNAME = nxplayer -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = CONFIG_NXPLAYER_MAINTHREAD_STACKSIZE -MODULE = y endif include $(APPDIR)/Application.mk diff --git a/system/nxplayer/nxplayer_main.c b/system/nxplayer/nxplayer_main.c index 5f8ca57bc..8a306262f 100644 --- a/system/nxplayer/nxplayer_main.c +++ b/system/nxplayer/nxplayer_main.c @@ -653,11 +653,7 @@ static int nxplayer_cmd_help(FAR struct nxplayer_s *pPlayer, char *parg) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int nxplayer_main(int argc, char *argv[]) -#endif { char buffer[64]; int len, x, running; diff --git a/system/nxrecorder/Kconfig b/system/nxrecorder/Kconfig index 015d8088f..fc0025136 100644 --- a/system/nxrecorder/Kconfig +++ b/system/nxrecorder/Kconfig @@ -4,7 +4,7 @@ # config SYSTEM_NXRECORDER - tristate "NxRecorder pcm raw data Recorder" + bool "NxRecorder pcm raw data Recorder" default n depends on AUDIO ---help--- @@ -20,7 +20,7 @@ config NXRECORDER_RECORDTHREAD_STACKSIZE Stack size to use with the NxRecorder record thread. config NXRECORDER_COMMAND_LINE - bool "Include nxrecorder command line application" + tristate "Include nxrecorder command line application" default y ---help--- Compiles in code for the nxrecorder command line control. diff --git a/system/nxrecorder/Makefile b/system/nxrecorder/Makefile index 5578edfa4..38c43e084 100644 --- a/system/nxrecorder/Makefile +++ b/system/nxrecorder/Makefile @@ -38,21 +38,14 @@ include $(TOPDIR)/Make.defs CSRCS = nxrecorder.c -APPNAME = nxrecorder + +ifneq ($(CONFIG_NXRECORDER_COMMAND_LINE),) +PROGNAME = nxrecorder PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_NXRECORDER_COMMAND_LINE) -ifeq ($(CONFIG_SYSTEM_NXRECORDER),m) -MAINSRC = nxrecorder_main.c -else -ifeq ($(CONFIG_NXRECORDER_COMMAND_LINE),y) MAINSRC = nxrecorder_main.c endif -endif - -CONFIG_XYZ_PROGNAME ?= nxrecorder$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_SYSTEM_NXRECORDER include $(APPDIR)/Application.mk diff --git a/system/nxrecorder/nxrecorder_main.c b/system/nxrecorder/nxrecorder_main.c index a4a98d023..8228e0475 100644 --- a/system/nxrecorder/nxrecorder_main.c +++ b/system/nxrecorder/nxrecorder_main.c @@ -391,11 +391,7 @@ static int nxrecorder_cmd_help(FAR struct nxrecorder_s *pRecorder, char *parg) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int nxrecorder_main(int argc, char *argv[]) -#endif { char buffer[64]; int len, x, running; diff --git a/system/ping/Kconfig b/system/ping/Kconfig index 3c2fe48f4..d87b026b7 100644 --- a/system/ping/Kconfig +++ b/system/ping/Kconfig @@ -16,7 +16,6 @@ if SYSTEM_PING config SYSTEM_PING_PROGNAME string "Ping program name" default "ping" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/system/ping/Makefile b/system/ping/Makefile index 955cf4c86..3009b734a 100644 --- a/system/ping/Makefile +++ b/system/ping/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # ICMP ping command -CONFIG_SYSTEM_PING_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_SYSTEM_PING_STACKSIZE ?= 2048 - -APPNAME = ping +PROGNAME = $(CONFIG_SYSTEM_PING_PROGNAME) PRIORITY = $(CONFIG_SYSTEM_PING_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_PING_STACKSIZE) - -CONFIG_SYSTEM_PING_PROGNAME ?= ping$(EXEEXT) -PROGNAME = $(CONFIG_SYSTEM_PING_PROGNAME) +MODULE = $(CONFIG_SYSTEM_PING) # Files MAINSRC = ping.c -MODULE = CONFIG_SYSTEM_PING - include $(APPDIR)/Application.mk diff --git a/system/ping/ping.c b/system/ping/ping.c index 3fc278f02..9c063b711 100644 --- a/system/ping/ping.c +++ b/system/ping/ping.c @@ -218,11 +218,7 @@ static void ping_result(FAR const struct ping_result_s *result) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int ping_main(int argc, char **argv) -#endif { struct ping_info_s info; FAR char *endptr; diff --git a/system/ping6/Kconfig b/system/ping6/Kconfig index e681d9857..1cddfe058 100644 --- a/system/ping6/Kconfig +++ b/system/ping6/Kconfig @@ -15,7 +15,6 @@ if SYSTEM_PING6 config SYSTEM_PING6_PROGNAME string "Ping program name" default "ping6" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/system/ping6/Makefile b/system/ping6/Makefile index c7d4a22a1..448b56dd8 100644 --- a/system/ping6/Makefile +++ b/system/ping6/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # ICMP ping6 command -CONFIG_SYSTEM_PING6_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_SYSTEM_PING6_STACKSIZE ?= 2048 - -APPNAME = ping6 +PROGNAME = $(CONFIG_SYSTEM_PING6_PROGNAME) PRIORITY = $(CONFIG_SYSTEM_PING6_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_PING6_STACKSIZE) - -CONFIG_SYSTEM_PING6_PROGNAME ?= ping6$(EXEEXT) -PROGNAME = $(CONFIG_SYSTEM_PING6_PROGNAME) +MODULE = $(CONFIG_SYSTEM_PING6) # Files MAINSRC = ping6.c -MODULE = CONFIG_SYSTEM_PING6 - include $(APPDIR)/Application.mk diff --git a/system/ping6/ping6.c b/system/ping6/ping6.c index 8d7ddcda2..c19b140db 100644 --- a/system/ping6/ping6.c +++ b/system/ping6/ping6.c @@ -215,11 +215,7 @@ static void ping6_result(FAR const struct ping6_result_s *result) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int ping6_main(int argc, char **argv) -#endif { struct ping6_info_s info; FAR char *endptr; diff --git a/system/prun/Kconfig b/system/prun/Kconfig index a2ddef44e..7d88020c1 100644 --- a/system/prun/Kconfig +++ b/system/prun/Kconfig @@ -4,7 +4,7 @@ # menuconfig SYSTEM_PRUN - tristate "Pascal P-Code interpreter" + bool "Pascal P-Code interpreter" default n depends on INTERPRETERS_PCODE ---help--- @@ -16,7 +16,7 @@ menuconfig SYSTEM_PRUN if SYSTEM_PRUN config SYSTEM_PEXEC - bool "Pascal P-Code command" + tristate "Pascal P-Code command" default n ---help--- Generates an NSH built-in task that may be used to execute P-Code diff --git a/system/prun/Makefile b/system/prun/Makefile index d930bcbb8..265aed431 100644 --- a/system/prun/Makefile +++ b/system/prun/Makefile @@ -42,22 +42,15 @@ CFLAGS += ${shell $(INCDIR) $(INCDIROPT) "$(CC)" \ "$(APPDIR)$(DELIM)interpreters$(DELIM)pcode$(DELIM)include" \ "$(APPDIR)$(DELIM)interpreters$(DELIM)pcode$(DELIM)insn$(DELIM)include"} -CONFIG_SYSTEM_PEXEC_STACKSIZE ?= 1536 -CONFIG_SYSTEM_PEXEC_PRIORITY ?= 100 - -APPNAME = pexec -PRIORITY = $(CONFIG_SYSTEM_PEXEC_PRIORITY) -STACKSIZE = $(CONFIG_SYSTEM_PEXEC_STACKSIZE) - CSRCS = prun.c -ifeq ($(CONFIG_SYSTEM_PEXEC),y) +ifneq ($(CONFIG_SYSTEM_PEXEC),) +PROGNAME = pexec +PRIORITY = $(CONFIG_SYSTEM_PEXEC_PRIORITY) +STACKSIZE = $(CONFIG_SYSTEM_PEXEC_STACKSIZE) +MODULE = $(CONFIG_SYSTEM_PEXEC) + MAINSRC += pexec_main.c endif -CONFIG_XYZ_PROGNAME ?= prun$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_SYSTEM_PRUN - include $(APPDIR)/Application.mk diff --git a/system/prun/pexec_main.c b/system/prun/pexec_main.c index c5bcea8e7..24d1d6bf2 100644 --- a/system/prun/pexec_main.c +++ b/system/prun/pexec_main.c @@ -81,11 +81,7 @@ static void show_usage(FAR const char *progname, int errcode) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int pexec_main(int argc, FAR char **argv) -#endif { FAR char *filename = NULL; FAR char *endptr; diff --git a/system/psmq/Kconfig b/system/psmq/Kconfig index 251daad1f..01b77a445 100644 --- a/system/psmq/Kconfig +++ b/system/psmq/Kconfig @@ -4,7 +4,7 @@ # menuconfig SYSTEM_PSMQ - bool "psmq" + tristate "psmq" default n depends on !DISABLE_MQUEUE && SYSTEM_EMBEDLOG ---help--- @@ -90,11 +90,6 @@ config PSMQ_TOOLS_SUB if PSMQ_TOOLS_SUB -config PSMQ_SUB_PROGNAME - string "psmq_sub program name" - default "psmq_sub" - depends on BUILD_KERNEL - config PSMQ_SUB_PRIORITY int "psmq_sub broker task priority" default 100 diff --git a/system/psmq/Makefile b/system/psmq/Makefile index 7326d61d4..280443981 100644 --- a/system/psmq/Makefile +++ b/system/psmq/Makefile @@ -56,18 +56,8 @@ CSRCS = $(PSMQ_SOURCES)/lib/psmq.c \ $(PSMQ_SOURCES)/src/broker.c \ $(PSMQ_SOURCES)/src/cfg.c \ $(PSMQ_SOURCES)/src/globals.c \ - $(PSMQ_SOURCES)/src/psmqd.c \ $(PSMQ_SOURCES)/src/topic-list.c -# optional source files to compile depending on Kconfig options -ifeq ($(CONFIG_PSMQ_TOOLS_PUB),y) - CSRCS += $(PSMQ_SOURCES)/src/psmq-pub.c -endif - -ifeq ($(CONFIG_PSMQ_TOOLS_SUB),y) - CSRCS += $(PSMQ_SOURCES)/src/psmq-sub.c -endif - # compile-time options from Kconfig CFLAGS += -DPSMQ_MAX_CLIENTS=$(CONFIG_PSMQ_MAX_CLIENTS) CFLAGS += -DPSMQ_PAYLOAD_MAX=$(CONFIG_PSMQ_PAYLOAD_MAX) @@ -93,25 +83,25 @@ CFLAGS += -DPACKAGE_STRING="\"psmq $(PSMQ_VERSION)\"" CFLAGS += -DPACKAGE_VERSION=\"$(PSMQ_VERSION)\" # register psmqd broker daemon application +PROGNAME = psmqd PRIORITY = $(CONFIG_PSMQD_PRIORITY) STACKSIZE = $(CONFIG_PSMQD_STACKSIZE) -APPNAME = psmqd -PROGNAME = psmqd$(EXEEXT) +MAINSRC = $(PSMQ_SOURCES)/src/psmqd.c # register psmq_pub application if it was enabled ifeq ($(CONFIG_PSMQ_TOOLS_PUB),y) + PROGNAME += psmq_pub PRIORITY += $(CONFIG_PSMQ_PUB_PRIORITY) STACKSIZE += $(CONFIG_PSMQ_PUB_STACKSIZE) - APPNAME += psmq_pub - PROGNAME += psmq_pub$(EXEEXT) + MAINSRC += $(PSMQ_SOURCES)/src/psmq-pub.c endif # register psmq_sub application if it was enabled ifeq ($(CONFIG_PSMQ_TOOLS_SUB),y) + PROGNAME += psmq_sub PRIORITY += $(CONFIG_PSMQ_SUB_PRIORITY) STACKSIZE += $(CONFIG_PSMQ_SUB_STACKSIZE) - APPNAME += psmq_sub - PROGNAME += psmq_sub$(EXEEXT) + MAINSRC += $(PSMQ_SOURCES)/src/psmq-sub.c endif # download and build psmq @@ -142,4 +132,6 @@ distclean:: $(Q) $(call DELDIR, $(PSMQ_SOURCES)) $(Q) $(call DELDIR, $(PSMQ_TARBALL)) +MODULE = $(CONFIG_SYSTEM_PSMQ) + include $(APPDIR)/Application.mk diff --git a/system/ramtest/Kconfig b/system/ramtest/Kconfig index 4a5a26034..7c3d08ab0 100644 --- a/system/ramtest/Kconfig +++ b/system/ramtest/Kconfig @@ -14,7 +14,6 @@ if SYSTEM_RAMTEST config SYSTEM_RAMTEST_PROGNAME string "Program name" default "ramtest" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/system/ramtest/Makefile b/system/ramtest/Makefile index ba024ecc3..002d6b298 100644 --- a/system/ramtest/Makefile +++ b/system/ramtest/Makefile @@ -37,18 +37,11 @@ include $(TOPDIR)/Make.defs # RAM test -CONFIG_SYSTEM_RAMTEST_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_SYSTEM_RAMTEST_STACKSIZE ?= 1024 - -APPNAME = ramtest +PROGNAME = $(CONFIG_SYSTEM_RAMTEST_PROGNAME) PRIORITY = $(CONFIG_SYSTEM_RAMTEST_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_RAMTEST_STACKSIZE) - -CONFIG_SYSTEM_RAMTEST_PROGNAME ?= ramtest$(EXEEXT) -PROGNAME = $(CONFIG_SYSTEM_RAMTEST_PROGNAME) +MODULE = $(CONFIG_SYSTEM_RAMTEST) MAINSRC = ramtest.c -MODULE = CONFIG_SYSTEM_RAMTEST - include $(APPDIR)/Application.mk diff --git a/system/ramtest/ramtest.c b/system/ramtest/ramtest.c index 9760da624..c56618967 100644 --- a/system/ramtest/ramtest.c +++ b/system/ramtest/ramtest.c @@ -555,11 +555,7 @@ static void addr_in_addr(FAR struct ramtest_s *info) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int ramtest_main(int argc, char **argv) -#endif { struct ramtest_s info; diff --git a/system/sched_note/Kconfig b/system/sched_note/Kconfig index 2750cb92f..92186eeae 100644 --- a/system/sched_note/Kconfig +++ b/system/sched_note/Kconfig @@ -15,7 +15,6 @@ if SYSTEM_NOTE config SYSTEM_NOTE_PROGNAME string "Program name" default "note" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/system/sched_note/Makefile b/system/sched_note/Makefile index 3d3c60b4a..680f24ddc 100644 --- a/system/sched_note/Makefile +++ b/system/sched_note/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # LED driver test built-in application info -CONFIG_SYSTEM_NOTE_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_SYSTEM_NOTE_STACKSIZE ?= 2048 - -APPNAME = note +PROGNAME = $(CONFIG_SYSTEM_NOTE_PROGNAME) PRIORITY = $(CONFIG_SYSTEM_NOTE_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_NOTE_STACKSIZE) +MODULE = $(CONFIG_SYSTEM_NOTE) # LED driver test MAINSRC = note_main.c -CONFIG_SYSTEM_NOTE_PROGNAME ?= note$(EXEEXT) -PROGNAME = $(CONFIG_SYSTEM_NOTE_PROGNAME) - -MODULE = CONFIG_SYSTEM_NOTE - include $(APPDIR)/Application.mk diff --git a/system/sched_note/note_main.c b/system/sched_note/note_main.c index 08c694726..089906b85 100644 --- a/system/sched_note/note_main.c +++ b/system/sched_note/note_main.c @@ -641,11 +641,7 @@ errout: * note_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int note_main(int argc, FAR char *argv[]) -#endif { int ret; diff --git a/system/setlogmask/Kconfig b/system/setlogmask/Kconfig index 528a21290..34dc1d690 100644 --- a/system/setlogmask/Kconfig +++ b/system/setlogmask/Kconfig @@ -13,7 +13,6 @@ if SYSTEM_SETLOGMASK config SYSTEM_SETLOGMASK_PROGNAME string "setlogmask program name" default "setlogmask" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/system/setlogmask/Makefile b/system/setlogmask/Makefile index 885cea50f..f8eba32b0 100644 --- a/system/setlogmask/Makefile +++ b/system/setlogmask/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # setlogmask command -CONFIG_SYSTEM_SETLOGMASK_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_SYSTEM_SETLOGMASK_STACKSIZE ?= 2048 - -APPNAME = setlogmask +PROGNAME = $(CONFIG_SYSTEM_SETLOGMASK_PROGNAME) PRIORITY = $(CONFIG_SYSTEM_SETLOGMASK_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_SETLOGMASK_STACKSIZE) - -CONFIG_SYSTEM_SETLOGMASK_PROGNAME ?= setlogmask$(EXEEXT) -PROGNAME = $(CONFIG_SYSTEM_SETLOGMASK_PROGNAME) +MODULE = $(CONFIG_SYSTEM_SETLOGMASK) # Files MAINSRC = setlogmask.c -MODULE = CONFIG_SYSTEM_SETLOGMASK - include $(APPDIR)/Application.mk diff --git a/system/setlogmask/setlogmask.c b/system/setlogmask/setlogmask.c index 1d267220a..7ea22efd4 100644 --- a/system/setlogmask/setlogmask.c +++ b/system/setlogmask/setlogmask.c @@ -85,11 +85,7 @@ static void show_usage(FAR const char *progname, int exitcode) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int setlogmask_main(int argc, char **argv) -#endif { if (argc < 2) { diff --git a/system/spi/Kconfig b/system/spi/Kconfig index 2f8fb10de..ecd306bd4 100644 --- a/system/spi/Kconfig +++ b/system/spi/Kconfig @@ -16,7 +16,6 @@ if SYSTEM_SPITOOL config SPITOOL_PROGNAME string "Program name" default "hello" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the ELF program is installed. diff --git a/system/spi/Makefile b/system/spi/Makefile index c1dd9c425..c352e8003 100644 --- a/system/spi/Makefile +++ b/system/spi/Makefile @@ -40,16 +40,9 @@ include $(TOPDIR)/Make.defs CSRCS = spi_bus.c spi_devif.c spi_exch.c spi_common.c MAINSRC = spi_main.c -CONFIG_SPITOOL_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_SPITOOL_STACKSIZE ?= 2048 - -APPNAME = spi +PROGNAME = $(CONFIG_SPITOOL_PROGNAME) PRIORITY = $(CONFIG_SPITOOL_PRIORITY) STACKSIZE = $(CONFIG_SPITOOL_STACKSIZE) - -CONFIG_SPITOOL_PROGNAME ?= spi$(EXEEXT) -PROGNAME = $(CONFIG_SPITOOL_PROGNAME) - -MODULE = CONFIG_SYSTEM_SPITOOL +MODULE = $(CONFIG_SYSTEM_SPITOOL) include $(APPDIR)/Application.mk diff --git a/system/spi/spi_main.c b/system/spi/spi_main.c index 8a905d346..de6efdee6 100644 --- a/system/spi/spi_main.c +++ b/system/spi/spi_main.c @@ -357,11 +357,7 @@ static void spi_teardown(FAR struct spitool_s *spitool) * Name: spi_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int spi_main(int argc, char *argv[]) -#endif { /* Verify settings */ diff --git a/system/stackmonitor/Kconfig b/system/stackmonitor/Kconfig index d359263b0..40807a97c 100644 --- a/system/stackmonitor/Kconfig +++ b/system/stackmonitor/Kconfig @@ -6,7 +6,7 @@ menuconfig SYSTEM_STACKMONITOR tristate "Stack Monitor" default n - depends on FS_PROCFS && !_FS_PROCFS_EXCLUDE_PROCESS && STACK_COLORATION + depends on FS_PROCFS && !FS_PROCFS_EXCLUDE_PROCESS && STACK_COLORATION ---help--- If the stack coloration feature is enabled (STACK_COLORATION) this option will select the Stack Monitor. The stack monitor is a daemon diff --git a/system/stackmonitor/Makefile b/system/stackmonitor/Makefile index 845e30878..0dfa56095 100644 --- a/system/stackmonitor/Makefile +++ b/system/stackmonitor/Makefile @@ -37,16 +37,11 @@ include $(TOPDIR)/Make.defs # Stack Monitor Application +PROGNAME = stackmonitor_start stackmonitor_stop PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_SYSTEM_STACKMONITOR) MAINSRC = stackmonitor.c -CONFIG_XYZ_PROGNAME ?= stackmon$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -APPNAME = stackmonitor_start stackmonitor_stop - -MODULE = CONFIG_SYSTEM_STACKMONITOR - include $(APPDIR)/Application.mk diff --git a/system/stackmonitor/stackmonitor.c b/system/stackmonitor/stackmonitor.c index 6616343fb..622e2675e 100644 --- a/system/stackmonitor/stackmonitor.c +++ b/system/stackmonitor/stackmonitor.c @@ -418,7 +418,7 @@ static int stackmonitor_daemon(int argc, char **argv) * Public Functions ****************************************************************************/ -int stackmonitor_start_main(int argc, char **argv) +int main(int argc, char **argv) { /* Has the monitor already started? */ diff --git a/system/sudoku/Makefile b/system/sudoku/Makefile index 83cbd2f8a..9e4d1c3c3 100644 --- a/system/sudoku/Makefile +++ b/system/sudoku/Makefile @@ -37,17 +37,11 @@ include $(TOPDIR)/Make.defs # Sudoku Application -CONFIG_SYSTEM_SUDOKU_STACKSIZE ?= 1536 -CONFIG_SYSTEM_SUDOKU_PRIORITY ?= 100 - +PROGNAME = sudoku STACKSIZE = $(CONFIG_SYSTEM_SUDOKU_STACKSIZE) PRIORITY = $(CONFIG_SYSTEM_SUDOKU_PRIORITY) +MODULE = $(CONFIG_SYSTEM_SUDOKU) MAINSRC = sudoku.c -CONFIG_XYZ_PROGNAME ?= sudoku$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_SYSTEM_SUDOKU - include $(APPDIR)/Application.mk diff --git a/system/sudoku/sudoku.c b/system/sudoku/sudoku.c index 9ceb681b5..887d61edb 100644 --- a/system/sudoku/sudoku.c +++ b/system/sudoku/sudoku.c @@ -500,11 +500,7 @@ static inline void count_cells(void) * Private Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int sudoku_main(int argc, char **argv, char **envp) -#endif { int cmd; int nchanged; diff --git a/system/taskset/Kconfig b/system/taskset/Kconfig index e1ea830c2..b28b865ad 100644 --- a/system/taskset/Kconfig +++ b/system/taskset/Kconfig @@ -14,7 +14,6 @@ if SYSTEM_TASKSET config SYSTEM_TASKSET_PROGNAME string "Taskset program name" default "taskset" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/system/taskset/Makefile b/system/taskset/Makefile index 4af8fb829..94d5ff07c 100644 --- a/system/taskset/Makefile +++ b/system/taskset/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # taskset command -CONFIG_SYSTEM_TASKSET_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_SYSTEM_TASKSET_STACKSIZE ?= 2048 - -APPNAME = taskset +PROGNAME = $(CONFIG_SYSTEM_TASKSET_PROGNAME) PRIORITY = $(CONFIG_SYSTEM_TASKSET_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_TASKSET_STACKSIZE) - -CONFIG_SYSTEM_TASKSET_PROGNAME ?= taskset$(EXEEXT) -PROGNAME = $(CONFIG_SYSTEM_TASKSET_PROGNAME) +MODULE = $(CONFIG_SYSTEM_TASKSET) # Files MAINSRC = taskset.c -MODULE = CONFIG_SYSTEM_TASKSET - include $(APPDIR)/Application.mk diff --git a/system/taskset/taskset.c b/system/taskset/taskset.c index 0bbdd656d..b7307549a 100644 --- a/system/taskset/taskset.c +++ b/system/taskset/taskset.c @@ -95,11 +95,7 @@ static bool get_cpuset(const char *arg, cpu_set_t *cpu_set) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int taskset_main(int argc, char **argv) -#endif { FAR char *nshargv[2]; char command[CONFIG_NSH_LINELEN]; diff --git a/system/tee/Makefile b/system/tee/Makefile index f3cfc91a8..d03099d40 100644 --- a/system/tee/Makefile +++ b/system/tee/Makefile @@ -39,18 +39,11 @@ include $(TOPDIR)/Make.defs # tee command -CONFIG_SYSTEM_TEE_STACKSIZE ?= 1536 -CONFIG_SYSTEM_TEE_PRIORITY ?= 100 - -APPNAME = tee +PROGNAME = tee PRIORITY = $(CONFIG_SYSTEM_TEE_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_TEE_PRIORITY) +MODULE = $(CONFIG_SYSTEM_TEE) MAINSRC = tee.c -CONFIG_XYZ_PROGNAME ?= tee$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_SYSTEM_TEE - include $(APPDIR)/Application.mk diff --git a/system/tee/tee.c b/system/tee/tee.c index 64708fdde..474a689c0 100644 --- a/system/tee/tee.c +++ b/system/tee/tee.c @@ -121,11 +121,7 @@ static void show_usage(FAR const char *progrname, int exitcode) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int tee_main(int argc, char *argv[]) -#endif { FAR struct tee_list_s *head = NULL; FAR struct tee_list_s *curr; diff --git a/system/telnet/Kconfig b/system/telnet/Kconfig index a034be733..80746a080 100644 --- a/system/telnet/Kconfig +++ b/system/telnet/Kconfig @@ -16,9 +16,6 @@ if SYSTEM_TELNET_CHATD config SYSTEM_TELNET_CHATD_PROGNAME string "Chat daemon program name" default "chatd" - depends on BUILD_LOADABLE - -if NSH_BUILTIN_APPS config SYSTEM_TELNET_CHATD_STACKSIZE int "Chat daemon stacksize" @@ -28,7 +25,6 @@ config SYSTEM_TELNET_CHATD_PRIORITY int "Chat daemon priority" default 100 -endif # NSH_BUILTIN_APPS endif # SYSTEM_TELNET_CHATD menuconfig SYSTEM_TELNET_CLIENT @@ -45,9 +41,6 @@ if SYSTEM_TELNET_CLIENT config SYSTEM_TELNET_CLIENT_PROGNAME string "Telnet client program name" default "telnet" - depends on BUILD_LOADABLE - -if NSH_BUILTIN_APPS config SYSTEM_TELNET_CLIENT_STACKSIZE int "Telnet client stacksize" @@ -57,5 +50,4 @@ config SYSTEM_TELNET_CLIENT_PRIORITY int "Telnet client priority" default 100 -endif # NSH_BUILTIN_APPS endif # SYSTEM_TELNET_CLIENT diff --git a/system/telnet/Makefile b/system/telnet/Makefile index a86228761..57398faa0 100644 --- a/system/telnet/Makefile +++ b/system/telnet/Makefile @@ -39,16 +39,11 @@ ifneq ($(CONFIG_SYSTEM_TELNET_CHATD),) MAINSRC = telnet_chatd.c -CONFIG_SYSTEM_TELNET_CHATD_PROGNAME ?= chatd -CONFIG_SYSTEM_TELNET_CHATD_PRIORITY ?= 100 -CONFIG_SYSTEM_TELNET_CHATD_STACKSIZE ?= 2048 - -APPNAME = chatd PROGNAME = $(CONFIG_SYSTEM_TELNET_CHATD_PROGNAME) PRIORITY = $(CONFIG_SYSTEM_TELNET_CHATD_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_TELNET_CHATD_STACKSIZE) -MODULE = CONFIG_CONFIG_SYSTEM_TELNET_CHATD +MODULE = $(CONFIG_CONFIG_SYSTEM_TELNET_CHATD) endif @@ -56,16 +51,11 @@ ifneq ($(CONFIG_SYSTEM_TELNET_CLIENT),) MAINSRC += telnet_client.c -CONFIG_SYSTEM_TELNET_CLIENT_PROGNAME ?= telnet -CONFIG_SYSTEM_TELNET_CLIENT_PRIORITY ?= 100 -CONFIG_SYSTEM_TELNET_CLIENT_STACKSIZE ?= 2048 - -APPNAME += telnet PROGNAME += $(CONFIG_SYSTEM_TELNET_CLIENT_PROGNAME) PRIORITY += $(CONFIG_SYSTEM_TELNET_CLIENT_PRIORITY) STACKSIZE += $(CONFIG_SYSTEM_TELNET_CLIENT_STACKSIZE) -MODULE = CONFIG_CONFIG_SYSTEM_TELNET_CLIENT +MODULE = $(CONFIG_CONFIG_SYSTEM_TELNET_CLIENT) endif diff --git a/system/telnet/telnet_chatd.c b/system/telnet/telnet_chatd.c index a76aa39b7..6d51ead39 100644 --- a/system/telnet/telnet_chatd.c +++ b/system/telnet/telnet_chatd.c @@ -321,11 +321,7 @@ static void _event_handler(struct telnet_s *telnet, * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int chatd_main(int argc, char *argv[]) -#endif { char buffer[512]; short listen_port; diff --git a/system/telnet/telnet_client.c b/system/telnet/telnet_client.c index 47f9599fb..6f1d3549d 100644 --- a/system/telnet/telnet_client.c +++ b/system/telnet/telnet_client.c @@ -271,11 +271,7 @@ static void show_usage(const char *progname, int exitcode) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int telnet_main(int argc, char *argv[]) -#endif { char buffer[512]; union diff --git a/system/ubloxmodem/Makefile b/system/ubloxmodem/Makefile index 0a54e83a6..2b4b8a4b0 100644 --- a/system/ubloxmodem/Makefile +++ b/system/ubloxmodem/Makefile @@ -39,13 +39,9 @@ include $(TOPDIR)/Make.defs MAINSRC = ubloxmodem_main.c -CONFIG_XYZ_PROGNAME ?= ubloxmodem$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -APPNAME = ubloxmodem +PROGNAME = ubloxmodem PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_SYSTEM_UBLOXMODEM +MODULE = $(CONFIG_SYSTEM_UBLOXMODEM) include $(APPDIR)/Application.mk diff --git a/system/ubloxmodem/ubloxmodem_main.c b/system/ubloxmodem/ubloxmodem_main.c index f7c7b1288..ff3284e14 100644 --- a/system/ubloxmodem/ubloxmodem_main.c +++ b/system/ubloxmodem/ubloxmodem_main.c @@ -406,11 +406,7 @@ static int ubloxmodem_exec(FAR struct ubloxmodem_cxt *cxt) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char** argv) -#else -int ubloxmodem_main(int argc, FAR char** argv) -#endif { struct ubloxmodem_cxt cxt; int ret; diff --git a/system/usbmsc/Kconfig b/system/usbmsc/Kconfig index b34565e36..620ddd93c 100644 --- a/system/usbmsc/Kconfig +++ b/system/usbmsc/Kconfig @@ -99,7 +99,7 @@ config SYSTEM_USBMSC_DEBUGMM config SYSTEM_USBMSC_TRACE bool "Trace USB activity" default n - depends on (USBDEV_TRACE || DEBUG_USB) && !NSH_BUILTIN_APPS + depends on USBDEV_TRACE || DEBUG_USB ---help--- If this add-on is built as a standalone task and if USB device tracing is enabled, then this add-on can be configured to unobtrusively monitor @@ -154,8 +154,6 @@ config SYSTEM_USBMSC_TRACEINTERRUPTS endif # SYSTEM_USBMSC_TRACE -if NSH_BUILTIN_APPS - config SYSTEM_USBMSC_CMD_STACKSIZE int "Stacksize of msconn and msdis commands" default 768 @@ -170,6 +168,5 @@ config SYSTEM_USBMSC_CMD_PRIORITY ---help--- Priority of the small 'msconn' and 'msdis' command applications. -endif # NSH_BUILTIN_APPS endif # SYSTEM_USBMSC diff --git a/system/usbmsc/Makefile b/system/usbmsc/Makefile index faae440fb..e24966e88 100644 --- a/system/usbmsc/Makefile +++ b/system/usbmsc/Makefile @@ -35,21 +35,11 @@ include $(TOPDIR)/Make.defs -CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE ?= 768 -CONFIG_SYSTEM_USBMSC_CMD_PRIORITY ?= SCHED_PRIORITY_DEFAULT - +PROGNAME = msconn msdis PRIORITY = $(CONFIG_SYSTEM_USBMSC_CMD_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_USBMSC_CMD_STACKSIZE) +MODULE = $(CONFIG_SYSTEM_USBMSC) MAINSRC = usbmsc_main.c -PROGNAME = usbmsc$(EXEEXT) - -ifeq ($(CONFIG_SYSTEM_USBMSC),m) -APPNAME = usbmsc -else -APPNAME = msconn msdis -endif - -MODULE = CONFIG_SYSTEM_USBMSC include $(APPDIR)/Application.mk diff --git a/system/usbmsc/usbmsc_main.c b/system/usbmsc/usbmsc_main.c index b970494e8..2e10c3226 100644 --- a/system/usbmsc/usbmsc_main.c +++ b/system/usbmsc/usbmsc_main.c @@ -434,11 +434,7 @@ static void usbmsc_disconnect(FAR void *handle) * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int msconn_main(int argc, char *argv[]) -#endif { struct boardioc_usbdev_ctrl_s ctrl; FAR void *handle; @@ -619,18 +615,13 @@ int msconn_main(int argc, char *argv[]) * * Description: * This is a program entry point that will disconnect the USB mass storage - * device. This program is only available if CONFIG_NSH_BUILTIN_APPS + * device. This program is only available if CONFIG_SYSTEM_USBMSC == y * is defined in the NuttX configuration. In that case, this program can * be executed by entering the "msdis" command at the NSH console. * ****************************************************************************/ -#ifdef CONFIG_NSH_BUILTIN_APPS -#ifdef BUILD_MODULE -int main(int argc, FAR char **argv) -#else int msdis_main(int argc, char *argv[]) -#endif { /* First check if the USB mass storage device is already connected */ @@ -654,4 +645,3 @@ int msdis_main(int argc, char *argv[]) final_memory_usage("Final memory usage"); return EXIT_SUCCESS; } -#endif diff --git a/system/vi/Kconfig b/system/vi/Kconfig index 8b27ccf8f..f04f1d9d9 100644 --- a/system/vi/Kconfig +++ b/system/vi/Kconfig @@ -71,8 +71,6 @@ config SYSTEM_VI_DEBUGLEVEL readable debug output, syslog'ing should sent to some device other than /dev/console (which is the default). -if NSH_BUILTIN_APPS - config SYSTEM_VI_STACKSIZE int "Builtin task stack size" default 2048 @@ -103,5 +101,4 @@ config SYSTEM_VI_INCLUDE_COMMAND_REPEAT # ---help--- # Number of undo / redo operations saved. -endif # NSH_BUILTIN_APPS endif # SYSTEM_VI diff --git a/system/vi/Makefile b/system/vi/Makefile index 63113ed17..d9d036a32 100644 --- a/system/vi/Makefile +++ b/system/vi/Makefile @@ -37,18 +37,11 @@ include $(TOPDIR)/Make.defs # VI-Workalike Editor -CONFIG_SYSTEM_VI_STACKSIZE ?= 2048 -CONFIG_SYSTEM_VI_PRIORITY ?= 100 - -APPNAME = vi +PROGNAME = vi PRIORITY = $(CONFIG_SYSTEM_VI_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_VI_STACKSIZE) +MODULE = $(CONFIG_SYSTEM_VI) MAINSRC = vi.c -CONFIG_XYZ_PROGNAME ?= vi$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_SYSTEM_VI - include $(APPDIR)/Application.mk diff --git a/system/vi/vi.c b/system/vi/vi.c index fb4c2f1d0..5853059c9 100644 --- a/system/vi/vi.c +++ b/system/vi/vi.c @@ -5758,11 +5758,7 @@ static void vi_showusage(FAR struct vi_s *vi, FAR const char *progname, * ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int vi_main(int argc, char **argv) -#endif { FAR struct vi_s *vi; int option; diff --git a/system/zmodem/Makefile b/system/zmodem/Makefile index b9cfb0c15..88abdd90f 100644 --- a/system/zmodem/Makefile +++ b/system/zmodem/Makefile @@ -35,23 +35,13 @@ include $(TOPDIR)/Make.defs -CONFIG_SYSTEM_SZPROGNAME ?= sz$(EXEEXT) -PROGNAME = $(CONFIG_SYSTEM_SZPROGNAME) - -CONFIG_SYSTEM_RZPROGNAME ?= rz$(EXEEXT) -PROGNAME += $(CONFIG_SYSTEM_RZPROGNAME) - -CONFIG_SYSTEM_ZMODEM_PRIORITY ?= 100 -CONFIG_SYSTEM_ZMODEM_STACKSIZE ?= 2048 - +PROGNAME = sz rz PRIORITY = $(CONFIG_SYSTEM_ZMODEM_PRIORITY) STACKSIZE = $(CONFIG_SYSTEM_ZMODEM_STACKSIZE) +MODULE = $(CONFIG_SYSTEM_ZMODEM) CSRCS = zm_send.c zm_receive.c zm_state.c zm_proto.c zm_watchdog.c CSRCS += zm_utils.c MAINSRC = sz_main.c rz_main.c -APPNAME = sz rz - -MODULE = CONFIG_SYSTEM_ZMODEM include $(APPDIR)/Application.mk diff --git a/system/zmodem/rz_main.c b/system/zmodem/rz_main.c index 6b1bd4098..3597c7a1b 100644 --- a/system/zmodem/rz_main.c +++ b/system/zmodem/rz_main.c @@ -74,11 +74,7 @@ static void show_usage(FAR const char *progname, int errcode) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int rz_main(int argc, FAR char **argv) -#endif { ZMRHANDLE handle; FAR const char *devname = CONFIG_SYSTEM_ZMODEM_DEVNAME; diff --git a/system/zmodem/sz_main.c b/system/zmodem/sz_main.c index c9752cdca..f02c54e3b 100644 --- a/system/zmodem/sz_main.c +++ b/system/zmodem/sz_main.c @@ -91,11 +91,7 @@ static void show_usage(FAR const char *progname, int errcode) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int sz_main(int argc, FAR char **argv) -#endif { enum zm_xfertype_e xfrtype = XM_XFERTYPE_NORMAL; enum zm_option_e xfroption = XM_OPTION_REPLACE; diff --git a/testing/README.txt b/testing/README.txt index 1b9c2602d..a15ab58d7 100644 --- a/testing/README.txt +++ b/testing/README.txt @@ -142,11 +142,6 @@ testing/smart_test * CONFIG_TESTING_SMART_TEST=y - Dependencies: - - * CONFIG_NSH_BUILTIN_APPS=y: This test can be built only as an NSH - command - Source: NuttX Author: Ken Pettit Date: April 24, 2013 diff --git a/testing/cxxtest/Makefile b/testing/cxxtest/Makefile index 0dcc1308b..a4ebf64e0 100644 --- a/testing/cxxtest/Makefile +++ b/testing/cxxtest/Makefile @@ -39,15 +39,11 @@ include $(TOPDIR)/Make.defs MAINSRC = cxxtest_main.cxx -CONFIG_XYZ_PROGNAME ?= cxxtest$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # cxxtest built-in application info -APPNAME = cxxtest +PROGNAME = cxxtest PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 4096 - -MODULE = CONFIG_TESTING_CXXTEST +MODULE = $(CONFIG_TESTING_CXXTEST) include $(APPDIR)/Application.mk diff --git a/testing/cxxtest/cxxtest_main.cxx b/testing/cxxtest/cxxtest_main.cxx index 3986c87bd..682da9a06 100644 --- a/testing/cxxtest/cxxtest_main.cxx +++ b/testing/cxxtest/cxxtest_main.cxx @@ -245,7 +245,7 @@ static void test_exception(void) extern "C" { - int cxxtest_main(int argc, char *argv[]) + int main(int argc, char *argv[]) { // If C++ initialization for static constructors is supported, then do // that first diff --git a/testing/fstest/Kconfig b/testing/fstest/Kconfig index c21c561fb..e9c84de72 100644 --- a/testing/fstest/Kconfig +++ b/testing/fstest/Kconfig @@ -15,7 +15,6 @@ if TESTING_FSTEST config TESTING_FSTEST_PROGNAME string "Program name" default "fstest" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/testing/fstest/Makefile b/testing/fstest/Makefile index 1399864bc..cd805e93d 100644 --- a/testing/fstest/Makefile +++ b/testing/fstest/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # Generic file system stress test application info -CONFIG_TESTING_FSTEST_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_TESTING_FSTEST_STACKSIZE ?= 2048 - -APPNAME = fstest +PROGNAME = $(CONFIG_TESTING_FSTEST_PROGNAME) PRIORITY = $(CONFIG_TESTING_FSTEST_PRIORITY) STACKSIZE = $(CONFIG_TESTING_FSTEST_STACKSIZE) +MODULE = $(CONFIG_TESTING_FSTEST) # Generic file system stress test MAINSRC = fstest_main.c -CONFIG_TESTING_FSTEST_PROGNAME ?= hello$(EXEEXT) -PROGNAME = $(CONFIG_TESTING_FSTEST_PROGNAME) - -MODULE = CONFIG_TESTING_FSTEST - include $(APPDIR)/Application.mk diff --git a/testing/fstest/fstest_main.c b/testing/fstest/fstest_main.c index a4eb79352..ede130352 100644 --- a/testing/fstest/fstest_main.c +++ b/testing/fstest/fstest_main.c @@ -951,11 +951,7 @@ static int fstest_directory(void) * Name: fstest_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int fstest_main(int argc, char *argv[]) -#endif { struct statfs buf; unsigned int i; diff --git a/testing/nxffs/Makefile b/testing/nxffs/Makefile index 8267bbcad..6d10772f9 100644 --- a/testing/nxffs/Makefile +++ b/testing/nxffs/Makefile @@ -37,13 +37,11 @@ include $(TOPDIR)/Make.defs # NXFFS file system example -APPNAME = nxffs +PROGNAME = nxffs +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_TESTING_NXFFS) MAINSRC = nxffs_main.c -CONFIG_XYZ_PROGNAME ?= nxffs$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_TESTING_NXFFS - include $(APPDIR)/Application.mk diff --git a/testing/nxffs/nxffs_main.c b/testing/nxffs/nxffs_main.c index 189401ce8..e7ecdc9cf 100644 --- a/testing/nxffs/nxffs_main.c +++ b/testing/nxffs/nxffs_main.c @@ -783,11 +783,7 @@ static int nxffs_directory(void) * Name: nxffs_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int nxffs_main(int argc, char *argv[]) -#endif { FAR struct mtd_dev_s *mtd; unsigned int i; diff --git a/testing/ostest/Makefile b/testing/ostest/Makefile index ebaa92897..091b0be40 100644 --- a/testing/ostest/Makefile +++ b/testing/ostest/Makefile @@ -37,9 +37,10 @@ include $(TOPDIR)/Make.defs # ostest built-in application info -APPNAME = ostest +PROGNAME = ostest PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 +MODULE = $(CONFIG_TESTING_OSTEST) # NuttX OS Test @@ -133,9 +134,4 @@ CSRCS += prioinherit.c endif # CONFIG_PRIORITY_INHERITANCE endif # CONFIG_DISABLE_PTHREAD -CONFIG_XYZ_PROGNAME ?= ostest$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_TESTING_OSTEST - include $(APPDIR)/Application.mk diff --git a/testing/ostest/ostest_main.c b/testing/ostest/ostest_main.c index 61f58ad36..57ad67f49 100644 --- a/testing/ostest/ostest_main.c +++ b/testing/ostest/ostest_main.c @@ -592,11 +592,7 @@ static void stdio_test(void) * ostest_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char **argv) -#else -int ostest_main(int argc, FAR char *argv[]) -#endif { int result; #ifdef CONFIG_TESTING_OSTEST_WAITRESULT diff --git a/testing/scanftest/Kconfig b/testing/scanftest/Kconfig index 5967d5a05..825661cce 100644 --- a/testing/scanftest/Kconfig +++ b/testing/scanftest/Kconfig @@ -18,7 +18,6 @@ if TESTING_SCANFTEST config TESTING_SCANFTEST_PROGNAME string "Program name" default "scanftest" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/testing/scanftest/Makefile b/testing/scanftest/Makefile index 01e7c2952..744e5f9f0 100644 --- a/testing/scanftest/Makefile +++ b/testing/scanftest/Makefile @@ -37,21 +37,13 @@ include $(TOPDIR)/Make.defs # scanf() test built-in application info -CONFIG_TESTING_SCANFTEST_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_TESTING_SCANFTEST_STACKSIZE ?= 2048 - -APPNAME = scanftest - +PROGNAME = $(CONFIG_TESTING_SCANFTEST_PROGNAME) PRIORITY = $(CONFIG_TESTING_SCANFTEST_PRIORITY) STACKSIZE = $(CONFIG_TESTING_SCANFTEST_STACKSIZE) +MODULE = $(CONFIG_TESTING_SCANFTEST) # scanf test files MAINSRC = scanftest_main.c -CONFIG_TESTING_SCANFTEST_PROGNAME ?= scanftest$(EXEEXT) -PROGNAME = $(CONFIG_TESTING_SCANFTEST_PROGNAME) - -MODULE = CONFIG_TESTING_SCANFTEST - include $(APPDIR)/Application.mk diff --git a/testing/scanftest/scanftest_main.c b/testing/scanftest/scanftest_main.c index 76e6105d8..555877840 100644 --- a/testing/scanftest/scanftest_main.c +++ b/testing/scanftest/scanftest_main.c @@ -1060,11 +1060,7 @@ type_data[] = * scanftest_main ****************************************************************************/ -#if defined(BUILD_MODULE) int main(int argc, FAR char *argv[]) -#else -int scanftest_main(int argc, char *argv[]) -#endif { int t; int i; diff --git a/testing/smart/Makefile b/testing/smart/Makefile index 8f06f6a9d..7ed81d2ce 100644 --- a/testing/smart/Makefile +++ b/testing/smart/Makefile @@ -37,13 +37,11 @@ include $(TOPDIR)/Make.defs # SMART file system stress test -APPNAME = smart +PROGNAME = smart +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 2048 +MODULE = $(CONFIG_TESTING_SMART) MAINSRC = smart_main.c -CONFIG_XYZ_PROGNAME ?= smart$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_TESTING_SMART - include $(APPDIR)/Application.mk diff --git a/testing/smart/smart_main.c b/testing/smart/smart_main.c index 3cf0df3e0..a6100ad3b 100644 --- a/testing/smart/smart_main.c +++ b/testing/smart/smart_main.c @@ -791,11 +791,7 @@ static int smart_directory(void) * Name: smart_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int smart_main(int argc, char *argv[]) -#endif { FAR struct mtd_dev_s *mtd; unsigned int i; diff --git a/testing/smart_test/Kconfig b/testing/smart_test/Kconfig index f5db4a810..b28fbd0b6 100644 --- a/testing/smart_test/Kconfig +++ b/testing/smart_test/Kconfig @@ -6,7 +6,6 @@ config TESTING_SMART_TEST tristate "SMART filesystem test tool" default n - depends on NSH_BUILTIN_APPS ---help--- Performs a file-based test on a SMART (or any) filesystem. Validates seek, append and seek-with-write operations. This test can be built diff --git a/testing/smart_test/Makefile b/testing/smart_test/Makefile index be4c07921..a62ae8d60 100644 --- a/testing/smart_test/Makefile +++ b/testing/smart_test/Makefile @@ -42,15 +42,11 @@ endif # SMART filesystem test tool -APPNAME = smart_test +PROGNAME = smart_test PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 4096 +MODULE = $(CONFIG_TESTING_SMART_TEST) MAINSRC = smart_test.c -CONFIG_XYZ_PROGNAME ?= smart_test$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -MODULE = CONFIG_TESTING_SMART_TEST - include $(APPDIR)/Application.mk diff --git a/testing/smart_test/README.txt b/testing/smart_test/README.txt index 390c41fb3..2675067e7 100644 --- a/testing/smart_test/README.txt +++ b/testing/smart_test/README.txt @@ -6,11 +6,6 @@ README * CONFIG_TESTING_SMART_TEST=y - Dependencies: - - * CONFIG_NSH_BUILTIN_APPS=y: This test can be built only as an NSH - command - Source: NuttX Author: Ken Pettit Date: April 24, 2013 diff --git a/testing/smart_test/smart_test.c b/testing/smart_test/smart_test.c index d3f8ee570..f57d03b27 100644 --- a/testing/smart_test/smart_test.c +++ b/testing/smart_test/smart_test.c @@ -586,11 +586,7 @@ static void smart_usage(void) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int smart_test_main(int argc, char *argv[]) -#endif { int ret, opt; diff --git a/testing/smp/Kconfig b/testing/smp/Kconfig index 0b898a8e8..746c5a14b 100644 --- a/testing/smp/Kconfig +++ b/testing/smp/Kconfig @@ -25,7 +25,6 @@ config TESTING_SMP_NBARRIER_THREADS config TESTING_SMP_PROGNAME string "Program name" default "smp" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/testing/smp/Makefile b/testing/smp/Makefile index b7cb9016e..58232c347 100644 --- a/testing/smp/Makefile +++ b/testing/smp/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # SMP built-in application info -CONFIG_TESTING_SMP_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_TESTING_SMP_STACKSIZE ?= 2048 - -APPNAME = smp +PROGNAME = $(CONFIG_TESTING_SMP_PROGNAME) PRIORITY = $(CONFIG_TESTING_SMP_PRIORITY) STACKSIZE = $(CONFIG_TESTING_SMP_STACKSIZE) +MODULE = $(CONFIG_TESTING_SMP) # SMP Example MAINSRC = smp_main.c -CONFIG_TESTING_SMP_PROGNAME ?= smp$(EXEEXT) -PROGNAME = $(CONFIG_TESTING_SMP_PROGNAME) - -MODULE = CONFIG_TESTING_SMP - include $(APPDIR)/Application.mk diff --git a/testing/smp/smp_main.c b/testing/smp/smp_main.c index 35327db43..dea93b907 100644 --- a/testing/smp/smp_main.c +++ b/testing/smp/smp_main.c @@ -217,11 +217,7 @@ static pthread_addr_t barrier_thread(pthread_addr_t parameter) * smp_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int smp_main(int argc, char *argv[]) -#endif { pthread_t threadid[CONFIG_TESTING_SMP_NBARRIER_THREADS]; pthread_addr_t result; diff --git a/wireless/bluetooth/btsak/Kconfig b/wireless/bluetooth/btsak/Kconfig index a207066f5..b64ff7008 100644 --- a/wireless/bluetooth/btsak/Kconfig +++ b/wireless/bluetooth/btsak/Kconfig @@ -14,7 +14,6 @@ if BTSAK config BTSAK_PROGNAME string "Program name" default "bt" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/wireless/bluetooth/btsak/Makefile b/wireless/bluetooth/btsak/Makefile index acda1ea0a..302685b6d 100644 --- a/wireless/bluetooth/btsak/Makefile +++ b/wireless/bluetooth/btsak/Makefile @@ -43,15 +43,9 @@ MAINSRC = btsak_main.c # Application info -CONFIG_BTSAK_PROGNAME ?= bt$(EXEXT) -CONFIG_BTSAK_PRIORITY ?= 100 -CONFIG_BTSAK_STACKSIZE ?= 2048 - PROGNAME = $(CONFIG_BTSAK_PROGNAME) -APPNAME = bt PRIORITY = $(CONFIG_BTSAK_PRIORITY) STACKSIZE = $(CONFIG_BTSAK_STACKSIZE) - -MODULE = CONFIG_BTSAK +MODULE = $(CONFIG_BTSAK) include $(APPDIR)/Application.mk diff --git a/wireless/bluetooth/btsak/btsak_main.c b/wireless/bluetooth/btsak/btsak_main.c index e69b5aa35..054e92f52 100644 --- a/wireless/bluetooth/btsak/btsak_main.c +++ b/wireless/bluetooth/btsak/btsak_main.c @@ -244,11 +244,7 @@ void btsak_cmd_gatt(FAR struct btsak_s *btsak, int argc, FAR char *argv[]) * bt_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int bt_main(int argc, char *argv[]) -#endif { FAR const struct btsak_command_s *cmd; struct btsak_s btsak; diff --git a/wireless/gs2200m/Makefile b/wireless/gs2200m/Makefile index 67b06cb87..07b515e88 100644 --- a/wireless/gs2200m/Makefile +++ b/wireless/gs2200m/Makefile @@ -37,20 +37,13 @@ include $(TOPDIR)/Make.defs # gs2200m command -CONFIG_WIRELESS_GS2200M_PRIORITY ?= SCHED_PRIORITY_DEFAULT -CONFIG_WIRELESS_GS2200M_STACKSIZE ?= 2048 - -APPNAME = gs2200m +PROGNAME = $(CONFIG_WIRELESS_GS2200M_PROGNAME) PRIORITY = $(CONFIG_WIRELESS_GS2200M_PRIORITY) STACKSIZE = $(CONFIG_WIRELESS_GS2200M_STACKSIZE) - -CONFIG_WIRELESS_GS2200M_PROGNAME ?= gs2200m$(EXEEXT) -PROGNAME = $(CONFIG_WIRELESS_GS2200M_PROGNAME) +MODULE = $(CONFIG_WIRELESS_GS2200M) # Files MAINSRC = gs2200m_main.c -MODULE = CONFIG_WIRELESS_GS2200M - include $(APPDIR)/Application.mk diff --git a/wireless/gs2200m/gs2200m_main.c b/wireless/gs2200m/gs2200m_main.c index 22c11881c..39f32b36d 100644 --- a/wireless/gs2200m/gs2200m_main.c +++ b/wireless/gs2200m/gs2200m_main.c @@ -1436,11 +1436,7 @@ static void _show_usage(FAR char *cmd) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int gs2200m_main(int argc, char **argv) -#endif { int option; int ret; diff --git a/wireless/ieee802154/i8sak/Kconfig b/wireless/ieee802154/i8sak/Kconfig index d67b2c631..4e0685729 100644 --- a/wireless/ieee802154/i8sak/Kconfig +++ b/wireless/ieee802154/i8sak/Kconfig @@ -16,7 +16,6 @@ if IEEE802154_I8SAK config IEEE802154_I8SAK_PROGNAME string "Program name" default "i8" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/wireless/ieee802154/i8sak/Makefile b/wireless/ieee802154/i8sak/Makefile index 070829b6c..e8a9e5d17 100644 --- a/wireless/ieee802154/i8sak/Makefile +++ b/wireless/ieee802154/i8sak/Makefile @@ -38,14 +38,10 @@ include $(TOPDIR)/Make.defs # IEEE 802.15.4 SAK (swiss army knife ) -CONFIG_IEEE802154_I8SAK_PROGNAME ?= i8sak$(EXEEXT) -CONFIG_IEEE802154_I8SAK_PRIORITY ?= 100 -CONFIG_IEEE802154_I8SAK_STACKSIZE ?= 4096 - PROGNAME = $(CONFIG_IEEE802154_I8SAK_PROGNAME) -APPNAME = i8sak PRIORITY = $(CONFIG_IEEE802154_I8SAK_PRIORITY) STACKSIZE = $(CONFIG_IEEE802154_I8SAK_STACKSIZE) +MODULE = $(CONFIG_IEEE802154_I8SAK) # IEEE 802.15.4 SAK (Swiss Army Knife) @@ -54,6 +50,4 @@ CSRCS += i8sak_sniffer.c i8sak_startpan.c i8sak_tx.c i8sak_get.c i8sak_set.c CSRCS += i8sak_reset.c i8sak_regdump.c i8sak_events.c MAINSRC = i8sak_main.c -MODULE = CONFIG_IEEE802154_I8SAK - include $(APPDIR)/Application.mk diff --git a/wireless/ieee802154/i8sak/i8sak_main.c b/wireless/ieee802154/i8sak/i8sak_main.c index ccbd72129..d7690be0e 100644 --- a/wireless/ieee802154/i8sak/i8sak_main.c +++ b/wireless/ieee802154/i8sak/i8sak_main.c @@ -835,11 +835,7 @@ static int i8sak_showusage(FAR const char *progname, int exitcode) * i8_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int i8sak_main(int argc, char *argv[]) -#endif { FAR const struct i8sak_command_s *i8sakcmd; int argind; diff --git a/wireless/ieee802154/i8shark/Makefile b/wireless/ieee802154/i8shark/Makefile index bcd8be221..5c1481364 100644 --- a/wireless/ieee802154/i8shark/Makefile +++ b/wireless/ieee802154/i8shark/Makefile @@ -37,15 +37,11 @@ include $(TOPDIR)/Make.defs MAINSRC = i8shark_main.c -CONFIG_XYZ_PROGNAME ?= i8shark$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - # application info -APPNAME = i8shark +PROGNAME = i8shark PRIORITY = SCHED_PRIORITY_DEFAULT STACKSIZE = 2048 - -MODULE = CONFIG_IEEE802154_I8SHARK +MODULE = $(CONFIG_IEEE802154_I8SHARK) include $(APPDIR)/Application.mk diff --git a/wireless/ieee802154/i8shark/i8shark_main.c b/wireless/ieee802154/i8shark/i8shark_main.c index a525e371b..80bb22635 100644 --- a/wireless/ieee802154/i8shark/i8shark_main.c +++ b/wireless/ieee802154/i8shark/i8shark_main.c @@ -477,11 +477,7 @@ static int i8shark_daemon(int argc, FAR char *argv[]) * Name: i8shark_main ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int i8shark_main(int argc, char *argv[]) -#endif { int argind = 1; diff --git a/wireless/iwpan/Kconfig b/wireless/iwpan/Kconfig index c288260e9..543e8a6b8 100644 --- a/wireless/iwpan/Kconfig +++ b/wireless/iwpan/Kconfig @@ -18,7 +18,6 @@ if WIRELESS_IWPAN config WIRELESS_IWPAN_PROGNAME string "Program Name" default "iwpan" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/wireless/iwpan/Makefile b/wireless/iwpan/Makefile index 5dcb2df4a..e25c2111c 100644 --- a/wireless/iwpan/Makefile +++ b/wireless/iwpan/Makefile @@ -34,27 +34,15 @@ # ############################################################################ -# TODO, this makefile should run make under the app dirs, instead of -# sourcing the Make.defs! - include $(TOPDIR)/Make.defs -CONFIG_WIRELESS_IWPAN_PRIORITY ?= 100 -CONFIG_WIRELESS_IWPAN_STACKSIZE ?= 2048 - # IEEE802.11 Wapi Application include $(APPDIR)/wireless/iwpan/src/Make.defs -ifneq ($(MAINSRC),) -APPNAME = iwpan +PROGNAME = $(CONFIG_WIRELESS_IWPAN_PROGNAME) PRIORITY = $(CONFIG_WIRELESS_IWPAN_PRIORITY) STACKSIZE = $(CONFIG_WIRELESS_IWPAN_STACKSIZE) - -CONFIG_IWPAN_PROGNAME ?= iwpan$(EXEEXT) -PROGNAME = $(CONFIG_IWPAN_PROGNAME) -endif - -MODULE = CONFIG_WIRELESS_IWPAN +MODULE = $(CONFIG_WIRELESS_IWPAN) include $(APPDIR)/Application.mk diff --git a/wireless/iwpan/src/iwpan.c b/wireless/iwpan/src/iwpan.c index 237d27d3e..806585a76 100644 --- a/wireless/iwpan/src/iwpan.c +++ b/wireless/iwpan/src/iwpan.c @@ -676,11 +676,7 @@ static void iwpan_showusage(FAR const char *progname, int exitcode) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int iwpan_main(int argc, char *argv[]) -#endif { FAR const char *cmdname; FAR const struct iwpan_command_s *iwpancmd; diff --git a/wireless/wapi/Kconfig b/wireless/wapi/Kconfig index 2f947502d..c5be5912f 100644 --- a/wireless/wapi/Kconfig +++ b/wireless/wapi/Kconfig @@ -4,7 +4,7 @@ # menuconfig WIRELESS_WAPI - tristate "IEEE 802.11 Configuration Library" + bool "IEEE 802.11 Configuration Library" default n depends on NET && DRIVERS_WIRELESS ---help--- @@ -14,7 +14,7 @@ menuconfig WIRELESS_WAPI if WIRELESS_WAPI config WIRELESS_WAPI_CMDTOOL - bool "IEEE 802.11 Command Line Tool" + tristate "IEEE 802.11 Command Line Tool" default n ---help--- By default, Wapi is build as only a library. If this option is @@ -24,7 +24,6 @@ config WIRELESS_WAPI_CMDTOOL config WIRELESS_WAPI_PROGNAME string "Program Name" default "wapi" - depends on BUILD_LOADABLE ---help--- This is the name of the program that will be used when the NSH ELF program is installed. diff --git a/wireless/wapi/Makefile b/wireless/wapi/Makefile index d816902f6..cc2210e95 100644 --- a/wireless/wapi/Makefile +++ b/wireless/wapi/Makefile @@ -33,27 +33,17 @@ # ############################################################################ -# TODO, this makefile should run make under the app dirs, instead of -# sourcing the Make.defs! - include $(TOPDIR)/Make.defs # IEEE802.11 Wapi Application -CONFIG_WIRELESS_WAPI_PRIORITY ?= 100 -CONFIG_WIRELESS_WAPI_STACKSIZE ?= 2048 - include $(APPDIR)/wireless/wapi/src/Make.defs -ifneq ($(MAINSRC),) -APPNAME = wapi +ifneq ($(CONFIG_WIRELESS_WAPI_CMDTOOL),) +PROGNAME = $(CONFIG_WIRELESS_WAPI_PROGNAME) PRIORITY = $(CONFIG_WIRELESS_WAPI_PRIORITY) STACKSIZE = $(CONFIG_WIRELESS_WAPI_STACKSIZE) - -CONFIG_WAPI_PROGNAME ?= wapi$(EXEEXT) -PROGNAME = $(CONFIG_WAPI_PROGNAME) +MODULE = $(CONFIG_WIRELESS_WAPI_CMDTOOL) endif -MODULE = CONFIG_WIRELESS_WAPI - include $(APPDIR)/Application.mk diff --git a/wireless/wapi/src/Make.defs b/wireless/wapi/src/Make.defs index 4315e1501..76df4bb4d 100644 --- a/wireless/wapi/src/Make.defs +++ b/wireless/wapi/src/Make.defs @@ -37,7 +37,7 @@ ifneq ($(CONFIG_WIRELESS_WAPI),) CSRCS = network.c util.c wireless.c driver_wext.c -ifeq ($(CONFIG_WIRELESS_WAPI_CMDTOOL),y) +ifneq ($(CONFIG_WIRELESS_WAPI_CMDTOOL),) MAINSRC = wapi.c endif diff --git a/wireless/wapi/src/wapi.c b/wireless/wapi/src/wapi.c index aaf631597..5da2b460a 100644 --- a/wireless/wapi/src/wapi.c +++ b/wireless/wapi/src/wapi.c @@ -765,11 +765,7 @@ static void wapi_showusage(FAR const char *progname, int exitcode) * Public Functions ****************************************************************************/ -#ifdef BUILD_MODULE int main(int argc, FAR char *argv[]) -#else -int wapi_main(int argc, char *argv[]) -#endif { FAR const char *cmdname; FAR const struct wapi_command_s *wapicmd;