Skip to content

make: boards: refactor board makefiles#2852

Merged
haukepetersen merged 35 commits intoRIOT-OS:masterfrom
kaspar030:refactor_board_makefiles
May 26, 2015
Merged

make: boards: refactor board makefiles#2852
haukepetersen merged 35 commits intoRIOT-OS:masterfrom
kaspar030:refactor_board_makefiles

Conversation

@kaspar030
Copy link
Copy Markdown
Contributor

@kaspar030 kaspar030 commented Apr 22, 2015

They were mostly the same, so now they include common parts.
This is includes #2850.

Just looked at Cortex-M boards, excluding again the kinetis boards.

The changes are a little less trivial, but if "hello world" flashes and displays using make flash and make term, everything is fine.

Tested so far on:

  • airfy-beacon (nrf51822)
  • arduino-due (sam3x8e)
  • cc2538dk (cc2538)
  • f4vi1 (stm32f4)
  • fox (stm32f1)
  • iot-lab_M3 (stm32f1)
  • mbed_lpc1768 (lpc1768)
  • nucleo-f091 (stm32f0)
  • nucleo-f334 (stm32f3)
  • pca10000 (nrf51822)
  • pca10005 (nrf51822)
  • spark-core (stm32f1)
  • stm32f3discovery (stm32f3)
  • stm32f4discovery (stm32f4)
  • yunjia-nrf51822 (nrf51822)
  • msbiot (stm32f4)
  • nucleo-l1 (stm32l1)
  • openmote (cc2538)
  • samr21-xpro (samd21)
  • stm32f0discovery (stm32f0)
  • udoo (sam3x8e)

@kaspar030 kaspar030 added Type: enhancement The issue suggests enhanceable parts / The PR enhances parts of the codebase / documentation Impact: major The PR changes a significant part of the code base. It should be reviewed carefully Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation labels Apr 22, 2015
@kaspar030 kaspar030 mentioned this pull request Apr 22, 2015
Closed
20 tasks
@kaspar030
Copy link
Copy Markdown
Contributor Author

kaspar030 commented Apr 22, 2015

btw, this implicitly includes #2848.

Kijewski
Kijewski reviewed Apr 22, 2015
View reviewed changes
sys/newlib/syscalls.c Outdated
Copy link
Copy Markdown
Contributor

@Kijewski Kijewski Apr 22, 2015

Choose a reason for hiding this comment

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

Newlib calls itself Newlib (lowercase L)

Copy link
Copy Markdown
Contributor Author

@kaspar030 kaspar030 Apr 22, 2015

Choose a reason for hiding this comment

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

yup

@kaspar030
Copy link
Copy Markdown
Contributor Author

kaspar030 commented Apr 22, 2015

arduino due fixed, works now

@kaspar030
Copy link
Copy Markdown
Contributor Author

kaspar030 commented Apr 22, 2015

addressed @Kijewski's comments

@kaspar030
Copy link
Copy Markdown
Contributor Author

kaspar030 commented Apr 22, 2015

should I split the cpu + board specific commits in seperate PR's? I'm afraid we'll never test all these boards...

@haukepetersen
Copy link
Copy Markdown
Contributor

haukepetersen commented Apr 23, 2015

no, lets leave it in one PR, its fast to test (I will start now to test every board I have flying around here...)

@haukepetersen
Copy link
Copy Markdown
Contributor

haukepetersen commented Apr 23, 2015

samr21-xpro does not build.

@haukepetersen
Copy link
Copy Markdown
Contributor

haukepetersen commented Apr 23, 2015

udoo seems to be broken.

@kaspar030
Copy link
Copy Markdown
Contributor Author

kaspar030 commented Apr 24, 2015

SAMR21 should be building now. I had left that out before because of the gpio issues caused by -Os.

@kaspar030
Copy link
Copy Markdown
Contributor Author

kaspar030 commented Apr 24, 2015

udoo seems to be broken.

Hm, I don't have a board...

@LudwigKnuepfer LudwigKnuepfer added the State: waiting for other PR State: The PR requires another PR to be merged first label Apr 24, 2015
This was referenced Apr 24, 2015
Closed
Merged
@kaspar030 kaspar030 force-pushed the refactor_board_makefiles branch from a60095c to db3cfc4 Compare April 27, 2015 13:38
@PeterKietzmann PeterKietzmann mentioned this pull request Apr 28, 2015
Merged
@OlegHahm OlegHahm modified the milestone: Release 2015.06 Apr 29, 2015
@kaspar030
Copy link
Copy Markdown
Contributor Author

kaspar030 commented May 3, 2015

Does anyone have these boards and can test?

  • udoo (seems broken, can't fix without board)
  • openmote
  • stm32f0discovery
  • msbiot
  • cc2538dk
  • samr21-xpro
  • nucleo-l1

@haukepetersen
Copy link
Copy Markdown
Contributor

haukepetersen commented May 5, 2015

I have all besides the cc2538dk and the nucleo-l1 available somewhere. But can't promise when I will get to testing them.

@kaspar030 kaspar030 added the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label May 7, 2015
@kaspar030 kaspar030 force-pushed the refactor_board_makefiles branch from db3cfc4 to 0a15ebf Compare May 8, 2015 18:59
@kaspar030
Copy link
Copy Markdown
Contributor Author

kaspar030 commented May 8, 2015

  • rebased

@OlegHahm
Copy link
Copy Markdown
Member

OlegHahm commented May 8, 2015

What's the state of this PR?

kaspar030 added 21 commits May 26, 2015 10:46
@kaspar030
board: arduino-due: adapt to common board Makefile
b16a3b3
@kaspar030
board: cc2538dk: adapt to common board Makefile
61ce881
@kaspar030
board: f4vi1: adapt to common board Makefile
e691fc6
@kaspar030
board: fox: adapt to common board Makefile
e450631
@kaspar030
board: iot-lab_M3: adapt to common board Makefile
16d9842
@kaspar030
board: mbed_lpc1768: adapt to common board Makefile
401f417
@kaspar030
board: msbiot: adapt to common board Makefile
2acfedc
@kaspar030
board: nucleo-f091: adapt to common board Makefile
71b6c32
@kaspar030
board: nucleo-f334: adapt to common board Makefile
d31166f
@kaspar030
board: nucleo-l1: adapt to common board Makefile
4a7e5ff
@kaspar030
board: openmote: adapt to common board Makefile
0fb0638
@kaspar030
board: pca10000: adapt to common board Makefile
acba05c
@kaspar030
board: pca10005: adapt to common board Makefile
4a59247
@kaspar030
board: samr21-xpro: adapt to common board Makefile
107be41
@kaspar030
board: spark-core: adapt to common board Makefile
7168708
@kaspar030
board: stm32f0discovery: adapt to common board Makefile
70b9df6
@kaspar030
board: stm32f3discovery: adapt to common board Makefile
5d894f9
@kaspar030
board: stm32f4discovery: adapt to common board Makefile
cff8f22
@kaspar030
board: udoo: adapt to common board Makefile
dac9dd4
@kaspar030
board: yunjia-nrf51822: adapt to common board Makefile
625497e
@kaspar030
make: move cpu specific CFLAGS into cpu makefile
302699e
@kaspar030 kaspar030 force-pushed the refactor_board_makefiles branch from 80cfec1 to 302699e Compare May 26, 2015 08:47
@kaspar030
Copy link
Copy Markdown
Contributor Author

kaspar030 commented May 26, 2015

I think I got it. The CFLAGS_FPU where never actually evaluated as the board makefile was included before the cpu makefile, but board would only set the option if the CPU has set CORTEX before. I moved the check into the common CPU makefile. Let's see what travis says.

@haukepetersen
Copy link
Copy Markdown
Contributor

haukepetersen commented May 26, 2015

ACK and go.

haukepetersen added a commit that referenced this pull request May 26, 2015
@haukepetersen
Merge pull request #2852 from kaspar030/refactor_board_makefiles
9e273be 
make: boards: refactor board makefiles
@haukepetersen haukepetersen merged commit 9e273be into RIOT-OS:master May 26, 2015
This was referenced May 26, 2015
Merged
Closed
@jfischer-no jfischer-no mentioned this pull request May 27, 2015
Merged
@kaspar030 kaspar030 deleted the refactor_board_makefiles branch February 7, 2017 22:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@haukepetersen haukepetersen

Labels

Impact: major The PR changes a significant part of the code base. It should be reviewed carefully 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 2015.09

Development

Successfully merging this pull request may close these issues.

6 participants

@kaspar030 @haukepetersen @OlegHahm @hexluthor @LudwigKnuepfer @Kijewski