Nucleo-F401RE build issues

5 files changed, 81 insertions, 48 deletions

diff --git a/nuttx/configs/nucleo-f401re/nsh/defconfig b/nuttx/configs/nucleo-f401re/nsh/defconfig
index 0eeab1773..5192364b9 100644
--- a/nuttx/configs/nucleo-f401re/nsh/defconfig
+++ b/nuttx/configs/nucleo-f401re/nsh/defconfig
@@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
 #
 # Build Configuration
 #
-CONFIG_APPS_DIR="../apps"
+# CONFIG_APPS_DIR="../apps"
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -26,6 +26,7 @@ CONFIG_APPS_DIR="../apps"
 # CONFIG_INTELHEX_BINARY is not set
 # CONFIG_MOTOROLA_SREC is not set
 CONFIG_RAW_BINARY=y
+# CONFIG_UBOOT_UIMAGE is not set
 
 #
 # Customize Header Files
@@ -303,7 +304,6 @@ CONFIG_STM32_SPI_DMA=y
 #
 # SDIO Configuration
 #
-CONFIG_SDIO_PRI=128
 
 #
 # USB Host Configuration
@@ -383,33 +383,67 @@ CONFIG_NSH_MMCSDSLOTNO=0
 #
 # RTOS Features
 #
-CONFIG_BOARD_INITIALIZE=y
+# CONFIG_DISABLE_OS_API is not set
+
+#
+# Clocks and Timers
+#
 CONFIG_MSEC_PER_TICK=1
 # CONFIG_SYSTEM_TIME64 is not set
-CONFIG_RR_INTERVAL=0
-# CONFIG_SCHED_CPULOAD is not set
-# CONFIG_SCHED_INSTRUMENTATION is not set
-CONFIG_TASK_NAME_SIZE=24
-# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=1970
 CONFIG_START_MONTH=1
 CONFIG_START_DAY=1
-CONFIG_DEV_CONSOLE=y
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=50
+CONFIG_PREALLOC_TIMERS=50
+
+#
+# Tasks and Scheduling
+#
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_RR_INTERVAL=0
+CONFIG_TASK_NAME_SIZE=24
+CONFIG_MAX_TASK_ARGS=10
+CONFIG_MAX_TASKS=32
+# CONFIG_SCHED_HAVE_PARENT is not set
+CONFIG_SCHED_WAITPID=y
+
+#
+# Pthread Options
+#
 # CONFIG_MUTEX_TYPES is not set
-CONFIG_PRIORITY_INHERITANCE=y
-CONFIG_SEM_PREALLOCHOLDERS=0
-CONFIG_SEM_NNESTPRIO=8
+CONFIG_NPTHREAD_KEYS=4
+
+#
+# Performance Monitoring
+#
+# CONFIG_SCHED_CPULOAD is not set
+# CONFIG_SCHED_INSTRUMENTATION is not set
+
+#
+# Files and I/O
+#
+CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 CONFIG_FDCLONE_STDIO=y
 CONFIG_SDCLONE_DISABLE=y
-CONFIG_SCHED_WAITPID=y
+CONFIG_NFILE_DESCRIPTORS=32
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
+CONFIG_PRIORITY_INHERITANCE=y
+CONFIG_SEM_PREALLOCHOLDERS=0
+CONFIG_SEM_NNESTPRIO=8
+
+#
+# RTOS hooks
+#
+CONFIG_BOARD_INITIALIZE=y
 # CONFIG_SCHED_STARTHOOK is not set
 CONFIG_SCHED_ATEXIT=y
 CONFIG_SCHED_ATEXIT_MAX=1
 # CONFIG_SCHED_ONEXIT is not set
-CONFIG_USER_ENTRYPOINT="nsh_main"
-# CONFIG_DISABLE_OS_API is not set
 
 #
 # Signal Numbers
@@ -421,19 +455,10 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 CONFIG_SIG_SIGWORK=4
 
 #
-# Sizes of configurable things (0 disables)
+# POSIX Message Queue Options
 #
-CONFIG_MAX_TASKS=32
-CONFIG_MAX_TASK_ARGS=10
-CONFIG_NPTHREAD_KEYS=4
-CONFIG_NFILE_DESCRIPTORS=32
-CONFIG_NFILE_STREAMS=8
-CONFIG_NAME_MAX=32
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=50
-CONFIG_PREALLOC_TIMERS=50
 
 #
 # Stack and heap information
@@ -488,6 +513,7 @@ CONFIG_MTD=y
 # MTD Configuration
 #
 CONFIG_MTD_PARTITION=y
+# CONFIG_MTD_SECT512 is not set
 CONFIG_MTD_BYTE_WRITE=y
 # CONFIG_MTD_CONFIG is not set
 # CONFIG_MTD_CONFIG_RAM_CONSOLIDATE is not set
@@ -783,7 +809,6 @@ CONFIG_EXAMPLES_CC3000BASIC=y
 # CONFIG_EXAMPLES_HIDKBD is not set
 # CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
-# CONFIG_EXAMPLES_LCDRW is not set
 # CONFIG_EXAMPLES_MM is not set
 # CONFIG_EXAMPLES_MODBUS is not set
 CONFIG_EXAMPLES_MOUNT=y
@@ -850,12 +875,14 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_NETUTILS_FTPC is not set
 # CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
+# CONFIG_NETUTILS_DNSCLIENT is not set
 # CONFIG_NETUTILS_SMTP is not set
 CONFIG_NETUTILS_TFTPC=y
 # CONFIG_NETUTILS_THTTPD is not set
 CONFIG_NETUTILS_UIPLIB=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
+# CONFIG_NETUTILS_NTPCLIENT is not set
 # CONFIG_NETUTILS_DISCOVER is not set
 
 #
@@ -962,26 +989,14 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 #
 
 #
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
 # Custom Free Memory Command
 #
 # CONFIG_SYSTEM_FREE is not set
 
 #
-# I2C tool
-#
-
-#
-# INI File Parser
+# EMACS-like Command Line Editor
 #
-# CONFIG_SYSTEM_INIFILE is not set
+# CONFIG_SYSTEM_CLE is not set
 
 #
 # FLASH Program Installation
@@ -994,6 +1009,15 @@ CONFIG_NSH_MAX_ROUNDTRIP=20
 # CONFIG_SYSTEM_FLASH_ERASEALL is not set
 
 #
+# I2C tool
+#
+
+#
+# INI File Parser
+#
+# CONFIG_SYSTEM_INIFILE is not set
+
+#
 # NxPlayer media player library / command Line
 #
 # CONFIG_SYSTEM_NXPLAYER is not set
@@ -1031,21 +1055,20 @@ CONFIG_SYSTEM_SYSINFO=y
 CONFIG_SYSTEM_SYSINFO_STACKSIZE=1024
 
 #
-# USB Monitor
+# VI Work-Alike Editor
 #
+# CONFIG_SYSTEM_VI is not set
 
 #
-# EMACS-like Command Line Editor
+# Stack Monitor
 #
-# CONFIG_SYSTEM_CLE is not set
 
 #
-# VI Work-Alike Editor
+# USB CDC/ACM Device Commands
 #
-# CONFIG_SYSTEM_VI is not set
 
 #
-# Stack Monitor
+# USB Composite Device Commands
 #
 
 #
@@ -1053,6 +1076,10 @@ CONFIG_SYSTEM_SYSINFO_STACKSIZE=1024
 #
 
 #
+# USB Monitor
+#
+
+#
 # Zmodem Commands
 #
 # CONFIG_SYSTEM_ZMODEM is not set
diff --git a/nuttx/configs/nucleo-f401re/src/Makefile b/nuttx/configs/nucleo-f401re/src/Makefile
index 0b30690cd..ca34843bc 100644
--- a/nuttx/configs/nucleo-f401re/src/Makefile
+++ b/nuttx/configs/nucleo-f401re/src/Makefile
@@ -47,7 +47,7 @@ CSRCS += stm32_wireless.c
 endif
 
 ifeq ($(CONFIG_CC3000_PROBES),)
-CSRCS += up_io.c
+CSRCS += stm32_io.c
 endif
 
 COBJS = $(CSRCS:.c=$(OBJEXT))
diff --git a/nuttx/configs/nucleo-f401re/src/board_config.h b/nuttx/configs/nucleo-f401re/src/board_config.h
index 08dd80377..44262e7e5 100644
--- a/nuttx/configs/nucleo-f401re/src/board_config.h
+++ b/nuttx/configs/nucleo-f401re/src/board_config.h
@@ -131,6 +131,7 @@ __BEGIN_DECLS
 #define PX4_SPIDEV_MPU          4
 
 /* I2C busses */
+
 #define PX4_I2C_BUS_EXPANSION   1
 #define PX4_I2C_BUS_LED         2
 
diff --git a/nuttx/configs/nucleo-f401re/src/stm32_boot.c b/nuttx/configs/nucleo-f401re/src/stm32_boot.c
index a6919a0ce..8a09263cf 100644
--- a/nuttx/configs/nucleo-f401re/src/stm32_boot.c
+++ b/nuttx/configs/nucleo-f401re/src/stm32_boot.c
@@ -39,9 +39,12 @@
  ************************************************************************************/
 
 #include <nuttx/config.h>
-#include <nuttx/spi/spi.h>
+
 #include <debug.h>
 
+#include <nuttx/arch.h>
+#include <nuttx/spi/spi.h>
+
 #include <arch/board/board.h>
 
 #include "up_arch.h"
diff --git a/nuttx/configs/nucleo-f401re/src/stm32_spi.c b/nuttx/configs/nucleo-f401re/src/stm32_spi.c
index 2fdc47689..05001aa47 100644
--- a/nuttx/configs/nucleo-f401re/src/stm32_spi.c
+++ b/nuttx/configs/nucleo-f401re/src/stm32_spi.c
@@ -48,7 +48,9 @@
 #include <up_arch.h>
 #include <chip.h>
 #include <stm32.h>
+
 #include "board_config.h"
+#include "nucleo-f401re.h"
 
 #if defined(CONFIG_STM32_SPI1) || defined(CONFIG_STM32_SPI2) || defined(CONFIG_STM32_SPI3)