diff options
Diffstat (limited to 'nuttx/configs/ea3152')
| -rw-r--r-- | nuttx/configs/ea3152/README.txt | 34 | ||||
| -rw-r--r-- | nuttx/configs/ea3152/ostest/Make.defs | 16 | ||||
| -rwxr-xr-x | nuttx/configs/ea3152/ostest/setenv.sh | 29 | ||||
| -rw-r--r-- | nuttx/configs/ea3152/scripts/ld.script (renamed from nuttx/configs/ea3152/ostest/ld.script) | 4 | ||||
| -rw-r--r-- | nuttx/configs/ea3152/src/Makefile | 4 | ||||
| -rw-r--r-- | nuttx/configs/ea3152/src/ea3152_internal.h | 2 | ||||
| -rw-r--r-- | nuttx/configs/ea3152/src/up_boot.c | 6 | ||||
| -rw-r--r-- | nuttx/configs/ea3152/src/up_fillpage.c | 4 | ||||
| -rw-r--r-- | nuttx/configs/ea3152/src/up_mem.c | 8 | ||||
| -rw-r--r-- | nuttx/configs/ea3152/src/up_nsh.c | 4 | ||||
| -rw-r--r-- | nuttx/configs/ea3152/src/up_spi.c | 4 |
11 files changed, 67 insertions, 48 deletions
diff --git a/nuttx/configs/ea3152/README.txt b/nuttx/configs/ea3152/README.txt index f0450751e..44f65981e 100644 --- a/nuttx/configs/ea3152/README.txt +++ b/nuttx/configs/ea3152/README.txt @@ -42,12 +42,12 @@ GNU Toolchain Options add one of the following configuration options to your .config (or defconfig) file: - CONFIG_LPC31XX_CODESOURCERYW=y : CodeSourcery under Windows - CONFIG_LPC31XX_CODESOURCERYL=y : CodeSourcery under Linux - CONFIG_LPC31XX_DEVKITARM=y : devkitARM under Windows - CONFIG_LPC31XX_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) + CONFIG_LPC31_CODESOURCERYW=y : CodeSourcery under Windows + CONFIG_LPC31_CODESOURCERYL=y : CodeSourcery under Linux + CONFIG_LPC31_DEVKITARM=y : devkitARM under Windows + CONFIG_LPC31_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default) - If you are not using CONFIG_LPC31XX_BUILDROOT, then you may also have to modify + If you are not using CONFIG_LPC31_BUILDROOT, then you may also have to modify the PATH in the setenv.h file if your make cannot find the tools. NOTE: the CodeSourcery (for Windows), devkitARM, and Raisonance toolchains are @@ -355,27 +355,27 @@ ARM/EA3152-specific Configuration Options Individual subsystems can be enabled: - CONFIG_LPC31XX_MCI, CONFIG_LPC31XX_SPI, CONFIG_LPC31XX_UART + CONFIG_LPC31_MCI, CONFIG_LPC31_SPI, CONFIG_LPC31_UART External memory available on the board (see also CONFIG_MM_REGIONS) - CONFIG_LPC31XX_EXTSRAM0 - Select if external SRAM0 is present - CONFIG_LPC31XX_EXTSRAM0HEAP - Select if external SRAM0 should be + CONFIG_LPC31_EXTSRAM0 - Select if external SRAM0 is present + CONFIG_LPC31_EXTSRAM0HEAP - Select if external SRAM0 should be configured as part of the NuttX heap. - CONFIG_LPC31XX_EXTSRAM0SIZE - Size (in bytes) of the installed + CONFIG_LPC31_EXTSRAM0SIZE - Size (in bytes) of the installed external SRAM0 memory - CONFIG_LPC31XX_EXTSRAM1 - Select if external SRAM1 is present - CONFIG_LPC31XX_EXTSRAM1HEAP - Select if external SRAM1 should be + CONFIG_LPC31_EXTSRAM1 - Select if external SRAM1 is present + CONFIG_LPC31_EXTSRAM1HEAP - Select if external SRAM1 should be configured as part of the NuttX heap. - CONFIG_LPC31XX_EXTSRAM1SIZE - Size (in bytes) of the installed + CONFIG_LPC31_EXTSRAM1SIZE - Size (in bytes) of the installed external SRAM1 memory - CONFIG_LPC31XX_EXTSDRAM - Select if external SDRAM is present - CONFIG_LPC31XX_EXTSDRAMHEAP - Select if external SDRAM should be + CONFIG_LPC31_EXTSDRAM - Select if external SDRAM is present + CONFIG_LPC31_EXTSDRAMHEAP - Select if external SDRAM should be configured as part of the NuttX heap. - CONFIG_LPC31XX_EXTSDRAMSIZE - Size (in bytes) of the installed + CONFIG_LPC31_EXTSDRAMSIZE - Size (in bytes) of the installed external SDRAM memory - CONFIG_LPC31XX_EXTNAND - Select if external NAND is present - CONFIG_LPC31XX_EXTSDRAMSIZE - Size (in bytes) of the installed + CONFIG_LPC31_EXTNAND - Select if external NAND is present + CONFIG_LPC31_EXTSDRAMSIZE - Size (in bytes) of the installed external NAND memory LPC313X specific device driver settings diff --git a/nuttx/configs/ea3152/ostest/Make.defs b/nuttx/configs/ea3152/ostest/Make.defs index 62d7bae6f..19e213b0a 100644 --- a/nuttx/configs/ea3152/ostest/Make.defs +++ b/nuttx/configs/ea3152/ostest/Make.defs @@ -1,7 +1,7 @@ ############################################################################ # configs/ea3152/ostest/Make.defs # -# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# 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 @@ -38,23 +38,23 @@ include ${TOPDIR}/tools/Config.mk # Setup for the selected toolchain -ifeq ($(CONFIG_LPC31XX_CODESOURCERYW),y) +ifeq ($(CONFIG_LPC31_CODESOURCERYW),y) # CodeSourcery under Windows CROSSDEV = arm-none-eabi- WINTOOL = y MAXOPTIMIZATION = -O2 endif -ifeq ($(CONFIG_LPC31XX_CODESOURCERYL),y) +ifeq ($(CONFIG_LPC31_CODESOURCERYL),y) # CodeSourcery under Linux CROSSDEV = arm-none-eabi- MAXOPTIMIZATION = -O2 endif -ifeq ($(CONFIG_LPC31XX_DEVKITARM),y) +ifeq ($(CONFIG_LPC31_DEVKITARM),y) # devkitARM under Windows CROSSDEV = arm-eabi- WINTOOL = y endif -ifeq ($(CONFIG_LPC31XX_BUILDROOT),y) +ifeq ($(CONFIG_LPC31_BUILDROOT),y) # NuttX buildroot under Linux or Cygwin CROSSDEV = arm-elf- MAXOPTIMIZATION = -Os @@ -67,13 +67,13 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mknulldeps.sh 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)/ostest/ld.script}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script}" else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/ld.script + ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/ld.script endif CC = $(CROSSDEV)gcc @@ -122,7 +122,7 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -ifneq ($(CONFIG_LPC31XX_BUILDROOT),y) +ifneq ($(CONFIG_LPC31_BUILDROOT),y) LDFLAGS += -nostartfiles -nodefaultlibs endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) diff --git a/nuttx/configs/ea3152/ostest/setenv.sh b/nuttx/configs/ea3152/ostest/setenv.sh index 890585f87..418f4701e 100755 --- a/nuttx/configs/ea3152/ostest/setenv.sh +++ b/nuttx/configs/ea3152/ostest/setenv.sh @@ -32,16 +32,35 @@ # POSSIBILITY OF SUCH DAMAGE. # -if [ "$(basename $0)" = "setenv.sh" ] ; then +if [ "$_" = "$0" ] ; then echo "You must source this script, not run it!" 1>&2 exit 1 fi -if [ -z "${PATH_ORIG}" ]; then export PATH_ORIG=${PATH}; fi - WD=`pwd` -export BUILDROOT_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin" +if [ ! -x "setenv.sh" ]; then + echo "This script must be executed from the top-level NuttX build directory" + exit 1 +fi + +if [ -z "${PATH_ORIG}" ]; then + export PATH_ORIG="${PATH}" +fi + +# This the Cygwin path to the location where I installed the CodeSourcery +# toolchain under windows. You will also have to edit this if you install +# the CodeSourcery toolchain in any other location +export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin" + +# This the Cygwin path to the location where I build the buildroot +# toolchain. +#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin" + +# This is the path to the tools subdirectory + export LPCTOOL_DIR="${WD}/configs/ea3152/tools" -export PATH="${BUILDROOT_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}" +# Add the path to the toolchain to the PATH varialble + +export PATH="${TOOLCHAIN_BIN}:${LPCTOOL_DIR}:/sbin:/usr/sbin:${PATH_ORIG}" echo "PATH : ${PATH}" diff --git a/nuttx/configs/ea3152/ostest/ld.script b/nuttx/configs/ea3152/scripts/ld.script index c52988ebc..cf5b5d519 100644 --- a/nuttx/configs/ea3152/ostest/ld.script +++ b/nuttx/configs/ea3152/scripts/ld.script @@ -1,7 +1,7 @@ /**************************************************************************** - * configs/ea3152/ostest/ld.script + * configs/ea3152/scripts/ld.script * - * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * 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 diff --git a/nuttx/configs/ea3152/src/Makefile b/nuttx/configs/ea3152/src/Makefile index 6393f3091..91a7fe379 100644 --- a/nuttx/configs/ea3152/src/Makefile +++ b/nuttx/configs/ea3152/src/Makefile @@ -44,13 +44,13 @@ CSRCS = up_boot.c up_clkinit.c ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += up_buttons.c endif -ifeq ($(CONFIG_LPC31XX_EXTSDRAM),y) +ifeq ($(CONFIG_LPC31_EXTSDRAM),y) CSRCS += up_mem.c endif ifeq ($(CONFIG_ARCH_LEDS),y) CSRCS += up_leds.c endif -ifeq ($(CONFIG_LPC31XX_SPI),y) +ifeq ($(CONFIG_LPC31_SPI),y) CSRCS += up_spi.c endif ifeq ($(CONFIG_NSH_ARCHINIT),y) diff --git a/nuttx/configs/ea3152/src/ea3152_internal.h b/nuttx/configs/ea3152/src/ea3152_internal.h index 94a6e5a23..ee93c36a1 100644 --- a/nuttx/configs/ea3152/src/ea3152_internal.h +++ b/nuttx/configs/ea3152/src/ea3152_internal.h @@ -86,7 +86,7 @@ * ************************************************************************************/ -#ifdef CONFIG_LPC31XX_EXTSDRAM +#ifdef CONFIG_LPC31_EXTSDRAM extern void lpc31_meminitialize(void); #endif diff --git a/nuttx/configs/ea3152/src/up_boot.c b/nuttx/configs/ea3152/src/up_boot.c index e85cb5125..c8870cfdf 100644 --- a/nuttx/configs/ea3152/src/up_boot.c +++ b/nuttx/configs/ea3152/src/up_boot.c @@ -75,7 +75,7 @@ void lpc31_boardinitialize(void) { /* Initialize configured, external memory resources */ -#ifdef CONFIG_LPC31XX_EXTSDRAM +#ifdef CONFIG_LPC31_EXTSDRAM lpc31_meminitialize(); #endif @@ -83,7 +83,7 @@ void lpc31_boardinitialize(void) * lpc31_spiinitialize() has been brought into the link. */ -#if defined(CONFIG_LPC31XX_SPI) +#if defined(CONFIG_LPC31_SPI) if (lpc31_spiinitialize) { lpc31_spiinitialize(); @@ -95,7 +95,7 @@ void lpc31_boardinitialize(void) * into the build. */ -#if defined(CONFIG_USBDEV) && defined(CONFIG_LPC31XX_USB) +#if defined(CONFIG_USBDEV) && defined(CONFIG_LPC31_USB) if (lpc31_usbinitialize) { lpc31_usbinitialize(); diff --git a/nuttx/configs/ea3152/src/up_fillpage.c b/nuttx/configs/ea3152/src/up_fillpage.c index 019dd940c..880f70036 100644 --- a/nuttx/configs/ea3152/src/up_fillpage.c +++ b/nuttx/configs/ea3152/src/up_fillpage.c @@ -122,7 +122,7 @@ * is not enabled. */ -# if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_LPC31XX_MCI) +# if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_LPC31_MCI) # ifdef CONFIG_PAGING_SDSLOT # error "Mountpoints and/or MCI disabled" # endif @@ -152,7 +152,7 @@ /* Verify that SPI support is enabld */ -#ifndef CONFIG_LPC31XX_SPI +#ifndef CONFIG_LPC31_SPI # error "SPI support is not enabled" #endif diff --git a/nuttx/configs/ea3152/src/up_mem.c b/nuttx/configs/ea3152/src/up_mem.c index 5eae04e0f..4f6c71e87 100644 --- a/nuttx/configs/ea3152/src/up_mem.c +++ b/nuttx/configs/ea3152/src/up_mem.c @@ -59,7 +59,7 @@ #include "lpc31_mpmc.h" #include "ea3152_internal.h" -#ifdef CONFIG_LPC31XX_EXTSDRAM +#ifdef CONFIG_LPC31_EXTSDRAM /**************************************************************************** * Pre-processor Definitions @@ -164,8 +164,8 @@ static void lpc31_sdraminitialize(void) * replaced with an apriori value. */ -#ifdef CONFIG_LPC31XX_SDRAMHCLK -# define HCLK CONFIG_LPC31XX_SDRAMHCLK +#ifdef CONFIG_LPC31_SDRAMHCLK +# define HCLK CONFIG_LPC31_SDRAMHCLK #else uint32_t hclk = lpc31_clkfreq(CLKID_MPMCCFGCLK2, DOMAINID_SYS); # define HCLK hclk @@ -356,4 +356,4 @@ void lpc31_meminitialize(void) lpc31_sdraminitialize(); } -#endif /* CONFIG_LPC31XX_EXTSDRAM */ +#endif /* CONFIG_LPC31_EXTSDRAM */ diff --git a/nuttx/configs/ea3152/src/up_nsh.c b/nuttx/configs/ea3152/src/up_nsh.c index ab8f779f0..ddd0e9195 100644 --- a/nuttx/configs/ea3152/src/up_nsh.c +++ b/nuttx/configs/ea3152/src/up_nsh.c @@ -45,7 +45,7 @@ #include <debug.h> #include <errno.h> -#ifdef CONFIG_LPC31XX_MCI +#ifdef CONFIG_LPC31_MCI # include <nuttx/sdio.h> # include <nuttx/mmcsd.h> #endif @@ -88,7 +88,7 @@ * is not enabled. */ -#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_LPC31XX_MCI) +#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_LPC31_MCI) # undef CONFIG_NSH_HAVEMMCSD #endif diff --git a/nuttx/configs/ea3152/src/up_spi.c b/nuttx/configs/ea3152/src/up_spi.c index 7f399d9dc..2dd7b1e23 100644 --- a/nuttx/configs/ea3152/src/up_spi.c +++ b/nuttx/configs/ea3152/src/up_spi.c @@ -52,7 +52,7 @@ #include "lpc31_internal.h" #include "ea3152_internal.h" -#ifdef CONFIG_LPC31XX_SPI +#ifdef CONFIG_LPC31_SPI #if 0 /* At present, EA3152 specific logic is hard-coded in the file lpc31_spi.c * in arch/arm/src/lpc31xx */ @@ -138,5 +138,5 @@ uint8_t lpc31_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) } #endif /* 0 */ -#endif /* CONFIG_LPC31XX_SPI */ +#endif /* CONFIG_LPC31_SPI */ |