Skip to content

cpu: unified cortex-m[034]_common implementations#3023

Merged
jnohlgard merged 8 commits intoRIOT-OS:masterfrom
haukepetersen:opt_cortexm
May 29, 2015
Merged

cpu: unified cortex-m[034]_common implementations#3023
jnohlgard merged 8 commits intoRIOT-OS:masterfrom
haukepetersen:opt_cortexm

Conversation

@haukepetersen
Copy link
Copy Markdown
Contributor

and the cleanup continues...

EDIT
I did not touch all CPUs yet, as I want to wait for #2852 to be merged.
#2852 was merged.

Tested with one CPU from each Cortex family, the STM32F0 (M0), SAMD21 (M0+), STM32F1 (M3) STM32F3 & STM32F4 (both M4F).

@haukepetersen haukepetersen added Platform: ARM Platform: This PR/issue effects ARM-based platforms Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation labels May 18, 2015
@haukepetersen haukepetersen added this to the Release 2015.06 milestone May 18, 2015
@kaspar030
Copy link
Copy Markdown
Contributor

nice one!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Delete this change, you can reapply parts of #3016 to save on manual work.

@jnohlgard
Copy link
Copy Markdown
Member

I think this is a step in the right direction for better maintainability.

@haukepetersen
Copy link
Copy Markdown
Contributor Author

fixed tab issues

@OlegHahm OlegHahm 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 19, 2015
@haukepetersen
Copy link
Copy Markdown
Contributor Author

here we go. This PR should now work for every cortex-based board.

@haukepetersen haukepetersen added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label May 26, 2015
@haukepetersen
Copy link
Copy Markdown
Contributor Author

EDIT
rebased on #3076 and adjusted the saml21-xpro

@haukepetersen
Copy link
Copy Markdown
Contributor Author

rebased again.

@haukepetersen
Copy link
Copy Markdown
Contributor Author

Could someone test and ack this, @PeterKietzmann, @kaspar030, @gebart, @OlegHahm? Otherwise it's building up a lot of dependecies... Thx!

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

you could leave the 2014 in there, i.e. 2014-2015

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Actually, I think you MUST.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

that was new to me. will fix it.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

@jnohlgard
Copy link
Copy Markdown
Member

Update all the copyrights to include the entire time span in years year-now, e.g. 2014-2015

@jnohlgard
Copy link
Copy Markdown
Member

haukepetersen@ba9d259 commit message sepllnig: doxygen

@jnohlgard
Copy link
Copy Markdown
Member

I opened a PR at haukepetersen#8 for some minor improvements to the selection of toolchain prefixes. I plan on merging the Clang stuff from Mulle into cortex-m common later, but the PR is just a small preparation to make sure that all platforms follow the same pattern in the Makefile variables.

@haukepetersen
Copy link
Copy Markdown
Contributor Author

fixed the copyrights, fixed the miss-spelled commit message and merged @gebarts fixes.

@jnohlgard
Copy link
Copy Markdown
Member

ACK, please squash, go when Travis is happy.

@haukepetersen haukepetersen force-pushed the opt_cortexm branch 2 times, most recently from 64b3ce8 to 880c8a4 Compare May 28, 2015 13:17
@haukepetersen
Copy link
Copy Markdown
Contributor Author

suqashed and rebased. Go Travis, go.

@haukepetersen haukepetersen removed the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label May 28, 2015
@jnohlgard
Copy link
Copy Markdown
Member

Needs rebase...

@haukepetersen
Copy link
Copy Markdown
Contributor Author

again?! Dammit...

@haukepetersen
Copy link
Copy Markdown
Contributor Author

rebased.

haukepetersen and others added 8 commits May 28, 2015 19:30
- removed coretx-m[0|3|4]
- moved their content to cortexm_common
- adjusted cortex Makefiles to this new name
- adjusted cortex Makefiles new structure
- changed naming of cortexm_common in makefiles
- included some minor cleanups
GDB can be built as multitarget which can debug multiple architectures
and is often installed without a target prefix.
@jnohlgard
Copy link
Copy Markdown
Member

I'm running a compile test locally on my machine

@jnohlgard
Copy link
Copy Markdown
Member

compile tests went fine on my machine

@PeterKietzmann
Copy link
Copy Markdown
Member

ping

@jnohlgard
Copy link
Copy Markdown
Member

ACK holds, & go

jnohlgard pushed a commit that referenced this pull request May 29, 2015
cpu: unified cortex-m[034]_common implementations
@jnohlgard jnohlgard merged commit cbe10e1 into RIOT-OS:master May 29, 2015
@haukepetersen haukepetersen deleted the opt_cortexm branch May 29, 2015 08:24
@jfischer-no
Copy link
Copy Markdown
Contributor

🎆

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Platform: ARM Platform: This PR/issue effects ARM-based platforms Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants