Refresh/fix more broken configurations

configs/ea3131/locked/Makefile

@@ -38,18 +38,8 @@
 # Board-specific directory, board library, and application library
 
 PASS1_SRCDIR   = arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
-PASS1_BOARDDIR = $(PASS1_SRCDIR)$(DELIM)board
+PASS1_LIBBOARD = libboard$(LIBEXT)
-PASS1_LIBBOARD = $(PASS1_BOARDDIR)$(DELIM)libboard$(LIBEXT)
+PASS1_LIBAPPS  = libapps$(LIBEXT)
-
-# Where is the application library?
-
-ifneq ($(CONFIG_APPS_DIR),)
-PASS1_LIBAPPS = $(CONFIG_APPS_DIR)$(DELIM)libapps$(LIBEXT)
-else
-ifneq ($(APPDIR),)
-PASS1_LIBAPPS = $(APPDIR)$(DELIM)libapps$(LIBEXT)
-endif
-endif
 
 # Remove the application library (libapps) from the list of libraries.  Add
 # the boad library (liboard)
@@ -85,27 +75,27 @@ all: $(PASS1_SRCDIR)$(DELIM)locked.r
 
 ld-locked.inc: mklocked.sh $(TOPDIR)$(DELIM).config
 	@echo "MK:  ld-locked.inc"
-	@.$(DELIM)mklocked.sh "$(TOPDIR)"
+	$(Q) .$(DELIM)mklocked.sh "$(TOPDIR)"
 
 # Make the board library. This is normally done in arch/arm/src/Makefile.
 # However, we need it earlier here when doing a two-pass build so that libboard.a
 # is available to link against.
 
 $(PASS1_LIBBOARD):
-	@$(MAKE) -C $(TOPDIR)$(DELIM)configs$(DELIM)ea3131$(DELIM)src TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES)
+	$(Q) $(MAKE) -C $(TOPDIR)$(DELIM)configs$(DELIM)ea3131$(DELIM)src TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES)
 
 # Create the locked.r file containing all of the code (except the start-up code)
 # that needs to lie in the locked text region.
 
 locked.r: ld-locked.inc $(PASS1_LIBBOARD)
 	@echo "LD:  locked.r"
-	@$(LD) -o $@ $(PASS1_LDFLAGS) $(PASS1_LIBPATHS) --start-group $(PASS1_LDLIBS) --end-group $(PASS1_LIBGCC)
+	$(Q) $(LD) -o $@ $(PASS1_LDFLAGS) $(PASS1_LIBPATHS) --start-group $(PASS1_LDLIBS) --end-group $(PASS1_LIBGCC)
-	@$(NM) $@ > locked.map
+	$(Q) $(NM) $@ > locked.map
-	@fgrep " U " locked.map | grep -v os_start
+	$(Q) fgrep " U " locked.map | grep -v os_start
-	@$(CROSSDEV)size $@
+	$(Q) $(CROSSDEV)size $@
 
 $(PASS1_SRCDIR)$(DELIM)locked.r: locked.r
-	@cp -a locked.r $(TOPDIR)$(DELIM)$(PASS1_SRCDIR)$(DELIM)locked.r
+	$(Q) cp -a locked.r $(TOPDIR)$(DELIM)$(PASS1_SRCDIR)$(DELIM)locked.r
 
 .depend:
 

configs/ea3131/locked/mklocked.sh

@@ -118,14 +118,14 @@ echo "EXTERN(up_vectoraddrexcptn)" >>ld-locked.inc
 echo "EXTERN(up_timer_initialize)" >>ld-locked.inc
 
 answer=$(checkconfig CONFIG_LPC31_UART)
-if [ $answer = y ]; then
+if [ "$answer" = y ]; then
 	echo "EXTERN(up_earlyserialinit)" >>ld-locked.inc
 fi
 
 # up_i2cinitialize -- Not conditioned on anything
 
 answer=$(checkconfig CONFIG_USBDEV)
-if [ $answer = y ]; then
+if [ "$answer" = y ]; then
 	echo "EXTERN(up_usbinitialize)" >>ld-locked.inc
 fi
 
@@ -149,7 +149,7 @@ echo "EXTERN(up_boot)" >>ld-locked.inc
 # included in the locked text section (at least for now)
 
 answer=$(checkzero CONFIG_TASK_NAME_SIZE)
-if [ $answer = n ]; then
+if [ "$answer" = n ]; then
 	echo "EXTERN(up_boot)" >>ld-locked.inc
 fi
 
@@ -162,34 +162,34 @@ echo "EXTERN(wd_initialize)" >>ld-locked.inc
 echo "EXTERN(clock_initialize)" >>ld-locked.inc
 
 answer=$(checkconfig CONFIG_DISABLE_POSIX_TIMERS)
-if [ $answer = n ]; then
+if [ "$answer" = n ]; then
 	echo "EXTERN(timer_initialize)" >>ld-locked.inc
 fi
 
 answer=$(checkconfig CONFIG_DISABLE_SIGNALS)
-if [ $answer = n ]; then
+if [ "$answer" = n ]; then
 	echo "EXTERN(sig_initialize)" >>ld-locked.inc
 fi
 
 echo "EXTERN(sem_initialize)" >>ld-locked.inc
 
 answer=$(checkconfig CONFIG_DISABLE_MQUEUE)
-if [ $answer = n ]; then
+if [ "$answer" = n ]; then
 	echo "EXTERN(mq_initialize)" >>ld-locked.inc
 fi
 
 answer=$(checkconfig CONFIG_DISABLE_PTHREAD)
-if [ $answer = n ]; then
+if [ "$answer" = n ]; then
 	echo "EXTERN(pthread_initialize)" >>ld-locked.inc
 fi
 
 answer=$(checkzero CONFIG_NFILE_DESCRIPTORS)
-if [ $answer = n ]; then
+if [ "$answer" = n ]; then
 	echo "EXTERN(fs_initialize)" >>ld-locked.inc
 fi
 
 answer=$(checkconfig CONFIG_NET)
-if [ $answer = y ]; then
+if [ "$answer" = y ]; then
 	echo "EXTERN(net_initialize)" >>ld-locked.inc
 fi
 

configs/ea3131/pgnsh/defconfig

@@ -49,8 +49,9 @@ CONFIG_RAW_BINARY=y
 # Debug Options
 #
 # CONFIG_DEBUG is not set
-CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_ARCH_HAVE_HEAPCHECK is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_STACK_COLORATION is not set
 # CONFIG_DEBUG_SYMBOLS is not set
 CONFIG_ARCH_HAVE_CUSTOMOPT=y
 # CONFIG_DEBUG_NOOPT is not set
@@ -79,11 +80,13 @@ CONFIG_ARCH="arm"
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
+# CONFIG_ARCH_CHIP_EFM32 is not set
 # CONFIG_ARCH_CHIP_IMX is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
 # CONFIG_ARCH_CHIP_KL is not set
 # CONFIG_ARCH_CHIP_LM is not set
 # CONFIG_ARCH_CHIP_TIVA is not set
+# CONFIG_ARCH_CHIP_LPC11XX is not set
 # CONFIG_ARCH_CHIP_LPC17XX is not set
 # CONFIG_ARCH_CHIP_LPC214X is not set
 # CONFIG_ARCH_CHIP_LPC2378 is not set
@@ -92,7 +95,9 @@ CONFIG_ARCH_CHIP_LPC31XX=y
 # CONFIG_ARCH_CHIP_NUC1XX is not set
 # CONFIG_ARCH_CHIP_SAMA5 is not set
 # CONFIG_ARCH_CHIP_SAMD is not set
+# CONFIG_ARCH_CHIP_SAML is not set
 # CONFIG_ARCH_CHIP_SAM34 is not set
+# CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_ARM7TDMI is not set
@@ -101,11 +106,13 @@ CONFIG_ARCH_ARM926EJS=y
 # CONFIG_ARCH_CORTEXM0 is not set
 # CONFIG_ARCH_CORTEXM3 is not set
 # CONFIG_ARCH_CORTEXM4 is not set
+# CONFIG_ARCH_CORTEXM7 is not set
 # CONFIG_ARCH_CORTEXA5 is not set
 # CONFIG_ARCH_CORTEXA8 is not set
 CONFIG_ARCH_FAMILY="arm"
 CONFIG_ARCH_CHIP="lpc31xx"
 # CONFIG_ARCH_HAVE_FPU is not set
+# CONFIG_ARCH_HAVE_DPFPU is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
 # CONFIG_ARCH_ROMPGTABLE is not set
@@ -173,6 +180,7 @@ CONFIG_ARCH_HAVE_MMU=y
 # CONFIG_ARCH_HAVE_MPU is not set
 # CONFIG_ARCH_NAND_HWECC is not set
 # CONFIG_ARCH_HAVE_EXTCLK is not set
+# CONFIG_ARCH_HAVE_POWEROFF is not set
 CONFIG_ARCH_USE_MMU=y
 CONFIG_PAGING=y
 CONFIG_PAGING_PAGESIZE=1024
@@ -249,6 +257,12 @@ CONFIG_EA3131_PAGING_MOUNTPT="/mnt/pgsrc"
 CONFIG_EA3131_PAGING_BINOFFSET=0
 CONFIG_EA3131_PAGING_SDSLOT=0
 CONFIG_EA3131_PAGING_SPIPORT=0
+CONFIG_LIB_BOARDCTL=y
+# CONFIG_BOARDCTL_TSCTEST is not set
+# CONFIG_BOARDCTL_ADCTEST is not set
+# CONFIG_BOARDCTL_PWMTEST is not set
+# CONFIG_BOARDCTL_GRAPHICS is not set
+# CONFIG_BOARDCTL_IOCTL is not set
 
 #
 # RTOS Features
@@ -278,6 +292,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="nsh_main"
 CONFIG_RR_INTERVAL=200
 CONFIG_TASK_NAME_SIZE=0
@@ -331,6 +348,13 @@ CONFIG_SIG_SIGCONDTIMEDOUT=16
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_MQ_MAXMSGSIZE=32
 
+#
+# Work Queue Support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_SCHED_HPWORK is not set
+# CONFIG_SCHED_LPWORK is not set
+
 #
 # Stack and heap information
 #
@@ -363,11 +387,16 @@ CONFIG_SPI=y
 # CONFIG_SPI_OWNBUS is not set
 CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CMDDATA is not set
+CONFIG_SPI_CALLBACK=y
 # CONFIG_SPI_BITBANG is not set
 # CONFIG_I2S is not set
+
+#
+# Timer Driver Support
+#
+# CONFIG_TIMER is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
@@ -384,6 +413,7 @@ CONFIG_MMCSD_SPI=y
 CONFIG_MMCSD_SPICLOCK=20000000
 CONFIG_MMCSD_SPIMODE=0
 # CONFIG_ARCH_HAVE_SDIO is not set
+# CONFIG_ARCH_HAVE_SDIOWAIT_WRCOMPLETE is not set
 CONFIG_MTD=y
 
 #
@@ -413,6 +443,7 @@ CONFIG_M25P_MEMORY_TYPE=0x20
 # CONFIG_MTD_SST25XX is not set
 # CONFIG_MTD_SST39FV is not set
 # CONFIG_MTD_W25 is not set
+# CONFIG_EEPROM is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -442,13 +473,18 @@ CONFIG_ARCH_HAVE_UART=y
 # CONFIG_ARCH_HAVE_USART6 is not set
 # CONFIG_ARCH_HAVE_USART7 is not set
 # CONFIG_ARCH_HAVE_USART8 is not set
+# CONFIG_ARCH_HAVE_OTHER_UART is not set
 
 #
 # USART Configuration
 #
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_UART_SERIAL_CONSOLE=y
+# CONFIG_OTHER_SERIAL_CONSOLE is not set
 # CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
@@ -462,8 +498,6 @@ CONFIG_UART_PARITY=0
 CONFIG_UART_2STOP=0
 # CONFIG_UART_IFLOWCONTROL is not set
 # CONFIG_UART_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
 # CONFIG_USBDEV is not set
 # CONFIG_USBHOST is not set
 # CONFIG_WIRELESS is not set
@@ -476,6 +510,7 @@ CONFIG_UART_2STOP=0
 # System Logging
 #
 # CONFIG_RAMLOG is not set
+# CONFIG_SYSLOG_CONSOLE is not set
 
 #
 # Networking Support
@@ -501,6 +536,8 @@ CONFIG_UART_2STOP=0
 # CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
 CONFIG_FS_READABLE=y
 CONFIG_FS_WRITABLE=y
+# CONFIG_FS_NAMED_SEMAPHORES is not set
+CONFIG_FS_MQUEUE_MPATH="/var/mqueue"
 # CONFIG_FS_RAMMAP is not set
 CONFIG_FS_FAT=y
 # CONFIG_FAT_LCNAMES is not set
@@ -511,12 +548,13 @@ CONFIG_FS_FAT=y
 # CONFIG_FS_ROMFS is not set
 # CONFIG_FS_SMARTFS is not set
 # CONFIG_FS_PROCFS is not set
+# CONFIG_FS_UNIONFS is not set
 
 #
 # System Logging
 #
-
 # CONFIG_SYSLOG is not set
+# CONFIG_SYSLOG_TIMESTAMP is not set
 
 #
 # Graphics Support
@@ -538,7 +576,7 @@ CONFIG_MM_REGIONS=1
 # CONFIG_AUDIO is not set
 
 #
-# Binary Formats
+# Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
 # CONFIG_BINFMT_EXEPATH is not set
@@ -563,6 +601,7 @@ CONFIG_LIB_HOMEDIR="/"
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
 CONFIG_LIBC_LONG_LONG=y
+# CONFIG_LIBC_IOCTL_VARIADIC is not set
 CONFIG_LIB_RAND_ORDER=1
 # CONFIG_EOL_IS_CR is not set
 # CONFIG_EOL_IS_LF is not set
@@ -573,8 +612,11 @@ CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 # CONFIG_LIBC_STRERROR is not set
 # CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_LIBC_TMPDIR="/tmp"
+CONFIG_LIBC_MAX_TMPFILE=32
 CONFIG_ARCH_LOWPUTC=y
 # CONFIG_LIBC_LOCALTIME is not set
+# CONFIG_TIME_EXTENDED is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
@@ -582,7 +624,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # Non-standard Library Support
 #
-# CONFIG_SCHED_WORKQUEUE is not set
 # CONFIG_LIB_KBDCODEC is not set
 # CONFIG_LIB_SLCDCODEC is not set
 
@@ -626,7 +667,6 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_NX is not set
 # CONFIG_EXAMPLES_NXTERM is not set
 # CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
 # CONFIG_EXAMPLES_NXHELLO is not set
 # CONFIG_EXAMPLES_NXIMAGE is not set
 # CONFIG_EXAMPLES_NXLINES is not set
@@ -634,10 +674,10 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_OSTEST is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POLL is not set
+# CONFIG_EXAMPLES_PPPD is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
 # CONFIG_EXAMPLES_QENCODER is not set
 # CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
 # CONFIG_EXAMPLES_SERIALBLASTER is not set
 # CONFIG_EXAMPLES_SERIALRX is not set
@@ -646,10 +686,8 @@ CONFIG_EXAMPLES_NSH=y
 # CONFIG_EXAMPLES_SMART is not set
 # CONFIG_EXAMPLES_TCPECHO is not set
 # CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
 # CONFIG_EXAMPLES_TIFF is not set
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_WEBSERVER is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
 # CONFIG_EXAMPLES_USBTERM is not set
@@ -659,12 +697,15 @@ CONFIG_EXAMPLES_NSH=y
 # Graphics Support
 #
 # CONFIG_TIFF is not set
+# CONFIG_GRAPHICS_TRAVELER is not set
 
 #
 # Interpreters
 #
+# CONFIG_INTERPRETERS_BAS is not set
 # CONFIG_INTERPRETERS_FICL is not set
 # CONFIG_INTERPRETERS_PCODE is not set
+# CONFIG_INTERPRETERS_MICROPYTHON is not set
 
 #
 # Network Utilities
@@ -674,15 +715,9 @@ CONFIG_EXAMPLES_NSH=y
 # Networking Utilities
 #
 # CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
 # CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
 # CONFIG_NETUTILS_JSON is not set
 # CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_NETLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
 
 #
 # FreeModBus
@@ -702,7 +737,6 @@ CONFIG_NSH_READLINE=y
 CONFIG_NSH_LINELEN=64
 # CONFIG_NSH_DISABLE_SEMICOLON is not set
 CONFIG_NSH_CMDPARMS=y
-CONFIG_NSH_TMPDIR="/tmp"
 CONFIG_NSH_MAXARGUMENTS=6
 CONFIG_NSH_ARGCAT=y
 CONFIG_NSH_NESTDEPTH=3
@@ -716,6 +750,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_CD is not set
 # CONFIG_NSH_DISABLE_CP is not set
 # CONFIG_NSH_DISABLE_CMP is not set
+CONFIG_NSH_DISABLE_DATE=y
 # CONFIG_NSH_DISABLE_DD is not set
 # CONFIG_NSH_DISABLE_DF is not set
 # CONFIG_NSH_DISABLE_DELROUTE is not set
@@ -737,6 +772,7 @@ CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLE_MKRD is not set
 # CONFIG_NSH_DISABLE_MH is not set
 # CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MV is not set
 # CONFIG_NSH_DISABLE_MW is not set
 # CONFIG_NSH_DISABLE_PS is not set
 # CONFIG_NSH_DISABLE_PUT is not set
@@ -774,7 +810,6 @@ CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_CONSOLE=y
 # CONFIG_NSH_ALTCONDEV is not set
 CONFIG_NSH_ARCHINIT=y
-CONFIG_LIB_BOARDCTL=y
 
 #
 # NxWidgets/NxWM
@@ -788,115 +823,18 @@ CONFIG_LIB_BOARDCTL=y
 #
 # System Libraries and NSH Add-Ons
 #
-
-#
-# Custom Free Memory Command
-#
 # CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
 # CONFIG_SYSTEM_CLE is not set
-
+# CONFIG_SYSTEM_CUTERM is not set
-#
-# FLASH Program Installation
-#
 # CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# Intel HEX to binary conversion
-#
 # CONFIG_SYSTEM_HEX2BIN 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
-
-#
-# RAM test
-#
 # CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
-
-#
-# P-Code Support
-#
-
-#
-# PHY Tool
-#
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
 # CONFIG_SYSTEM_RAMTRON is not set
-
-#
-# SD Card
-#
 # CONFIG_SYSTEM_SDCARD is not set
-
-#
-# Sudoku
-#
 # CONFIG_SYSTEM_SUDOKU is not set
-
-#
-# Sysinfo
-#
 # CONFIG_SYSTEM_SYSINFO is not set
-
-#
-# VI Work-Alike Editor
-#
 # CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
 # CONFIG_SYSTEM_ZMODEM is not set

configs/stm3210e-eval/src/stm32_idle.c

@@ -347,7 +347,7 @@ static void stm32_idlepm(void)
             /* Set the alarm as an EXTI Line */
 
 #ifdef CONFIG_RTC_ALARM
-            up_rtc_alarm(CONFIG_PM_ALARM_SEC, CONFIG_PM_ALARM_NSEC, true);
+            stm32_rtc_alarm(CONFIG_PM_ALARM_SEC, CONFIG_PM_ALARM_NSEC, true);
 #endif
             /* Wait 10ms */
 
@@ -386,7 +386,7 @@ static void stm32_idlepm(void)
             /* Configure the RTC alarm to Auto Reset the system */
 
 #ifdef CONFIG_PM_SLEEP_WAKEUP
-            up_rtc_alarm(CONFIG_PM_SLEEP_WAKEUP_SEC, CONFIG_PM_SLEEP_WAKEUP_NSEC, false);
+            stm32_rtc_alarm(CONFIG_PM_SLEEP_WAKEUP_SEC, CONFIG_PM_SLEEP_WAKEUP_NSEC, false);
 #endif
             /* Wait 10ms */
 

configs/stm3210e-eval/src/stm32_pmbuttons.c

@@ -68,6 +68,7 @@
 #define BUTTON_MIN   0
 #ifdef CONFIG_DJOYSTICK
 #  define BUTTON_MAX 2
+#else
 #  define BUTTON_MAX 7
 #endif
 

configs/stm32f4discovery/src/Makefile

@@ -81,7 +81,7 @@ CSRCS += stm32_pm.c
 endif
 
 ifeq ($(CONFIG_PM_BUTTONS),y)
-CSRCS += stm32_pm_buttons.c
+CSRCS += stm32_pmbuttons.c
 endif
 
 ifeq ($(CONFIG_ARCH_IDLE_CUSTOM),y)