You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gn...@apache.org on 2020/01/02 15:40:15 UTC
[incubator-nuttx] 02/02: Merge remote-tracking branch
'origin/master' into dev
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 0fd35cb3f28d59c6f05ee6cc504c0ebee171cc99
Merge: f9c6eca 316675f
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Thu Jan 2 09:40:09 2020 -0600
Merge remote-tracking branch 'origin/master' into dev
arch/arm/include/stm32h7/chip.h | 7 +-
arch/arm/src/stm32/stm32_fmc.c | 24 +-
arch/arm/src/stm32/stm32_fmc.h | 12 +-
arch/arm/src/stm32h7/Kconfig | 19 +
arch/arm/src/stm32h7/Make.defs | 4 +
arch/arm/src/stm32h7/hardware/stm32_fmc.h | 390 +++++++++++++++++++++
arch/arm/src/stm32h7/hardware/stm32h7x3xx_pinmap.h | 224 ++++++------
arch/arm/src/stm32h7/stm32.h | 1 +
arch/arm/src/{stm32 => stm32h7}/stm32_fmc.c | 103 +++---
arch/arm/src/{stm32 => stm32h7}/stm32_fmc.h | 30 +-
10 files changed, 610 insertions(+), 204 deletions(-)