Skip to content

boards/stm32-based: use shared configuration snippets#8549

Merged
aabadie merged 4 commits intoRIOT-OS:masterfrom
haukepetersen:opt_boards_stm32-clk-f4-180
Jun 12, 2018
Merged

boards/stm32-based: use shared configuration snippets#8549
aabadie merged 4 commits intoRIOT-OS:masterfrom
haukepetersen:opt_boards_stm32-clk-f4-180

Conversation

@haukepetersen
Copy link
Copy Markdown
Contributor

@haukepetersen haukepetersen commented Feb 13, 2018

Contribution description

This is another change cut from #8044 to reduce the vast code duplication in the (STM32) board configurations.

Presented in this PR in my idea for using shared configuration snippets in the board's periph_conf.h files. This is demonstrated so far only for some selected stm32f4-based boards, and focused on their clock configuration only. Once we agree for this approach, we can optimize the configuration for more STM32-based boards, in small, easily revieweable steps...

Issues/PRs references

continuation of merging #8044 in small steps...

@haukepetersen haukepetersen changed the title Opt boards stm32 clk f4 180 boards/stm32-based: use shared configuration snippets Feb 13, 2018
@haukepetersen haukepetersen added Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Area: boards Area: Board ports labels Feb 13, 2018
vincent-d
vincent-d requested changes Feb 13, 2018
View reviewed changes
Copy link
Copy Markdown
Member

@vincent-d vincent-d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like the idea! And it looks quite good except the missing include. I unfortunately don't have any of theses board to test it.

boards/nucleo144-f429/include/periph_conf.h
#define PERIPH_CONF_H

#include "periph_cpu.h"
#include "f4/cfg_clock_168_8_1.h"
Copy link
Copy Markdown
Member

@vincent-d vincent-d Feb 13, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing #include "cfg_spi_divtable.h"

Copy link
Copy Markdown
Contributor Author

@haukepetersen haukepetersen Feb 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ups, will fix

@haukepetersen
Copy link
Copy Markdown
Contributor Author

haukepetersen commented Mar 2, 2018

fixed missing include

@haukepetersen
Copy link
Copy Markdown
Contributor Author

haukepetersen commented Mar 2, 2018

also fixed header guards

@haukepetersen haukepetersen mentioned this pull request Mar 2, 2018
Closed
vincent-d
vincent-d approved these changes Mar 12, 2018
View reviewed changes
Copy link
Copy Markdown
Member

@vincent-d vincent-d left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Untested ACK (I don't have any of these boards). Please squash

@haukepetersen haukepetersen force-pushed the opt_boards_stm32-clk-f4-180 branch from c54c43e to b7fbecf Compare April 6, 2018 13:56
@haukepetersen
Copy link
Copy Markdown
Contributor Author

haukepetersen commented Apr 6, 2018

rebased

@haukepetersen
Copy link
Copy Markdown
Contributor Author

haukepetersen commented Apr 6, 2018

and squashed...

@vincent-d vincent-d added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels May 22, 2018
vincent-d
vincent-d reviewed May 22, 2018
View reviewed changes
boards/common/stm32/include/cfg_spi_divtable.h Outdated
* @author Hauke Petersen <[email protected]>
*/

#ifndef PERIPH_CFG_SPI_DIVTABLE_H
Copy link
Copy Markdown
Member

@vincent-d vincent-d May 22, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This header guard is still wrong according to Murdock

@haukepetersen haukepetersen force-pushed the opt_boards_stm32-clk-f4-180 branch from b7fbecf to 079f3c0 Compare May 24, 2018 17:01
@haukepetersen
Copy link
Copy Markdown
Contributor Author

haukepetersen commented May 24, 2018

fixed the header guard issue (squashed right in) and rebased.

@haukepetersen
Copy link
Copy Markdown
Contributor Author

haukepetersen commented Jun 7, 2018

@vincent-d would you mind to give this one last look and press the big green button?! Thanks!

@vincent-d
Copy link
Copy Markdown
Member

vincent-d commented Jun 11, 2018

I'm OK to merge if nobody objects (is there any potential conflict with i2c refactoring?) @aabadie @dylad ?

@dylad
Copy link
Copy Markdown
Member

dylad commented Jun 11, 2018

It may introduces some conflicts with the I2C refactoring. @aabadie will be able to confirm it better than me.

@aabadie
Copy link
Copy Markdown
Contributor

aabadie commented Jun 11, 2018

is there any potential conflict with i2c refactoring?

I don't know, it needs to be confirmed locally first I would say.

@vincent-d
Copy link
Copy Markdown
Member

vincent-d commented Jun 12, 2018

I tried to merge #9202 and this one in master and there is no conflicts, so I guess we can merge. @aabadie ?

@aabadie
Copy link
Copy Markdown
Contributor

aabadie commented Jun 12, 2018

I tried to merge #9202 and this one in master and there is no conflicts, so I guess we can merge.

Let's go then :)

@aabadie aabadie merged commit d8c3e1d into RIOT-OS:master Jun 12, 2018
@aabadie aabadie mentioned this pull request Jun 12, 2018
Merged
@aabadie aabadie mentioned this pull request Jun 28, 2018
Merged
@cladmi cladmi added this to the Release 2018.07 milestone Jul 10, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@vincent-d vincent-d vincent-d approved these changes

Assignees

@vincent-d vincent-d

@aabadie aabadie

@kaspar030 kaspar030

Labels

Area: boards Area: Board ports CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation

Projects

None yet

Milestone

Release 2018.07

Development

Successfully merging this pull request may close these issues.

6 participants

@haukepetersen @vincent-d @dylad @aabadie @cladmi @kaspar030