From 044d538da3fc768240a8cf693bbcfb3f9c154809 Mon Sep 17 00:00:00 2001 From: Juha Niskanen Date: Thu, 28 Jun 2018 07:06:57 -0600 Subject: [PATCH] Fix some errors found during upstream merge --- Documentation/acronyms.txt | 3 +++ arch/arm/src/stm32/stm32l15xxx_rtcc.c | 2 +- arch/arm/src/stm32l4/Kconfig | 6 +++--- mm/iob/iob_navail.c | 4 ++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Documentation/acronyms.txt b/Documentation/acronyms.txt index 1a0865a6e2..56033796f2 100644 --- a/Documentation/acronyms.txt +++ b/Documentation/acronyms.txt @@ -52,6 +52,7 @@ LAN Local Area Network (networking) LCD Liquid Crystal Display LIBC The "C" Library LIBM The "C" Math Library +LP Low Power MAC Media Access Control (networking, OSI model) MCI Memory Card Interface MCU Microcontroller Unit @@ -77,6 +78,7 @@ PROM Programmable Read-Only Memory OS Operating System OTG On-The-Go (USB) OTP One-Time Programmable +POR Power-On Reset PWM Pulse Width Modulation PKT "Raw" Packet socket (networking) PRNG Pseudo-Random Number Generator @@ -115,4 +117,5 @@ WAN Wide Area Network (networking) WLAN Wireless Local Area Network (networking) WPAN Wireless Personal Area Network (networking) WDT Watchdog Timer (hardware) +XIP eExecute In Place XDMAC Extended DMA Controller (Atmel) diff --git a/arch/arm/src/stm32/stm32l15xxx_rtcc.c b/arch/arm/src/stm32/stm32l15xxx_rtcc.c index 9c7f094178..ec59ebd856 100644 --- a/arch/arm/src/stm32/stm32l15xxx_rtcc.c +++ b/arch/arm/src/stm32/stm32l15xxx_rtcc.c @@ -94,7 +94,7 @@ #endif #if !defined(CONFIG_STM32_RTC_MAGIC_TIME_SET) -# define CONFIG_STM32_RTC_MAGIC_TIME_SET (0xfoodface) +# define CONFIG_STM32_RTC_MAGIC_TIME_SET (0xf00dface) #endif #if !defined(CONFIG_STM32_RTC_MAGIC_REG) diff --git a/arch/arm/src/stm32l4/Kconfig b/arch/arm/src/stm32l4/Kconfig index 41e2636bfb..7d8bf8e4e6 100644 --- a/arch/arm/src/stm32l4/Kconfig +++ b/arch/arm/src/stm32l4/Kconfig @@ -1426,7 +1426,7 @@ config STM32L4_HAVE_RTC_SUBSECONDS select ARCH_HAVE_RTC_SUBSECONDS default y -config STM32F4_RTC_MAGIC_REG +config STM32L4_RTC_MAGIC_REG int "BKP register" default 0 range 0 31 @@ -1434,13 +1434,13 @@ config STM32F4_RTC_MAGIC_REG The BKP register used to store/check the Magic value to determine if RTC is already setup -config STM32F4_RTC_MAGIC +config STM32L4_RTC_MAGIC hex "RTC Magic 1" default 0xfacefeed ---help--- Value used as Magic to determine if the RTC is already setup -config STM32F4_RTC_MAGIC_TIME_SET +config STM32L4_RTC_MAGIC_TIME_SET hex "RTC Magic 2" default 0xf00dface ---help--- diff --git a/mm/iob/iob_navail.c b/mm/iob/iob_navail.c index 81b8cad3ac..7a14e5533f 100644 --- a/mm/iob/iob_navail.c +++ b/mm/iob/iob_navail.c @@ -61,11 +61,15 @@ int iob_navail(void) int navail = 0; int ret; +#if CONFIG_IOB_NCHAINS > 0 ret = nxsem_getvalue(&g_qentry_sem, &navail); if (ret >= 0) { ret = navail; } +#else + ret = navail; +#endif return ret; }