More NxWM build fixes

6 files changed, 18 insertions, 7 deletions

diff --git a/nuttx/arch/arm/src/sama5/sam_adc.c b/nuttx/arch/arm/src/sama5/sam_adc.c
index 34abbe7a0..24d49e139 100644
--- a/nuttx/arch/arm/src/sama5/sam_adc.c
+++ b/nuttx/arch/arm/src/sama5/sam_adc.c
@@ -1906,7 +1906,7 @@ static void sam_adc_channels(struct sam_adc_s *priv)
  *   Initialize the adc
  *
  * Returned Value:
- *   Valid can device structure reference on succcess; a NULL on failure
+ *   Valid can device structure reference on success; a NULL on failure
  *
  ****************************************************************************/
 
@@ -1917,7 +1917,7 @@ struct adc_dev_s *sam_adc_initialize(void)
   uint32_t mck;
   int ret;
 
-  /* Have we already been initialzed?  If yes, than just hand out the
+  /* Have we already been initialized?  If yes, than just hand out the
    * interface one more time.
    */
 
diff --git a/nuttx/configs/sam4e-ek/nxwm/defconfig b/nuttx/configs/sam4e-ek/nxwm/defconfig
index 7684a0798..9012ce074 100644
--- a/nuttx/configs/sam4e-ek/nxwm/defconfig
+++ b/nuttx/configs/sam4e-ek/nxwm/defconfig
@@ -17,6 +17,7 @@ CONFIG_HOST_LINUX=y
 # Build Configuration
 #
 # CONFIG_APPS_DIR="../apps"
+CONFIG_BUILD_FLAT=y
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -99,7 +100,6 @@ CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="sam34"
 # CONFIG_ARMV7M_USEBASEPRI is not set
 # CONFIG_ARCH_HAVE_FPU is not set
-CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARMV7M_MPU is not set
 
 #
@@ -261,11 +261,15 @@ CONFIG_SAM34_EMAC_ISETH0=y
 CONFIG_ARCH_DMA=y
 CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_ARCH_L2CACHE is not set
-# CONFIG_ARCH_ADDRENV is not set
+# CONFIG_ARCH_HAVE_COHERENT_DCACHE is not set
+# CONFIG_ARCH_HAVE_ADDRENV is not set
+# CONFIG_ARCH_NEED_ADDRENV_MAPPING is not set
 CONFIG_ARCH_HAVE_VFORK=y
 # CONFIG_ARCH_HAVE_MMU is not set
+CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_USE_MPU is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
@@ -360,6 +364,9 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # Tasks and Scheduling
 #
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nxwm_main"
 CONFIG_RR_INTERVAL=200
 CONFIG_TASK_NAME_SIZE=0
@@ -425,6 +432,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=1024
 CONFIG_PTHREAD_STACK_MIN=256
 CONFIG_PTHREAD_STACK_DEFAULT=1024
+# CONFIG_LIB_SYSCALL is not set
 
 #
 # Device Drivers
diff --git a/nuttx/configs/sama5d3x-ek/nxwm/defconfig b/nuttx/configs/sama5d3x-ek/nxwm/defconfig
index 3cdd1ffbf..2100699e8 100644
--- a/nuttx/configs/sama5d3x-ek/nxwm/defconfig
+++ b/nuttx/configs/sama5d3x-ek/nxwm/defconfig
@@ -416,6 +416,9 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # Tasks and Scheduling
 #
+# CONFIG_INIT_NONE is not set
+CONFIG_INIT_ENTRYPOINT=y
+# CONFIG_INIT_FILEPATH is not set
 CONFIG_USER_ENTRYPOINT="nxwm_main"
 CONFIG_RR_INTERVAL=200
 CONFIG_TASK_NAME_SIZE=32
diff --git a/nuttx/libc/math/lib_atan2.c b/nuttx/libc/math/lib_atan2.c
index 5f4a6bff0..4255214fe 100644
--- a/nuttx/libc/math/lib_atan2.c
+++ b/nuttx/libc/math/lib_atan2.c
@@ -64,7 +64,7 @@ double atan2(double y, double x)
     {
       return M_PI_2;
     }
-  else if (y == 0 && x == 0) /* Undefined but returns normally 0 */
+  else /* if (y == 0 && x == 0) Undefined but returns normally 0 */
     {
       return 0;
     }
diff --git a/nuttx/libc/math/lib_atan2f.c b/nuttx/libc/math/lib_atan2f.c
index 999edd6ee..8e7d9cea9 100644
--- a/nuttx/libc/math/lib_atan2f.c
+++ b/nuttx/libc/math/lib_atan2f.c
@@ -60,7 +60,7 @@ float atan2f(float y, float x)
     {
       return M_PI_2;
     }
-  else if (y == 0 && x == 0) /* Undefined but returns normally 0 */
+  else /* if (y == 0 && x == 0) Undefined but returns normally 0 */
     {
       return 0;
     }
diff --git a/nuttx/libc/math/lib_atan2l.c b/nuttx/libc/math/lib_atan2l.c
index 1946a3f04..5ea4616be 100644
--- a/nuttx/libc/math/lib_atan2l.c
+++ b/nuttx/libc/math/lib_atan2l.c
@@ -64,7 +64,7 @@ long double atan2l(long double y, long double x)
     {
       return M_PI_2;
     }
-  else if (y == 0 && x == 0) /* Undefined but returns normally 0 */
+  else /* if (y == 0 && x == 0) Undefined but returns normally 0 */
     {
       return 0;
     }