diff --git a/ChangeLog.txt b/ChangeLog.txt index 8871019f4..ecf71f369 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -540,3 +540,5 @@ the volume information in human readable form (Ken Petit, 2013-4-30). * apps/nshlib/nsh_fscmds.c: Add support for the mksmartfs command. (Ken Petit, 2013-4-30). + * apps/system/flash_eraseall: Add an interface to erase FLASH using a + flash_eraseall NSH command \ No newline at end of file diff --git a/system/Kconfig b/system/Kconfig index 8491d34ed..9ba734250 100644 --- a/system/Kconfig +++ b/system/Kconfig @@ -15,8 +15,8 @@ menu "FLASH Program Installation" source "$APPSDIR/system/install/Kconfig" endmenu -menu "RAM Test" -source "$APPSDIR/system/ramtest/Kconfig" +menu "FLASH Erase-all Command" +source "$APPSDIR/system/flash_eraseall/Kconfig" endmenu menu "readline()" diff --git a/system/Make.defs b/system/Make.defs index c0099684a..d68953387 100644 --- a/system/Make.defs +++ b/system/Make.defs @@ -2,7 +2,7 @@ # apps/system/Make.defs # Adds selected applications to apps/ build # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -46,8 +46,8 @@ ifeq ($(CONFIG_SYSTEM_INSTALL),y) CONFIGURED_APPS += system/install endif -ifeq ($(CONFIG_SYSTEM_RAMTEST),y) -CONFIGURED_APPS += system/ramtest +ifeq ($(CONFIG_SYSTEM_FLASH_ERASEALL),y) +CONFIGURED_APPS += system/flash_eraseall endif ifeq ($(CONFIG_SYSTEM_READLINE),y) diff --git a/system/Makefile b/system/Makefile index 5af79c6f1..b998bf166 100644 --- a/system/Makefile +++ b/system/Makefile @@ -1,7 +1,7 @@ ############################################################################ # apps/system/Makefile # -# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2011-2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -37,8 +37,8 @@ # Sub-directories containing system task -SUBDIRS = free i2c install readline poweroff ramtest ramtron sdcard -SUBDIRS += sysinfo usbmonitor +SUBDIRS = flash_eraseall free i2c install poweroff ramtest ramtron readline +SUBDIRS += sdcard sysinfo usbmonitor # Create the list of installed runtime modules (INSTALLED_DIRS) diff --git a/system/flash_eraseall/.gitignore b/system/flash_eraseall/.gitignore new file mode 100644 index 000000000..3cb5027c6 --- /dev/null +++ b/system/flash_eraseall/.gitignore @@ -0,0 +1,13 @@ +Make.dep +.context +.depend +.built +*.swp +*.asm +*.rel +*.lst +*.sym +*.adb +*.lib +*.src +*.obj diff --git a/system/flash_eraseall/Kconfig b/system/flash_eraseall/Kconfig new file mode 100644 index 000000000..16c6e5c13 --- /dev/null +++ b/system/flash_eraseall/Kconfig @@ -0,0 +1,15 @@ +# +# For a description of the syntax of this configuration file, +# see misc/tools/kconfig-language.txt. +# + +config SYSTEM_FLASH_ERASEALL + bool "FLASH eraseall tool" + default n + depends on MTD && NSH_BUILTIN_APPS & !NUTTX_KERNEL + ---help--- + Enable support for the FLASH eraseall tool. + +if SYSTEM_FLASH_ERASEALL +endif + diff --git a/system/flash_eraseall/Makefile b/system/flash_eraseall/Makefile new file mode 100644 index 000000000..0d4d7c9fe --- /dev/null +++ b/system/flash_eraseall/Makefile @@ -0,0 +1,121 @@ +############################################################################ +# apps/system/install/Makefile +# +# Copyright (C) 2011 Uros Platise. All rights reserved. +# Copyright (C) 2012-2013 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 = flash_eraseall +PRIORITY = SCHED_PRIORITY_DEFAULT +STACKSIZE = 1024 + +ASRCS = +CSRCS = flash_eraseall.c + +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + BIN = ..\..\libapps$(LIBEXT) +else +ifeq ($(WINTOOL),y) + BIN = ..\\..\\libapps$(LIBEXT) +else + BIN = ../../libapps$(LIBEXT) +endif +endif + +ROOTDEPPATH = --dep-path . + +# Common build + +VPATH = + +all: .built +.PHONY: context depend clean distclean + +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) + +$(COBJS): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) + +.built: $(OBJS) + $(call ARCHIVE, $(BIN), $(OBJS)) + $(Q) touch .built + +# 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/flash_eraseall/README.txt b/system/flash_eraseall/README.txt new file mode 100644 index 000000000..0b90d7f22 --- /dev/null +++ b/system/flash_eraseall/README.txt @@ -0,0 +1,12 @@ +Flash Erase-all +=============== + + Source: NuttX + Author: Ken Pettit + Date: 5 May 2013 + +This application erases the FLASH of an MTD flash block. It is simply +a wrapper that calls the NuttX flash_eraseall interface. + +Usage: + flash_eraseall diff --git a/system/flash_eraseall/flash_eraseall.c b/system/flash_eraseall/flash_eraseall.c new file mode 100644 index 000000000..e6eebad0c --- /dev/null +++ b/system/flash_eraseall/flash_eraseall.c @@ -0,0 +1,76 @@ +/**************************************************************************** + * apps/system/flash_eraseall/flash_eraseall.c + * + * Copyright (C) 2013 Ken Pettit. All rights reserved. + * Author: Ken Pettit + * + * 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 +#include +#include + +#include +#include +#include +#include + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private data + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +int flash_eraseall_main(int argc, char *argv[]) +{ + /* Argument given? */ + + if (argc < 2) + { + fprintf(stderr, "usage: flash_eraseall flash_block_device\n"); + return -1; + } + + /* Do the job */ + + flash_eraseall(argv[1]); + + return 0; +}