Merge remote-tracking branch 'origin/master' into ieee802154 (c8f64757) · Commits · f4grx / NuttX RTOS · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

NuttX RTOS
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

c8f64757

Commit c8f64757 authored 7 years ago by Gregory Nutt

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/master' into ieee802154

parents 38914441 5245cbc6

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

arch/arm/src/samv7/sam_twihs.c 41 additions, 25 deletions

arch/arm/src/samv7/sam_twihs.c
arch/arm/src/stm32/chip/stm32_flash.h 4 additions, 0 deletions

arch/arm/src/stm32/chip/stm32_flash.h
arch/arm/src/stm32/chip/stm32f40xxx_pinmap.h 1 addition, 1 deletion

arch/arm/src/stm32/chip/stm32f40xxx_pinmap.h
arch/arm/src/stm32/stm32_flash.c 83 additions, 0 deletions

arch/arm/src/stm32/stm32_flash.c
arch/arm/src/stm32/stm32_i2s.c 2 additions, 2 deletions

arch/arm/src/stm32/stm32_i2s.c
configs/stm32f4discovery/include/board.h 3 additions, 10 deletions

configs/stm32f4discovery/include/board.h

with 134 additions and 38 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment