From 58cd3b189a292b16374c9f9f37722295f69b8f2d Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 5 Oct 2012 23:43:05 +0000 Subject: [PATCH] configs/shenzhou will now use the 4.6.3 buildroot EABI toolchain git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5214 42af7a65-404d-4744-a932-0658087f49c3 --- configs/shenzhou/README.txt | 4 ++-- configs/shenzhou/nsh/Make.defs | 6 +++--- configs/shenzhou/nxwm/Make.defs | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/configs/shenzhou/README.txt b/configs/shenzhou/README.txt index 1f3f254aab..cad0ad2e73 100644 --- a/configs/shenzhou/README.txt +++ b/configs/shenzhou/README.txt @@ -354,7 +354,7 @@ NuttX buildroot Toolchain 4. cd /buildroot - 5. cp configs/cortexm3-defconfig-4.3.3 .config + 5. cp configs/cortexm3-eabi-defconfig-4.6.3 .config 6. make oldconfig @@ -770,4 +770,4 @@ Where is one of the following: -CONFIG_NX_WRITEONLY=y +# CONFIG_NX_WRITEONLY is not set - \ No newline at end of file + diff --git a/configs/shenzhou/nsh/Make.defs b/configs/shenzhou/nsh/Make.defs index 95495d4c43..317a95cda8 100644 --- a/configs/shenzhou/nsh/Make.defs +++ b/configs/shenzhou/nsh/Make.defs @@ -82,8 +82,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y) endif ifeq ($(CONFIG_STM32_BUILDROOT),y) # NuttX buildroot under Linux or Cygwin - CROSSDEV = arm-nuttx-elf- - ARCROSSDEV = arm-nuttx-elf- + CROSSDEV = arm-nuttx-eabi- + ARCROSSDEV = arm-nuttx-eabi- ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft MAXOPTIMIZATION = -Os endif @@ -153,7 +153,7 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -ifneq ($(CROSSDEV),arm-nuttx-elf-) +ifneq ($(CROSSDEV),arm-nuttx-eabi-) LDFLAGS += -nostartfiles -nodefaultlibs endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y) diff --git a/configs/shenzhou/nxwm/Make.defs b/configs/shenzhou/nxwm/Make.defs index 96e0ffd4b2..96104d6d0c 100644 --- a/configs/shenzhou/nxwm/Make.defs +++ b/configs/shenzhou/nxwm/Make.defs @@ -82,8 +82,8 @@ ifeq ($(CONFIG_STM32_RAISONANCE),y) endif ifeq ($(CONFIG_STM32_BUILDROOT),y) # NuttX buildroot under Linux or Cygwin - CROSSDEV = arm-nuttx-elf- - ARCROSSDEV = arm-nuttx-elf- + CROSSDEV = arm-nuttx-eabi- + ARCROSSDEV = arm-nuttx-eabi- ARCHCPUFLAGS = -mtune=cortex-m3 -march=armv7-m -mfloat-abi=soft MAXOPTIMIZATION = -Os endif @@ -153,7 +153,7 @@ OBJEXT = .o LIBEXT = .a EXEEXT = -ifneq ($(CROSSDEV),arm-nuttx-elf-) +ifneq ($(CROSSDEV),arm-nuttx-eabi-) LDFLAGS += -nostartfiles -nodefaultlibs endif ifeq ($(CONFIG_DEBUG_SYMBOLS),y)