AT91SAM3 now supports kernel-mode heap; SAM3U-EK knsh configuration converted to use kconfig-frontends tool

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5726 42af7a65-404d-4744-a932-0658087f49c3

configs/sam3u-ek/knsh/appconfig

@@ -1,44 +0,0 @@
-############################################################################
-# configs/sam3u-ek/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
-

configs/sam3u-ek/src/Makefile

@@ -40,19 +40,28 @@ CFLAGS		+= -I$(TOPDIR)/sched
 ASRCS = 
 AOBJS = $(ASRCS:.S=$(OBJEXT))
 
-CSRCS		= up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c up_lcd.c
+CSRCS = up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c
+
+ifeq ($(CONFIG_SAM3U_HSMCI),y)
+CSRCS += up_lcd.c
+endif
+
 ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS += up_nsh.c
 endif
+
 ifeq ($(CONFIG_SAM3U_HSMCI),y)
 CSRCS += up_mmcsd.c
 endif
+
 ifeq ($(CONFIG_USBMSC),y)
 CSRCS += up_usbmsc.c
 endif
+
 ifeq ($(CONFIG_INPUT_ADS7843E),y)
 CSRCS += up_touchscreen.c
 endif
+
 COBJS = $(CSRCS:.c=$(OBJEXT))
 
 SRCS = $(ASRCS) $(CSRCS)
@@ -60,11 +69,13 @@ OBJS		= $(AOBJS) $(COBJS)
 
 ARCH_SRCDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src
 ifeq ($(WINTOOL),y)
-  CFLAGS	+= -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}" \
+  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/chip}"
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/common}" \
+  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/common}"
-  		   -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
+  CFLAGS += -I "${shell cygpath -w $(ARCH_SRCDIR)/armv7-m}"
 else
-  CFLAGS	+= -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(ARCH_SRCDIR)/armv7-m
+  CFLAGS += -I$(ARCH_SRCDIR)/chip
+  CFLAGS += -I$(ARCH_SRCDIR)/common
+  CFLAGS += -I$(ARCH_SRCDIR)/armv7-m
 endif
 
 all: libboard$(LIBEXT)

configs/sam3u-ek/src/up_nsh.c

@@ -61,27 +61,22 @@
 
 /* PORT and SLOT number probably depend on the board configuration */
 
-#ifdef CONFIG_ARCH_BOARD_SAM3UEK
+#define NSH_HAVE_USBDEV 1
-#  define NSH_HAVEUSBDEV 1
+#define NSH_HAVE_MMCSD  1
-#  define NSH_HAVEMMCSD  1
+
-#  if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0
+#if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0
 #  error "Only one MMC/SD slot"
 #  undef CONFIG_NSH_MMCSDSLOTNO
-#  endif
+#endif
-#  ifndef CONFIG_NSH_MMCSDSLOTNO
+
+#ifndef CONFIG_NSH_MMCSDSLOTNO
 #  define CONFIG_NSH_MMCSDSLOTNO 0
-#  endif
-#else
-   /* Add configuration for new SAM3U boards here */
-#  error "Unrecognized SAM3U board"
-#  undef NSH_HAVEUSBDEV
-#  undef NSH_HAVEMMCSD
 #endif
 
 /* Can't support USB features if USB is not enabled */
 
 #ifndef CONFIG_USBDEV
-#  undef NSH_HAVEUSBDEV
+#  undef NSH_HAVE_USBDEV
 #endif
 
 /* Can't support MMC/SD features if mountpoints are disabled or if SDIO support
@@ -89,7 +84,7 @@
  */
 
 #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAM3U_HSMCI)
-#  undef NSH_HAVEMMCSD
+#  undef NSH_HAVE_MMCSD
 #endif
 
 #ifndef CONFIG_NSH_MMCSDMINOR
@@ -126,7 +121,7 @@
 
 int nsh_archinitialize(void)
 {
-#ifdef NSH_HAVEMMCSD
+#ifdef NSH_HAVE_MMCSD
   FAR struct sdio_dev_s *sdio;
   int ret;