diff --git a/ChangeLog.txt b/ChangeLog.txt index d354fdc4e..4d8a02173 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1329,4 +1329,6 @@ * apps/examples/poll: Fix a few bit-rot compilation errors (2015-07-01). * apps/nshlib: NSH will now support an (optional) shutdown command if the board provides the option CONFIG_BOARD_POWEROFF (2015-07-04). + * apps/system/poweroff: Remove the system poweroff command. This is + replaced with the NSH shutdown commandi (2015-07-02). diff --git a/system/Kconfig b/system/Kconfig index b6f9c2d1d..edb0d5c3c 100644 --- a/system/Kconfig +++ b/system/Kconfig @@ -16,7 +16,6 @@ source "$APPSDIR/system/ramtest/Kconfig" source "$APPSDIR/system/readline/Kconfig" source "$APPSDIR/system/prun/Kconfig" source "$APPSDIR/system/mdio/Kconfig" -source "$APPSDIR/system/poweroff/Kconfig" source "$APPSDIR/system/ramtron/Kconfig" source "$APPSDIR/system/sdcard/Kconfig" source "$APPSDIR/system/sudoku/Kconfig" diff --git a/system/Make.defs b/system/Make.defs index e769009d1..564e183dc 100644 --- a/system/Make.defs +++ b/system/Make.defs @@ -90,10 +90,6 @@ ifeq ($(CONFIG_SYSTEM_READLINE),y) CONFIGURED_APPS += system/readline endif -ifeq ($(CONFIG_SYSTEM_POWEROFF),y) -CONFIGURED_APPS += system/poweroff -endif - ifeq ($(CONFIG_SYSTEM_RAMTRON),y) CONFIGURED_APPS += system/ramtron endif diff --git a/system/Makefile b/system/Makefile index 05e02dab8..217b68ea5 100644 --- a/system/Makefile +++ b/system/Makefile @@ -38,9 +38,8 @@ # Sub-directories containing system tasks/libraries SUBDIRS = cdcacm cle composite cu flash_eraseall free i2c hex2bin inifile -SUBDIRS += install lm75 mdio nxplayer poweroff ramtest ramtron readline -SUBDIRS += sdcard stackmonitor sudoku sysinfo usbmonitor usbmsc vi zmodem -SUBDIRS += zoneinfo +SUBDIRS += install lm75 mdio nxplayer ramtest ramtron readline sdcard +SUBDIRS += stackmonitor sudoku sysinfo usbmonitor usbmsc vi zmodem zoneinfo # Create the list of installed runtime modules (INSTALLED_DIRS) diff --git a/system/poweroff/.gitignore b/system/poweroff/.gitignore deleted file mode 100644 index 83bd7b811..000000000 --- a/system/poweroff/.gitignore +++ /dev/null @@ -1,11 +0,0 @@ -/Make.dep -/.depend -/.built -/*.asm -/*.rel -/*.lst -/*.sym -/*.adb -/*.lib -/*.src -/*.obj diff --git a/system/poweroff/Kconfig b/system/poweroff/Kconfig deleted file mode 100644 index 665f3fe93..000000000 --- a/system/poweroff/Kconfig +++ /dev/null @@ -1,18 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see the file kconfig-language.txt in the NuttX tools repository. -# - -config SYSTEM_POWEROFF - bool "Power-Off" - default n - depends on LIB_BOARDCTL && ARCH_HAVE_POWEROFF - select BOARDCTL_POWEROFF - ---help--- - Enable support for the NSH poweroff command. NOTE: This option - provides the NSH power-off command only. It requires board-specific - support to actually implement the power-off. - -if SYSTEM_POWEROFF -endif - diff --git a/system/poweroff/Makefile b/system/poweroff/Makefile deleted file mode 100644 index 3f07f9e8b..000000000 --- a/system/poweroff/Makefile +++ /dev/null @@ -1,149 +0,0 @@ -############################################################################ -# apps/system/poweroff/Makefile -# -# Copyright (C) 2011 Uros Platise. All rights reserved. -# Copyright (C) 2012 Gregory Nutt. All rights reserved. -# Author: Uros Platise -# Gregory Nutt -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# 3. Neither the name NuttX nor the names of its contributors may be -# used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS -# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE -# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS -# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED -# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN -# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# -############################################################################ - -# TODO, this makefile should run make under the app dirs, instead of -# sourcing the Make.defs! - --include $(TOPDIR)/.config --include $(TOPDIR)/Make.defs -include $(APPDIR)/Make.defs - -ifeq ($(WINTOOL),y) -INCDIROPT = -w -endif - -# Hello Application -# TODO: appname can be automatically extracted from the directory name - -APPNAME = poweroff -PRIORITY = SCHED_PRIORITY_DEFAULT -STACKSIZE = 768 - -ASRCS = -CSRCS = -MAINSRC = poweroff.c - -AOBJS = $(ASRCS:.S=$(OBJEXT)) -COBJS = $(CSRCS:.c=$(OBJEXT)) -MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) - -SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) -OBJS = $(AOBJS) $(COBJS) - -ifneq ($(CONFIG_BUILD_KERNEL),y) - OBJS += $(MAINOBJ) -endif - -ifeq ($(CONFIG_WINDOWS_NATIVE),y) - BIN = ..\..\libapps$(LIBEXT) -else -ifeq ($(WINTOOL),y) - BIN = ..\\..\\libapps$(LIBEXT) -else - BIN = ../../libapps$(LIBEXT) -endif -endif - -ifeq ($(WINTOOL),y) - INSTALL_DIR = "${shell cygpath -w $(BIN_DIR)}" -else - INSTALL_DIR = $(BIN_DIR) -endif - -CONFIG_XYZ_PROGNAME ?= poweroff$(EXEEXT) -PROGNAME = $(CONFIG_XYZ_PROGNAME) - -ROOTDEPPATH = --dep-path . - -# Common build - -VPATH = - -all: .built -.PHONY: context depend clean distclean - -$(AOBJS): %$(OBJEXT): %.S - $(call ASSEMBLE, $<, $@) - -$(COBJS) $(MAINOBJ): %$(OBJEXT): %.c - $(call COMPILE, $<, $@) - -.built: $(OBJS) - $(call ARCHIVE, $(BIN), $(OBJS)) - $(Q) touch .built - -ifeq ($(CONFIG_BUILD_KERNEL),y) -$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) - @echo "LD: $(PROGNAME)" - $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) - $(Q) $(NM) -u $(INSTALL_DIR)$(DELIM)$(PROGNAME) - -install: $(BIN_DIR)$(DELIM)$(PROGNAME) - -else -install: - -endif - -# Register application - -ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) -$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile - $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) - -context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat -else -context: -endif - -# Create dependencies - -.depend: Makefile $(SRCS) - $(Q) $(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep - $(Q) touch $@ - -depend: .depend - -clean: - $(call DELFILE, .built) - $(call CLEAN) - -distclean: clean - $(call DELFILE, Make.dep) - $(call DELFILE, .depend) - --include Make.dep diff --git a/system/poweroff/poweroff.c b/system/poweroff/poweroff.c deleted file mode 100644 index a3f1a9dbb..000000000 --- a/system/poweroff/poweroff.c +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** - * apps/system/poweroff/poweroff.c - * - * Copyright (C) 2011 Uros Platise. All rights reserved. - * Author: Uros Platise - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name NuttX nor the names of its contributors may be - * used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -#ifdef CONFIG_BUILD_KERNEL -int main(int argc, FAR char *argv[]) -#else -int poweroff_main(int argc, char *argv[]) -#endif -{ - /* Invoide the BOARDIOC_POWEROFF board control to shutdown the board - * If board_power_off function returns, then it was not possible to power-off the - * board due to some constraints. - */ - - return boardctl(BOARDIOC_POWEROFF, 0); -}