configs/eagle100/nsh converted to use the kconfig-frontends tools

ChangeLog

@@ -6728,4 +6728,6 @@
           kconfig-frontends tools (2014-3-1)
 	* configs/lm3s8962-ek/nsh: Configuration converted to use the
           kconfig-frontends tools (2014-3-1).
+	* configs/eagle100/nsh: Configuration converted to use the
+          kconfig-frontends tools (2014-3-1).
 

configs/amber/hello/defconfig

@@ -50,7 +50,6 @@ CONFIG_ARCH_NOINTC=y
 CONFIG_ARCH_IRQPRIO=n
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=n
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/avr32dev1/nsh/defconfig

@@ -50,7 +50,6 @@ CONFIG_ARCH_NOINTC=y
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_CALIBRATION=n

configs/avr32dev1/ostest/defconfig

@@ -50,7 +50,6 @@ CONFIG_ARCH_NOINTC=y
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_CALIBRATION=n

configs/demo9s12ne64/ostest/defconfig

@@ -49,7 +49,6 @@ CONFIG_ARCH_NOINTC=y
 CONFIG_ARCH_IRQPRIO=n
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=y
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/ea3131/README.txt

@@ -544,8 +544,6 @@ ARM/EA3131-specific Configuration Options
 
     CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-    CONFIG_ARCH_BOOTLOADER - Set if you are using a bootloader.
-
     CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
     CONFIG_ARCH_BUTTONS -  Enable support for buttons. Unique to board architecture.

configs/ea3131/pgnsh/defconfig

@@ -50,7 +50,6 @@ CONFIG_RAM_VSTART=0x11028000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/ea3131/usbmsc/defconfig

@@ -50,7 +50,6 @@ CONFIG_RAM_VSTART=0x11028000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/ea3131/usbserial/defconfig

@@ -50,7 +50,6 @@ CONFIG_RAM_VSTART=0x11028000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/ea3152/README.txt

@@ -350,8 +350,6 @@ ARM/EA3152-specific Configuration Options
 
     CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-    CONFIG_ARCH_BOOTLOADER - Set if you are using a bootloader.
-
     CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
     CONFIG_ARCH_BUTTONS -  Enable support for buttons. Unique to board architecture.

configs/ea3152/ostest/defconfig

@@ -50,7 +50,6 @@ CONFIG_RAM_VSTART=0x11028000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/eagle100/README.txt

@@ -316,9 +316,6 @@ Eagle100-specific Configuration Options
 
     CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-    CONFIG_ARCH_BOOTLOADER - Configure to use the MicroMint Eagle-100
-       Ethernet bootloader.
-
     CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
     CONFIG_ARCH_CALIBRATION - Enables some build in instrumentation that
@@ -407,6 +404,27 @@ Where <subdir> is one of the following:
     interface should also be functional, but is not enabled in this
     configuration).
 
+    NOTES:
+
+    1. This configuration uses the mconf-based configuration tool.  To
+       change this configurations using that tool, you should:
+
+       a. Build and install the kconfig-mconf tool.  See nuttx/README.txt
+          and misc/tools/
+
+       b. Execute 'make menuconfig' in nuttx/ in order to start the
+          reconfiguration process.
+
+    2. As a consequence of (1), selection of toolchains differs from
+       the discussion above under GNU Toolchain Options.  You should
+       *not* add the CROSSDEV setting on the make command line.  Rather,
+       you should reconfigure and select the toolchain that you want
+       from the "System Type" menu.
+
+       Eventually, all of the eagle100 configurations will be changed
+       to use the new configuration mechanism and at that time, the
+       above discussion will be corrected for all configurations.
+
   nxflat:
     This builds the NXFLAT example at apps/examples/nxfalt.
 

configs/eagle100/httpd/defconfig

@@ -50,7 +50,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=y
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_CALIBRATION=n
 

configs/eagle100/nettest/defconfig

@@ -50,7 +50,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=y
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_CALIBRATION=n
 

configs/eagle100/nsh/Make.defs

@@ -1,7 +1,7 @@
 ############################################################################
 # configs/eagle100/nsh/Make.defs
 #
-#   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2009, 2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -35,89 +35,76 @@
 
 include ${TOPDIR}/.config
 include ${TOPDIR}/tools/Config.mk
+include ${TOPDIR}/arch/arm/src/armv7-m/Toolchain.defs
 
-# The default value for CROSSDEV can be overridden from the make command line:
+ifeq ($(WINTOOL),y)
-#   make                         -- Will build for the devkitARM toolchain
+  # Windows-native toolchains
-#   make CROSSDEV=arm-eabi-      -- Will build for the devkitARM toolchain
+  DIRLINK = $(TOPDIR)/tools/copydir.sh
-#   make CROSSDEV=arm-none-eabi- -- Will build for the CodeSourcery toolchain
+  DIRUNLINK = $(TOPDIR)/tools/unlink.sh
-#   make CROSSDEV=arm-nuttx-elf- -- Will build for the NuttX buildroot toolchain
+  MKDEP = $(TOPDIR)/tools/mknulldeps.sh
-
+  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-CROSSDEV		= arm-eabi-
+  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-CC			= $(CROSSDEV)gcc
+  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
-CXX			= $(CROSSDEV)g++
-CPP			= $(CROSSDEV)gcc -E
-LD			= $(CROSSDEV)ld
-AR			= $(CROSSDEV)ar rcs
-NM			= $(CROSSDEV)nm
-OBJCOPY			= $(CROSSDEV)objcopy
-OBJDUMP			= $(CROSSDEV)objdump
-
-ARCHCCVERSION		= ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
-ARCHCCMAJOR		= ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
-
-ifeq ($(CROSSDEV),arm-nuttx-elf-)
-  MKDEP			= $(TOPDIR)/tools/mkdeps.sh
-  ARCHCPUFLAGS		= -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft
-  ARCHINCLUDES		= -I. -isystem $(TOPDIR)/include
-  ARCHXXINCLUDES	= -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHSCRIPT		= -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
-  MAXOPTIMIZATION	= -Os
 else
-  WINTOOL		= y
+  # Linux/Cygwin-native toolchain
-  DIRLINK 		= $(TOPDIR)/tools/copydir.sh
+  MKDEP = $(TOPDIR)/tools/mkdeps.sh
-  DIRUNLINK		= $(TOPDIR)/tools/unlink.sh
+  ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
-  MKDEP			= $(TOPDIR)/tools/mknulldeps.sh
+  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
-  ARCHCPUFLAGS		= -mcpu=cortex-m3 -mthumb -mfloat-abi=soft
+  ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script
-  ARCHINCLUDES		= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}"
-  ARCHXXINCLUDES	= -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
-  ARCHSCRIPT		= -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
-  MAXOPTIMIZATION	= -O2
 endif
 
+CC = $(CROSSDEV)gcc
+CXX = $(CROSSDEV)g++
+CPP = $(CROSSDEV)gcc -E
+LD = $(CROSSDEV)ld
+AR = $(CROSSDEV)ar rcs
+NM = $(CROSSDEV)nm
+OBJCOPY = $(CROSSDEV)objcopy
+OBJDUMP = $(CROSSDEV)objdump
+
+ARCHCCVERSION = ${shell $(CC) -v 2>&1 | sed -n '/^gcc version/p' | sed -e 's/^gcc version \([0-9\.]\)/\1/g' -e 's/[-\ ].*//g' -e '1q'}
+ARCHCCMAJOR = ${shell echo $(ARCHCCVERSION) | cut -d'.' -f1}
+
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION	= -g
+  ARCHOPTIMIZATION = -g
 endif
 
 ifneq ($(CONFIG_DEBUG_NOOPT),y)
-  ARCHOPTIMIZATION	+= $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
+  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
 endif
 
-ARCHCFLAGS		= -fno-builtin
+ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS		= -fno-builtin -fno-exceptions
+ARCHCXXFLAGS = -fno-builtin -fno-exceptions
-ARCHWARNINGS		= -Wall -Wstrict-prototypes -Wshadow
+ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
-ARCHWARNINGSXX		= -Wall -Wshadow
+ARCHWARNINGSXX = -Wall -Wshadow
-ARCHDEFINES		=
+ARCHDEFINES =
-ARCHPICFLAGS		= -fpic -msingle-pic-base -mpic-register=r10
+ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
 
-CFLAGS			= $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \
+CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-			  $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
-CPICFLAGS		= $(ARCHPICFLAGS) $(CFLAGS)
+CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXFLAGS		= $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) \
+CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-			  $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-CXXPICFLAGS		= $(ARCHPICFLAGS) $(CXXFLAGS)
+AFLAGS = $(CFLAGS) -D__ASSEMBLY__
-CPPFLAGS		= $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS			= $(CFLAGS) -D__ASSEMBLY__
 
-NXFLATLDFLAGS1		= -r -d -warn-common
+NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2		= $(NXFLATLDFLAGS1) \
+NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld -no-check-sections
-			  -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-pcrel.ld \
+LDNXFLATFLAGS = -e main -s 2048
-			  -no-check-sections
-LDNXFLATFLAGS		= -e main -s 2048
 
-OBJEXT			= .o
+OBJEXT = .o
-LIBEXT			= .a
+LIBEXT = .a
-EXEEXT			=
+EXEEXT =
 
 ifneq ($(CROSSDEV),arm-nuttx-elf-)
-  LDFLAGS		+= -nostartfiles -nodefaultlibs
+  LDFLAGS += -nostartfiles -nodefaultlibs
 endif
 ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDFLAGS		+= -g
+  LDFLAGS += -g
 endif
 
 
-HOSTCC			= gcc
+HOSTCC = gcc
-HOSTINCLUDES		= -I.
+HOSTINCLUDES = -I.
-HOSTCFLAGS		= -Wall -Wstrict-prototypes -Wshadow -g -pipe
+HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS		=
+HOSTLDFLAGS =
 

configs/eagle100/nsh/appconfig

@@ -1,57 +0,0 @@
-############################################################################
-# configs/eagle100/nsh/appconfig
-#
-#   Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# 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.
-#
-############################################################################
-
-# Path to example in apps/examples containing the user_start entry point
-
-CONFIGURED_APPS += examples/nsh
-
-# The NSH Library
-
-CONFIGURED_APPS += system/readline
-CONFIGURED_APPS += nshlib
-
-# Networking support
-
-ifeq ($(CONFIG_NET),y)
-CONFIGURED_APPS += netutils/uiplib
-CONFIGURED_APPS += netutils/dhcpc
-CONFIGURED_APPS += netutils/resolv
-CONFIGURED_APPS += netutils/tftpc
-CONFIGURED_APPS += netutils/webclient
-ifeq ($(CONFIG_NSH_TELNET),y)
-CONFIGURED_APPS += netutils/telnetd
-endif
-endif
-

configs/eagle100/nxflat/defconfig

@@ -50,7 +50,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=y
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_CALIBRATION=n
 

configs/eagle100/thttpd/defconfig

@@ -50,7 +50,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=y
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_CALIBRATION=n
 

configs/hymini-stm32v/usbmsc/defconfig

@@ -49,7 +49,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/hymini-stm32v/usbserial/defconfig

@@ -49,7 +49,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/lm3s8962-ek/nsh/Make.defs

@@ -46,7 +46,7 @@ ifeq ($(WINTOOL),y)
   ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}"
   ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}"
 else
-  # Linux/Cygwin-native toolchain 
+  # Linux/Cygwin-native toolchain
   MKDEP = $(TOPDIR)/tools/mkdeps.sh
   ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
   ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx

configs/lm3s8962-ek/nsh/defconfig

@@ -239,6 +239,7 @@ CONFIG_ARCH_HAVE_LEDS=y
 CONFIG_ARCH_LEDS=y
 CONFIG_NSH_MMCSDMINOR=0
 CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
 
 #
 # Board-Specific Options
@@ -322,7 +323,11 @@ CONFIG_DEV_NULL=y
 # CONFIG_PWM is not set
 # CONFIG_ARCH_HAVE_I2CRESET is not set
 # CONFIG_I2C is not set
-# CONFIG_SPI is not set
+CONFIG_SPI=y
+# CONFIG_SPI_OWNBUS is not set
+CONFIG_SPI_EXCHANGE=y
+# CONFIG_SPI_CMDDATA is not set
+# CONFIG_SPI_BITBANG is not set
 # CONFIG_I2S is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
@@ -338,32 +343,11 @@ CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_MULTIBLOCK_DISABLE is not set
 CONFIG_MMCSD_MMCSUPPORT=y
 CONFIG_MMCSD_HAVECARDDETECT=y
+CONFIG_MMCSD_SPI=y
+CONFIG_MMCSD_SPICLOCK=12500000
+CONFIG_MMCSD_SPIMODE=0
 # CONFIG_ARCH_HAVE_SDIO is not set
-CONFIG_MTD=y
+# CONFIG_MTD is not set
-
-#
-# MTD Configuration
-#
-# CONFIG_MTD_PARTITION is not set
-# CONFIG_MTD_BYTE_WRITE is not set
-# CONFIG_MTD_CONFIG is not set
-# CONFIG_MTD_CONFIG_RAM_CONSOLIDATE is not set
-
-#
-# MTD Device Drivers
-#
-# CONFIG_MTD_NAND is not set
-# CONFIG_RAMMTD is not set
-# CONFIG_MTD_AT24XX is not set
-# CONFIG_MTD_AT25 is not set
-# CONFIG_MTD_AT45DB is not set
-# CONFIG_MTD_M25P is not set
-# CONFIG_MTD_SMART is not set
-# CONFIG_MTD_RAMTRON is not set
-# CONFIG_MTD_SST25 is not set
-# CONFIG_MTD_SST25XX is not set
-# CONFIG_MTD_SST39FV is not set
-# CONFIG_MTD_W25 is not set
 CONFIG_NETDEVICES=y
 
 #

configs/lpc4330-xplorer/nsh/defconfig

@@ -50,7 +50,6 @@ CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_FPU=n
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/lpcxpresso-lpc1768/dhcpd/defconfig

@@ -49,7 +49,6 @@ CONFIG_RAM_START=0x10000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/lpcxpresso-lpc1768/nx/defconfig

@@ -49,7 +49,6 @@ CONFIG_RAM_START=0x10000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/lpcxpresso-lpc1768/thttpd/defconfig

@@ -49,7 +49,6 @@ CONFIG_RAM_START=0x10000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/lpcxpresso-lpc1768/usbmsc/defconfig

@@ -49,7 +49,6 @@ CONFIG_RAM_START=0x10000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/micropendous3/hello/defconfig

@@ -50,7 +50,6 @@ CONFIG_ARCH_NOINTC=y
 CONFIG_ARCH_IRQPRIO=n
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=n
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/mirtoo/nxffs/defconfig

@@ -51,7 +51,6 @@ CONFIG_ARCH_VECNOTIRQ=y
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/ne64badge/ostest/defconfig

@@ -49,7 +49,6 @@ CONFIG_ARCH_NOINTC=y
 CONFIG_ARCH_IRQPRIO=n
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=y
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/nucleus2g/usbmsc/defconfig

@@ -49,7 +49,6 @@ CONFIG_RAM_START=0x10000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/olimex-lpc-h3131/README.txt

@@ -443,8 +443,6 @@ ARM/LPC-H3131-specific Configuration Options
 
     CONFIG_ARCH_STACKDUMP - Do stack dumps after assertions
 
-    CONFIG_ARCH_BOOTLOADER - Set if you are using a bootloader.
-
     CONFIG_ARCH_LEDS -  Use LEDs to show state. Unique to board architecture.
 
     CONFIG_ARCH_BUTTONS -  Enable support for buttons. Unique to board architecture.

configs/olimex-lpc1766stk/nx/defconfig

@@ -49,7 +49,6 @@ CONFIG_RAM_START=0x10000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/olimex-lpc1766stk/slip-httpd/defconfig

@@ -49,7 +49,6 @@ CONFIG_RAM_START=0x10000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/olimex-lpc1766stk/thttpd/defconfig

@@ -49,7 +49,6 @@ CONFIG_RAM_START=0x10000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/olimex-lpc1766stk/usbmsc/defconfig

@@ -49,7 +49,6 @@ CONFIG_RAM_START=0x10000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/stm3210e-eval/RIDE/defconfig

@@ -48,7 +48,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/stm3210e-eval/nx/defconfig

@@ -48,7 +48,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/stm3210e-eval/nxconsole/defconfig

@@ -48,7 +48,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/stm3210e-eval/nxlines/defconfig

@@ -48,7 +48,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/stm3210e-eval/nxtext/defconfig

@@ -48,7 +48,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/stm3210e-eval/pm/defconfig

@@ -48,7 +48,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=y
 CONFIG_ARCH_IRQBUTTONS=y

configs/stm3210e-eval/usbmsc/defconfig

@@ -48,7 +48,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/stm3220g-eval/dhcpd/defconfig

@@ -48,7 +48,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/stm3220g-eval/nettest/defconfig

@@ -48,7 +48,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/stm3220g-eval/telnetd/defconfig

@@ -48,7 +48,6 @@ CONFIG_RAM_START=0x20000000
 CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/stm3240g-eval/dhcpd/defconfig

@@ -49,7 +49,6 @@ CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_FPU=n
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/stm3240g-eval/nettest/defconfig

@@ -49,7 +49,6 @@ CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_FPU=n
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n

configs/stm3240g-eval/nxconsole/defconfig

@@ -49,7 +49,6 @@ CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_FPU=n
 CONFIG_ARCH_INTERRUPTSTACK=0
 CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
 CONFIG_ARCH_LEDS=y
 CONFIG_ARCH_BUTTONS=n
 CONFIG_ARCH_CALIBRATION=n