STM3240G-EVAL knxwm: Work around CodeSourcery library bug by switching to buildroot

5 files changed, 19 insertions, 8 deletions

diff --git a/nuttx/TODO b/nuttx/TODO
index 8de0ce835..d501919ba 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated November 7, 2013)
+NuttX TODO List (Last updated December 29, 2013)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This file summarizes known NuttX bugs, limitations, inconsistencies with
diff --git a/nuttx/arch/arm/src/armv7-m/up_hardfault.c b/nuttx/arch/arm/src/armv7-m/up_hardfault.c
index d99473bde..3de86818f 100644
--- a/nuttx/arch/arm/src/armv7-m/up_hardfault.c
+++ b/nuttx/arch/arm/src/armv7-m/up_hardfault.c
@@ -144,7 +144,7 @@ int up_hardfault(int irq, FAR void *context)
 
   /* Dump some hard fault info */
 
-  hfdbg("\nHard Fault:\n");
+  hfdbg("Hard Fault:\n");
   hfdbg("  IRQ: %d regs: %p\n", irq, regs);
   hfdbg("  BASEPRI: %08x PRIMASK: %08x IPSR: %08x CONTROL: %08x\n",
         getbasepri(), getprimask(), getipsr(), getcontrol());
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt
index 9780e791b..1f9c15305 100644
--- a/nuttx/configs/stm3240g-eval/README.txt
+++ b/nuttx/configs/stm3240g-eval/README.txt
@@ -987,10 +987,20 @@ Where <subdir> is one of the following:
 
        CONFIG_HOST_WINDOWS=y                   : Windows
        CONFIG_WINDOWS_CYGWIN=y                 : Cygwin environment on Windows
-       CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows
+       CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y     : NuttX EABI buildroot toolchain
+       CONFIG_CXX_NEWLONG=y                    : size_t is long (maybe?)
 
        This is easily changed by modifying the configuration.
 
+       NOTE:  When I used a recent CodeSourcery toolchain, then toolchain
+       generated an illegal blx to an even address when calling into one
+       of the EABI math libraries.  I don't know why this happened or if
+       the probably is repeatable with other CodeSourcery versions.  You
+       can try for yourself setting:
+
+       CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y : CodeSourcery under Windows
+       CONFIG_CXX_NEWLONG=n                    : size_t is unsigned int (maybe?)
+
     3. In addition to the the kernel mode build, this NxWM configuration
        differences from the nxwm configuration in that:
 
diff --git a/nuttx/configs/stm3240g-eval/kernel/up_userspace.c b/nuttx/configs/stm3240g-eval/kernel/up_userspace.c
index 4fe12a907..a0e50d71d 100644
--- a/nuttx/configs/stm3240g-eval/kernel/up_userspace.c
+++ b/nuttx/configs/stm3240g-eval/kernel/up_userspace.c
@@ -56,8 +56,8 @@
 #  error "CONFIG_NUTTX_USERSPACE not defined"
 #endif
 
-#if CONFIG_NUTTX_USERSPACE != 0x08020000
-#  error "CONFIG_NUTTX_USERSPACE must be 0x08020000 to match memory.ld"
+#if CONFIG_NUTTX_USERSPACE != 0x08040000
+#  error "CONFIG_NUTTX_USERSPACE must be 0x08040000 to match memory.ld"
 #endif
 
 /****************************************************************************
diff --git a/nuttx/configs/stm3240g-eval/knxwm/defconfig b/nuttx/configs/stm3240g-eval/knxwm/defconfig
index de3523426..16d54d27a 100644
--- a/nuttx/configs/stm3240g-eval/knxwm/defconfig
+++ b/nuttx/configs/stm3240g-eval/knxwm/defconfig
@@ -113,13 +113,14 @@ CONFIG_ARMV7M_MPU_NREGIONS=8
 # ARMV7M Configuration Options
 #
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
-# CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
+CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
-CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
+# CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_DEVKITARM is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW is not set
 # CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
+# CONFIG_ARMV7M_OABI_TOOLCHAIN is not set
 # CONFIG_SERIAL_TERMIOS is not set
 
 #
@@ -761,7 +762,7 @@ CONFIG_SCHED_USRWORK=y
 # CONFIG_C99_BOOL8 is not set
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
-# CONFIG_CXX_NEWLONG is not set
+CONFIG_CXX_NEWLONG=y
 
 #
 # uClibc++ Standard C++ Library