More NxWM build fixes

This commit is contained in:
Gregory Nutt 2014-09-20 16:47:00 -06:00
parent c2e69373f3
commit 5e285b8bc4
6 changed files with 18 additions and 7 deletions

View File

@ -1906,7 +1906,7 @@ static void sam_adc_channels(struct sam_adc_s *priv)
* Initialize the adc * Initialize the adc
* *
* Returned Value: * 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; uint32_t mck;
int ret; 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. * interface one more time.
*/ */

View File

@ -17,6 +17,7 @@ CONFIG_HOST_LINUX=y
# Build Configuration # Build Configuration
# #
# CONFIG_APPS_DIR="../apps" # CONFIG_APPS_DIR="../apps"
CONFIG_BUILD_FLAT=y
# CONFIG_BUILD_2PASS is not set # CONFIG_BUILD_2PASS is not set
# #
@ -99,7 +100,6 @@ CONFIG_ARCH_FAMILY="armv7-m"
CONFIG_ARCH_CHIP="sam34" CONFIG_ARCH_CHIP="sam34"
# CONFIG_ARMV7M_USEBASEPRI is not set # CONFIG_ARMV7M_USEBASEPRI is not set
# CONFIG_ARCH_HAVE_FPU is not set # CONFIG_ARCH_HAVE_FPU is not set
CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARMV7M_MPU is not set # CONFIG_ARMV7M_MPU is not set
# #
@ -261,11 +261,15 @@ CONFIG_SAM34_EMAC_ISETH0=y
CONFIG_ARCH_DMA=y CONFIG_ARCH_DMA=y
CONFIG_ARCH_HAVE_IRQPRIO=y CONFIG_ARCH_HAVE_IRQPRIO=y
# CONFIG_ARCH_L2CACHE is not set # 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_VFORK=y
# CONFIG_ARCH_HAVE_MMU is not set # CONFIG_ARCH_HAVE_MMU is not set
CONFIG_ARCH_HAVE_MPU=y
# CONFIG_ARCH_NAND_HWECC is not set # CONFIG_ARCH_NAND_HWECC is not set
# CONFIG_ARCH_HAVE_EXTCLK 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_IRQPRIO is not set
CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_STACKDUMP=y
# CONFIG_ENDIAN_BIG is not set # CONFIG_ENDIAN_BIG is not set
@ -360,6 +364,9 @@ CONFIG_PREALLOC_TIMERS=4
# #
# Tasks and Scheduling # 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_USER_ENTRYPOINT="nxwm_main"
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_NAME_SIZE=0
@ -425,6 +432,7 @@ CONFIG_IDLETHREAD_STACKSIZE=1024
CONFIG_USERMAIN_STACKSIZE=1024 CONFIG_USERMAIN_STACKSIZE=1024
CONFIG_PTHREAD_STACK_MIN=256 CONFIG_PTHREAD_STACK_MIN=256
CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_PTHREAD_STACK_DEFAULT=1024
# CONFIG_LIB_SYSCALL is not set
# #
# Device Drivers # Device Drivers

View File

@ -416,6 +416,9 @@ CONFIG_PREALLOC_TIMERS=4
# #
# Tasks and Scheduling # 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_USER_ENTRYPOINT="nxwm_main"
CONFIG_RR_INTERVAL=200 CONFIG_RR_INTERVAL=200
CONFIG_TASK_NAME_SIZE=32 CONFIG_TASK_NAME_SIZE=32

View File

@ -64,7 +64,7 @@ double atan2(double y, double x)
{ {
return M_PI_2; 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; return 0;
} }

View File

@ -60,7 +60,7 @@ float atan2f(float y, float x)
{ {
return M_PI_2; 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; return 0;
} }

View File

@ -64,7 +64,7 @@ long double atan2l(long double y, long double x)
{ {
return M_PI_2; 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; return 0;
} }