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:13 UTC
[incubator-nuttx] branch dev updated (d534341 -> 0fd35cb)
This is an automated email from the ASF dual-hosted git repository.
gnutt pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from d534341 Minor fix (#23)
add 098dadc net: tcp: Fix compile error in tcp.h
add bec1153 Merge pull request #21 from masayuki2009/fix_tcp_h
new f9c6eca Merge branch 'dev' of github.com:apache/incubator-nuttx into dev
add 02b652c Minor fix (#23)
add 6e7c761 net: tcp: Fix compile error in tcp.h
add 2388373 Squashed commit of the following:
add 316675f Merge branch 'master' of github.com:apache/incubator-nuttx
new 0fd35cb Merge remote-tracking branch 'origin/master' into dev
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 +
.../src/{stm32f7 => stm32h7/hardware}/stm32_fmc.h | 26 ++-
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 ++-
net/tcp/tcp.h | 2 +-
11 files changed, 241 insertions(+), 211 deletions(-)
copy arch/arm/src/{stm32f7 => stm32h7/hardware}/stm32_fmc.h (95%)
copy arch/arm/src/{stm32 => stm32h7}/stm32_fmc.c (77%)
copy arch/arm/src/{stm32 => stm32h7}/stm32_fmc.h (89%)
[incubator-nuttx] 02/02: Merge remote-tracking branch
'origin/master' into dev
Posted by gn...@apache.org.
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(-)
[incubator-nuttx] 01/02: Merge branch 'dev' of
github.com:apache/incubator-nuttx into dev
Posted by gn...@apache.org.
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 f9c6eca3d27092b4886b137d5dcd1b7f3c7066d8
Merge: bec1153 d534341
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Thu Jan 2 09:34:43 2020 -0600
Merge branch 'dev' of github.com:apache/incubator-nuttx into dev
net/ieee802154/ieee802154_input.c | 4 ++--
net/local/local_netpoll.c | 1 +
net/tcp/tcp_netpoll.c | 2 +-
net/udp/udp_netpoll.c | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)