diff options
| -rw-r--r-- | apps/ChangeLog.txt | 5 | ||||
| -rw-r--r-- | apps/Makefile | 6 | ||||
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/stm32/stm32_eth.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/fire-stm32v2/include/board.h | 11 | ||||
| -rw-r--r-- | nuttx/configs/olimex-stm32-p107/include/board.h | 11 | ||||
| -rw-r--r-- | nuttx/configs/shenzhou/include/board.h | 11 |
7 files changed, 43 insertions, 6 deletions
diff --git a/apps/ChangeLog.txt b/apps/ChangeLog.txt index 2d7b2eb9f..0e63d183e 100644 --- a/apps/ChangeLog.txt +++ b/apps/ChangeLog.txt @@ -353,3 +353,8 @@ * vsn: Moved all NSH commands from vsn/ to system/. Deleted the vsn/ directory. + * Makefile: Change order of includes when CONFIG_NEWCONFIG=y. In + that case, namedapp must be included first so that the namedapp + context is established first. If the namedapp context is established + later, it will overwrite any existing namedapp_list.h and nameapp_proto.h + files. diff --git a/apps/Makefile b/apps/Makefile index d2b0ecdab..e407e2de8 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -46,7 +46,7 @@ APPDIR = ${shell pwd} # appears in this directory as .config) # SUBDIRS is the list of all directories containing Makefiles. It is used # only for cleaning. namedapp must always be the first in the list. This -# list can be extended by the .config file as well +# list can be extended by the .config file as well. CONFIGURED_APPS = SUBDIRS = examples graphics interpreters modbus namedapp nshlib netutils system @@ -70,11 +70,13 @@ SUBDIRS = examples graphics interpreters modbus namedapp nshlib netutils system ifeq ($(CONFIG_NUTTX_NEWCONFIG),y) +# namedapp/Make.defs must be included first + +include namedapp/Make.defs include examples/Make.defs include graphics/Make.defs include interpreters/Make.defs include modbus/Make.defs -include namedapp/Make.defs include netutils/Make.defs include nshlib/Make.defs include system/Make.defs diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 55a06aeec..4ea03f34f 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3458,3 +3458,6 @@ * arch/arm/src/stm32/stm32_rng.c, chip/stm32_rng.h, and other files: Implementation of /dev/random using the STM32 Random Number Generator (RNG). + * board.h file for shenzhou, fire-stm32v2, and olimex-stm32-p107: + Add frequencies for HSE, HSI, LSE, and LSI. These are needed + by the STM32 watchdog driver. diff --git a/nuttx/arch/arm/src/stm32/stm32_eth.c b/nuttx/arch/arm/src/stm32/stm32_eth.c index 81345fabf..13f02679f 100644 --- a/nuttx/arch/arm/src/stm32/stm32_eth.c +++ b/nuttx/arch/arm/src/stm32/stm32_eth.c @@ -1956,7 +1956,7 @@ static void stm32_polltimer(int argc, uint32_t arg, ...) /* Check if the next TX descriptor is owned by the Ethernet DMA or CPU. We * cannot perform the timer poll if we are unable to accept another packet * for transmission. Hmmm.. might be bug here. Does this mean if there is - * a transmit in progress, we will missing TCP time state updates? + * a transmit in progress, we will miss TCP time state updates? * * In a race condition, ETH_TDES0_OWN may be cleared BUT still not available * because stm32_freeframe() has not yet run. If stm32_freeframe() has run, diff --git a/nuttx/configs/fire-stm32v2/include/board.h b/nuttx/configs/fire-stm32v2/include/board.h index 9a5d309ab..acd70933a 100644 --- a/nuttx/configs/fire-stm32v2/include/board.h +++ b/nuttx/configs/fire-stm32v2/include/board.h @@ -55,10 +55,19 @@ /* Clocking *************************************************************************/ -/* On-board crystal frequency is 8MHz (HSE) */ +/* HSI - 8 MHz RC factory-trimmed + * LSI - 40 KHz RC (30-60KHz, uncalibrated) + * HSE - On-board crystal frequency is 8MHz + * LSE - 32.768 kHz crytal + */ #define STM32_BOARD_XTAL 8000000ul +#define STM32_HSI_FREQUENCY 8000000ul +#define STM32_LSI_FREQUENCY 40000 +#define STM32_HSE_FREQUENCY STM32_BOARD_XTAL +#define STM32_LSE_FREQUENCY 32768 + /* PLL source is HSE/1, PLL multipler is 9: PLL frequency is 8MHz (XTAL) x 9 = 72MHz */ #define STM32_CFGR_PLLSRC RCC_CFGR_PLLSRC diff --git a/nuttx/configs/olimex-stm32-p107/include/board.h b/nuttx/configs/olimex-stm32-p107/include/board.h index ce0c82472..96051e25c 100644 --- a/nuttx/configs/olimex-stm32-p107/include/board.h +++ b/nuttx/configs/olimex-stm32-p107/include/board.h @@ -55,10 +55,19 @@ /* Clocking *************************************************************************/ -/* On-board crystal frequency is 25MHz (HSE) */ +/* HSI - 8 MHz RC factory-trimmed + * LSI - 40 KHz RC (30-60KHz, uncalibrated) + * HSE - On-board crystal frequency is 25MHz + * LSE - 32.768 kHz + */ #define STM32_BOARD_XTAL 25000000ul +#define STM32_HSI_FREQUENCY 8000000ul +#define STM32_LSI_FREQUENCY 40000 +#define STM32_HSE_FREQUENCY STM32_BOARD_XTAL +#define STM32_LSE_FREQUENCY 32768 + /* PLL ouput is 72MHz */ #define STM32_PLL_PREDIV2 RCC_CFGR2_PREDIV2d5 /* 25MHz / 5 => 5MHz */ diff --git a/nuttx/configs/shenzhou/include/board.h b/nuttx/configs/shenzhou/include/board.h index c105d4ab5..2897ac219 100644 --- a/nuttx/configs/shenzhou/include/board.h +++ b/nuttx/configs/shenzhou/include/board.h @@ -55,10 +55,19 @@ /* Clocking *************************************************************************/ -/* On-board crystal frequency is 25MHz (HSE) */ +/* HSI - 8 MHz RC factory-trimmed + * LSI - 40 KHz RC (30-60KHz, uncalibrated) + * HSE - On-board crystal frequency is 25MHz + * LSE - 32.768 kHz + */ #define STM32_BOARD_XTAL 25000000ul +#define STM32_HSI_FREQUENCY 8000000ul +#define STM32_LSI_FREQUENCY 40000 +#define STM32_HSE_FREQUENCY STM32_BOARD_XTAL +#define STM32_LSE_FREQUENCY 32768 + /* PLL ouput is 72MHz */ #define STM32_PLL_PREDIV2 RCC_CFGR2_PREDIV2d5 /* 25MHz / 5 => 5MHz */ |