EFM32: fix weak PeripheralPins configuration #7491

DBS06 · 2018-07-12T08:57:58Z

Description

PR for Issue #7424 .
Making the configuration tables weakly defined to be overridable.
This would be needed for i.e. custom targets which uses different Pin-Profiles as default defined.

Pull request type

[ ] Fix
[X] Refactor
[ ] New target
[ ] Feature
[ ] Breaking change

cmonr

LGTM

cmonr · 2018-07-12T15:37:33Z

Will wait for @stevew817 to ack before starting CI.

stevew817

@DBS06 How soon do you want this on master? Can we wait with this until #7079 is merged and update the GG11 pinmaps through an update to this PR?

0xc0170 · 2018-07-13T11:29:59Z

targets/TARGET_Silicon_Labs/TARGET_EFM32/TARGET_EFM32GG/PeripheralPins.c

@@ -25,7 +25,7 @@

 /************ADC***************/
 /* The third "function" value is used to select the correct ADC channel */
-const PinMap PinMap_ADC[] = {
+const PinMap __attribute__((weak)) PinMap_ADC[] = {


use MBED_WEAK

stevew817 · 2018-07-16T09:11:00Z

#7079 was merged, so please rebase and apply the same change for EFM32GG11.

DBS06 · 2018-07-16T09:15:22Z

@stevew817 I can wait, right now it is not that urgent.

#7079 was merged, so please rebase and apply the same change for EFM32GG11.

I will do it asap

… overridable. See issue "ARMmbed#7424 (comment)"

DBS06 · 2018-07-16T09:54:43Z

@stevew817 I did the requested changes 😄

edit: I did the rebase to master but why does git thinks the "rebase commits" are new commits? Only the commit d1c313d8aff2aa4d89745380c3fb48010dedf0db is new...

stevew817

Thanks, I approve of the changes to the Silicon Labs part. However, to satisfy the mbed-os maintainers, you should take a look at the git rebase command instead of doing a merge. Rebasing your specific changes on top of master avoids all these superfluous commits in the PR log.

stevew817

Thanks, I approve of the changes to the Silicon Labs part. However, to satisfy the mbed-os maintainers, you should take a look at the git rebase command instead of doing a merge. Rebasing your specific changes on top of master avoids all these superfluous commits in the PR log.

stevew817 · 2018-07-16T10:01:02Z

@DBS06 If you can't get rebase to work, I'd suggest checking out a new feature branch based off of master, cherry-picking your commits to go on top, and force-pushing the 'clean' branch to your PR branch on github.

…idable for target EFM32GG11.

DBS06 · 2018-07-16T10:37:11Z

@stevew817 Cleaned my branch while my lunch getting cold 😄

stevew817 · 2018-07-16T12:05:26Z

Great! I wholeheartedly approve 👍

cmonr · 2018-07-16T13:30:18Z

@DBS06 I wouldn't want your dinner to get cold as well, but @0xc0170 comment still needs to be adressed ;)

DBS06 · 2018-07-16T13:33:43Z

@DBS06 I wouldn't want your dinner to get cold as well, but @0xc0170 comment still needs to be adressed ;)

Ah my fault didn't realized another change request...

DBS06 · 2018-07-16T13:39:18Z

@cmonr Done!

Comment addressed.

cmonr · 2018-07-16T13:57:52Z

/morph build

mbed-ci · 2018-07-16T15:33:37Z

Build : FAILURE

Build number : 2612
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7491/

stevew817 · 2018-07-16T15:41:36Z

Looks like MBED_WEAK needs to come before the type in a variable declaration, or mbed_toolchain.h is not part of the include chain.

DBS06 · 2018-07-16T17:29:22Z

Looks like MBED_WEAK needs to come before the type in a variable declaration, or mbed_toolchain.h is not part of the include chain.

@stevew817 #include "mbed_toolchain.h" was missing.
I added #include "mbed_toolchain.h" like they did it for the STM targets i.e. ./mbed-os\targets\TARGET_STM\TARGET_STM32L4\TARGET_STM32L476xG\TARGET_NUCLEO_L476RG\PeripheralPins.c

cmonr · 2018-07-16T18:36:28Z

/morph build

mbed-ci · 2018-07-16T19:34:57Z

Build : FAILURE

Build number : 2617
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7491/

0xc0170 · 2018-07-17T08:58:21Z

/morph build

mbed-ci · 2018-07-17T10:05:14Z

Build : SUCCESS

Build number : 2621
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7491/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

0xc0170 · 2018-07-17T12:48:33Z

/morph mbed2-build

0xc0170 · 2018-07-17T12:50:00Z

/morph export-build

mbed-ci · 2018-07-17T13:29:44Z

Test : SUCCESS

Build number : 2370
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/7491/2370

mbed-ci · 2018-07-17T14:32:50Z

Exporter Build : FAILURE

Build number : 2262
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/7491/

cmonr · 2018-07-18T03:21:38Z

/morph export-build

0xc0170 · 2018-07-18T14:57:03Z

/morph export-build

cmonr · 2018-07-19T14:54:36Z

/morph export-build

cmonr · 2018-07-20T01:45:13Z

/morph export-build

@0xc0170 This might need some special attention tomorrow...

0xc0170 · 2018-07-20T10:20:45Z

/morph export-build

mbed-ci · 2018-07-20T12:02:24Z

Exporter Build : SUCCESS

Build number : 2285
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/7491/

…pheralPins_overridable EFM32: fix weak PeripheralPins configuration

DBS06 mentioned this pull request Jul 12, 2018

EFM32 PeripheralPins.c #7424

Closed

cmonr requested a review from stevew817 July 12, 2018 15:36

cmonr approved these changes Jul 12, 2018

View reviewed changes

cmonr added the needs: review label Jul 12, 2018

stevew817 reviewed Jul 13, 2018

View reviewed changes

0xc0170 previously requested changes Jul 13, 2018

View reviewed changes

0xc0170 added needs: work and removed needs: review labels Jul 13, 2018

EFM32 Make PeripheralPins.c configuration tables weakly defined to be…

95d78df

… overridable. See issue "ARMmbed#7424 (comment)"

stevew817 approved these changes Jul 16, 2018

View reviewed changes

DBS06 force-pushed the feature/EFM32_make_PeripheralPins_overridable branch from d1c313d to 95d78df Compare July 16, 2018 10:30

Make PeripheralPins.c configuration tables weakly defined to be overr…

a8dcf52

…idable for target EFM32GG11.

Replace __attribute__((weak)) with MBED_WEAK

1658349

cmonr added needs: CI release-version: 5.9.4 and removed needs: work labels Jul 16, 2018

cmonr added needs: work and removed needs: CI labels Jul 16, 2018

Added missing include.

de266d8

cmonr added needs: CI and removed needs: work labels Jul 16, 2018

Place "MBED_WEAK" for IAR-Toolchain before the type.

804edd5

0xc0170 changed the title ~~EFM32 Make PeripheralPins.c configuration tables weakly defined to be…~~ EFM32: fix weak PeripheralPins configuration Jul 17, 2018

cmonr merged commit bb7b97c into ARMmbed:master Jul 20, 2018

0xc0170 removed the needs: CI label Jul 20, 2018

pan- pushed a commit to pan-/mbed that referenced this pull request Aug 22, 2018

Merge pull request ARMmbed#7491 from evva-sfw/feature/EFM32_make_Peri…

c7dd04c

…pheralPins_overridable EFM32: fix weak PeripheralPins configuration

EFM32: fix weak PeripheralPins configuration #7491

EFM32: fix weak PeripheralPins configuration #7491

Uh oh!

Conversation

DBS06 commented Jul 12, 2018

Description

Pull request type

Uh oh!

cmonr left a comment

Choose a reason for hiding this comment

Uh oh!

cmonr commented Jul 12, 2018

Uh oh!

stevew817 left a comment

Choose a reason for hiding this comment

Uh oh!

0xc0170 Jul 13, 2018

Choose a reason for hiding this comment

Uh oh!

stevew817 commented Jul 16, 2018

Uh oh!

DBS06 commented Jul 16, 2018

Uh oh!

DBS06 commented Jul 16, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

stevew817 left a comment

Choose a reason for hiding this comment

Uh oh!

stevew817 left a comment

Choose a reason for hiding this comment

Uh oh!

stevew817 commented Jul 16, 2018

Uh oh!

DBS06 commented Jul 16, 2018

Uh oh!

stevew817 commented Jul 16, 2018

Uh oh!

cmonr commented Jul 16, 2018

Uh oh!

DBS06 commented Jul 16, 2018

Uh oh!

DBS06 commented Jul 16, 2018

Uh oh!

cmonr commented Jul 16, 2018

Uh oh!

mbed-ci commented Jul 16, 2018

Build : FAILURE

Uh oh!

stevew817 commented Jul 16, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DBS06 commented Jul 16, 2018

Uh oh!

cmonr commented Jul 16, 2018

Uh oh!

mbed-ci commented Jul 16, 2018

Build : FAILURE

Uh oh!

0xc0170 commented Jul 17, 2018

Uh oh!

mbed-ci commented Jul 17, 2018

Build : SUCCESS

Triggering tests

Uh oh!

0xc0170 commented Jul 17, 2018

Uh oh!

0xc0170 commented Jul 17, 2018

Uh oh!

mbed-ci commented Jul 17, 2018

Test : SUCCESS

Uh oh!

mbed-ci commented Jul 17, 2018

Exporter Build : FAILURE

Uh oh!

cmonr commented Jul 18, 2018

Uh oh!

0xc0170 commented Jul 18, 2018

Uh oh!

cmonr commented Jul 19, 2018

DBS06 commented Jul 16, 2018 •

edited

Loading

stevew817 commented Jul 16, 2018 •

edited

Loading