Skip to content

Commit

Permalink
Merge pull request #8939 from aabadie/pr/boards/nucleo-l4r5zi
Browse files Browse the repository at this point in the history
boards/nucleo-l4r5zi: initial basic support
  • Loading branch information
fjmolinas authored Jul 8, 2019
2 parents f92297b + 7044c95 commit 14fe8f2
Show file tree
Hide file tree
Showing 11 changed files with 20,435 additions and 6 deletions.
2 changes: 1 addition & 1 deletion boards/common/nucleo144/include/board.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ extern "C" {
* @name LED pin definitions and handlers
* @{
*/
#if defined(CPU_MODEL_STM32L496ZG)
#if defined(CPU_MODEL_STM32L496ZG) || defined(CPU_MODEL_STM32L4R5ZI)
#define LED0_PORT GPIOC
#define LED0_PIN GPIO_PIN(PORT_C, 7)
#define LED0_MASK (1 << 7)
Expand Down
4 changes: 4 additions & 0 deletions boards/nucleo-l4r5zi/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
MODULE = board
DIRS = $(RIOTBOARD)/common/nucleo

include $(RIOTBASE)/Makefile.base
3 changes: 3 additions & 0 deletions boards/nucleo-l4r5zi/Makefile.dep
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FEATURES_REQUIRED += periph_lpuart

include $(RIOTBOARD)/common/nucleo/Makefile.dep
16 changes: 16 additions & 0 deletions boards/nucleo-l4r5zi/Makefile.features
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Put defined MCU peripherals here (in alphabetical order)
FEATURES_PROVIDED += periph_i2c
FEATURES_PROVIDED += periph_lpuart
FEATURES_PROVIDED += periph_rtc
FEATURES_PROVIDED += periph_rtt
FEATURES_PROVIDED += periph_spi
FEATURES_PROVIDED += periph_timer
FEATURES_PROVIDED += periph_uart

# Put other features for this board (in alphabetical order)
FEATURES_PROVIDED += riotboot

# load the common Makefile.features for Nucleo boards
include $(RIOTBOARD)/common/nucleo144/Makefile.features

-include $(RIOTCPU)/stm32l4/Makefile.features
10 changes: 10 additions & 0 deletions boards/nucleo-l4r5zi/Makefile.include
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
## the cpu to build for
export CPU = stm32l4
export CPU_MODEL = stm32l4r5zi

# stdio is available over st-link
PORT_LINUX ?= /dev/ttyACM0
PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbmodem*)))

# load the common Makefile.include for Nucleo boards
include $(RIOTBOARD)/common/nucleo144/Makefile.include
33 changes: 33 additions & 0 deletions boards/nucleo-l4r5zi/doc.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
/**
* @defgroup boards_nucleo144-l4r5 STM32 Nucleo-L4R5ZI
* @ingroup boards_common_nucleo144
* @brief Support for the STM32 Nucleo-L4R5ZI

## Overview

The Nucleo-L4R5ZI is a board from ST's Nucleo family supporting a ARM Cortex-M4
STM32L4R5ZI microcontroller with 640Kb of RAM and 2Mb of ROM Flash.

## Flashing the device

The ST Nucleo-L4R5ZI board includes an on-board ST-LINK programmer and can be
flashed using OpenOCD.
@note The latest release of OpenOCD doesn't contain support for this board,
so a recent development version (including http://openocd.zylin.com/#/c/4777)
must be built from source to be able to flash this board.

To flash this board, just use the following command:

```
make BOARD=nucleo-l4r5zi flash -C examples/hello-world
```

### STDIO

STDIO is available via the ST-Link programmer.

Use the `term` targed to open a terminal:

make BOARD=nucleo-l4r5zi -C examples/hello-world term

*/
176 changes: 176 additions & 0 deletions boards/nucleo-l4r5zi/include/periph_conf.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,176 @@
/*
* Copyright (C) 2018 Inria
*
* This file is subject to the terms and conditions of the GNU Lesser
* General Public License v2.1. See the file LICENSE in the top level
* directory for more details.
*/

/**
* @ingroup boards_nucleo144-l4r5
* @{
*
* @file
* @brief Peripheral MCU configuration for the nucleo-l4r5zi board
*
* @author Alexandre Abadie <alexandre.abadie@inria.fr>
*/

#ifndef PERIPH_CONF_H
#define PERIPH_CONF_H

#include "periph_cpu.h"
#include "cfg_i2c1_pb8_pb9.h"
#include "cfg_rtt_default.h"

#ifdef __cplusplus
extern "C" {
#endif

/**
* @name Clock system configuration
* @{
*/
/* 0: no external high speed crystal available
* else: actual crystal frequency [in Hz] */
#define CLOCK_HSE (0)

#ifndef CLOCK_LSE
/* 0: no external low speed crystal available,
* 1: external crystal available (always 32.768kHz) */
#define CLOCK_LSE (1)
#endif

/* 0: enable MSI only if HSE isn't available
* 1: always enable MSI (e.g. if USB or RNG is used)*/
#define CLOCK_MSI_ENABLE (1)

#ifndef CLOCK_MSI_LSE_PLL
/* 0: disable Hardware auto calibration with LSE
* 1: enable Hardware auto calibration with LSE (PLL-mode)
* Same as with CLOCK_LSE above this defaults to 0 because LSE is
* mandatory for MSI/LSE-trimming to work */
#define CLOCK_MSI_LSE_PLL (0)
#endif

/* give the target core clock (HCLK) frequency [in Hz], maximum: 120MHz */
#define CLOCK_CORECLOCK (120000000U)
/* PLL configuration: make sure your values are legit! */
#define CLOCK_PLL_M (6)
#define CLOCK_PLL_N (30)
#define CLOCK_PLL_R (2)
/* peripheral clock setup */
#define CLOCK_AHB_DIV RCC_CFGR_HPRE_DIV1
#define CLOCK_AHB (CLOCK_CORECLOCK / 1)
#define CLOCK_APB1_DIV RCC_CFGR_PPRE1_DIV4
#define CLOCK_APB1 (CLOCK_CORECLOCK / 4)
#define CLOCK_APB2_DIV RCC_CFGR_PPRE2_DIV2
#define CLOCK_APB2 (CLOCK_CORECLOCK / 2)
/** @} */

/**
* @name Timer configuration
* @{
*/
static const timer_conf_t timer_config[] = {
{
.dev = TIM5,
.max = 0xffffffff,
.rcc_mask = RCC_APB1ENR1_TIM5EN,
.bus = APB1,
.irqn = TIM5_IRQn
}
};

#define TIMER_0_ISR isr_tim5

#define TIMER_NUMOF (sizeof(timer_config) / sizeof(timer_config[0]))
/** @} */

/**
* @name UART configuration
* @{
*/
static const uart_conf_t uart_config[] = {
{
.dev = LPUART1,
.rcc_mask = RCC_APB1ENR2_LPUART1EN,
.rx_pin = GPIO_PIN(PORT_G, 8),
.tx_pin = GPIO_PIN(PORT_G, 7),
.rx_af = GPIO_AF8,
.tx_af = GPIO_AF8,
.bus = APB12,
.irqn = LPUART1_IRQn,
.type = STM32_LPUART,
.clk_src = 0,
},
{
.dev = USART3,
.rcc_mask = RCC_APB1ENR1_USART3EN,
.rx_pin = GPIO_PIN(PORT_D, 9),
.tx_pin = GPIO_PIN(PORT_D, 8),
.rx_af = GPIO_AF7,
.tx_af = GPIO_AF7,
.bus = APB1,
.irqn = USART3_IRQn,
.type = STM32_USART,
.clk_src = 0, /* Use APB clock */
#ifdef UART_USE_DMA
.dma_stream = 6,
.dma_chan = 4
#endif
}
};

#define UART_0_ISR (isr_lpuart1)
#define UART_1_ISR (isr_usart3)

#define UART_NUMOF (sizeof(uart_config) / sizeof(uart_config[0]))
/** @} */

/**
* @name SPI configuration
*
* @note The spi_divtable is auto-generated from
* `cpu/stm32_common/dist/spi_divtable/spi_divtable.c`
* @{
*/
static const uint8_t spi_divtable[2][5] = {
{ /* for APB1 @ 30000000Hz */
7, /* -> 117187Hz */
5, /* -> 468750Hz */
4, /* -> 937500Hz */
2, /* -> 3750000Hz */
1 /* -> 7500000Hz */
},
{ /* for APB2 @ 60000000Hz */
7, /* -> 234375Hz */
6, /* -> 468750Hz */
5, /* -> 937500Hz */
3, /* -> 3750000Hz */
2 /* -> 7500000Hz */
}
};

static const spi_conf_t spi_config[] = {
{
.dev = SPI1,
.mosi_pin = GPIO_PIN(PORT_A, 7),
.miso_pin = GPIO_PIN(PORT_A, 6),
.sclk_pin = GPIO_PIN(PORT_A, 5),
.cs_pin = GPIO_UNDEF,
.af = GPIO_AF5,
.rccmask = RCC_APB2ENR_SPI1EN,
.apbbus = APB2
}
};

#define SPI_NUMOF (sizeof(spi_config) / sizeof(spi_config[0]))
/** @} */

#ifdef __cplusplus
}
#endif

#endif /* PERIPH_CONF_H */
/** @} */
4 changes: 3 additions & 1 deletion cpu/stm32_common/stm32_mem_lengths.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RAM_START_ADDR ?= 0x20000000
# The next block takes care of setting the rigth lengths of RAM and ROM
# for the stm32 family. Most of the CPUs should have been taken into
# account here, so no need to assign the lengths per model.
STM32_INFO := $(shell printf '%s' '$(CPU_MODEL)' | tr 'a-z' 'A-Z' | sed -E -e 's/^STM32(F|L)(0|1|2|3|4|7)([0-9])([0-9])(.)(.)/\1 \2 \2\3\4 \3 \4 \5 \6/')
STM32_INFO := $(shell printf '%s' '$(CPU_MODEL)' | tr 'a-z' 'A-Z' | sed -E -e 's/^STM32(F|L)(0|1|2|3|4|7)([A-Z0-9])([0-9])(.)(.)/\1 \2 \2\3\4 \3 \4 \5 \6/')
STM32_TYPE := $(word 1, $(STM32_INFO))
STM32_FAMILY := $(word 2, $(STM32_INFO))
STM32_MODEL := $(word 3, $(STM32_INFO))
Expand Down Expand Up @@ -240,6 +240,8 @@ else ifeq ($(STM32_TYPE), L)
RAM_LEN = 160K
else ifeq ($(STM32_MODEL2), 9)
RAM_LEN = 320K
else ifeq ($(STM32_MODEL2), R)
RAM_LEN = 640K
endif
endif
endif
Expand Down
4 changes: 4 additions & 0 deletions cpu/stm32l4/include/cpu_conf.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
#include "vendor/stm32l433xx.h"
#elif defined(CPU_MODEL_STM32L452RE)
#include "vendor/stm32l452xx.h"
#elif defined(CPU_MODEL_STM32L4R5ZI)
#include "vendor/stm32l4r5xx.h"
#endif

#ifdef __cplusplus
Expand All @@ -52,6 +54,8 @@ extern "C" {
#define CPU_IRQ_NUMOF (83U)
#elif defined(CPU_MODEL_STM32L496ZG)
#define CPU_IRQ_NUMOF (91U)
#elif defined(CPU_MODEL_STM32L4R5ZI)
#define CPU_IRQ_NUMOF (95U)
#else
#define CPU_IRQ_NUMOF (82U)
#endif
Expand Down
Loading

0 comments on commit 14fe8f2

Please # to comment.