diff options
| -rw-r--r-- | nuttx/ChangeLog | 5 | ||||
| -rw-r--r-- | nuttx/configs/shenzhou/README.txt | 4 | ||||
| -rw-r--r-- | nuttx/configs/shenzhou/nsh/Make.defs | 6 | ||||
| -rw-r--r-- | nuttx/configs/shenzhou/nxwm/Make.defs | 6 |
4 files changed, 13 insertions, 8 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 257119a35..7121c506f 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3465,3 +3465,8 @@ of CONFIG_EXAMPLE_* to CONFIG_EXAMPLES_*. * drivers/mtd/w25.c and configs/*/src/up_w25.c: Several fixes for the W25 SPI FLASH. + * configs/*/Make.defs: All buildroot tools now use the extension + xxx-nuttx-elf- vs. xxx-elf- + * configs/shenzhou/*/Make.defs: Now uses the new buildroot 4.6.3 + EABI toolchain. + diff --git a/nuttx/configs/shenzhou/README.txt b/nuttx/configs/shenzhou/README.txt index 1f3f254aa..cad0ad2e7 100644 --- a/nuttx/configs/shenzhou/README.txt +++ b/nuttx/configs/shenzhou/README.txt @@ -354,7 +354,7 @@ NuttX buildroot Toolchain 4. cd <some-dir>/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 <subdir> is one of the following: -CONFIG_NX_WRITEONLY=y +# CONFIG_NX_WRITEONLY is not set -
\ No newline at end of file + diff --git a/nuttx/configs/shenzhou/nsh/Make.defs b/nuttx/configs/shenzhou/nsh/Make.defs index 95495d4c4..317a95cda 100644 --- a/nuttx/configs/shenzhou/nsh/Make.defs +++ b/nuttx/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/nuttx/configs/shenzhou/nxwm/Make.defs b/nuttx/configs/shenzhou/nxwm/Make.defs index 96e0ffd4b..96104d6d0 100644 --- a/nuttx/configs/shenzhou/nxwm/Make.defs +++ b/nuttx/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) |