Provide fix for IAR failure to feature-hal-spec-rtc branch #5447

mprse · 2017-11-07T10:53:18Z

Description

Update feature-hal-spec-rtc branch to master in order to provide fix for IAR failure (#5415).

Status

READY

Migrations

NO

Related PRs

List related PRs against other branches:

branch	PR
feature-hal-spec-rtc branch	https://github.com/ARMmbed/mbed-os/pull/5306

Keep the prototypes in rtc_api.h even when DEVICE_RTC is not defined. This allows devices that aren't fully compliant with the RTC API to still use the header and prototypes.

Keep the RTC code if either DEVICE_RTC or DEVICE_LOWPOWERTIMER is defined on the devices which use the RTC for both the rtc api and the low power timer api. This allows DEVICE_LOWPOWERTIMER to be enabled while DEVICE_RTC is turned off.

Add requirements, tests, an example implementation and additional function documentation to the HAL RTC API.

Turn off RTC for all devices. When support for a device is added this should be re-enabled.

RTC specification with test headers (branch feature-hal-spec-rtc)

0xc0170 · 2017-11-07T11:19:24Z

Why are the last 4 commits shown here, if they are already on the branch (see https://github.com/ARMmbed/mbed-os/commits/feature-hal-spec-rtc) ? they look like you rebased those (changed sha) .

mprse · 2017-11-07T12:36:27Z

Why are the last 4 commits shown here, if they are already on the branch (see https://github.com/ARMmbed/mbed-os/commits/feature-hal-spec-rtc) ? they look like you rebased those (changed sha) .

@0xc0170 Assuming that mprse:feature-hal-spec-rtc_fix_for_iar_failure is even with ARMmbed:feature-hal-spec-rtc I have used git rebase master command on mprse:feature-hal-spec-rtc_fix_for_iar_failure that is why sha of the existing commits have been changed. Commits from master have been included to mprse:feature-hal-spec-rtc_fix_for_iar_failure and existing commits have been moved on top with modified sha. If this solution is not acceptable, then I see the following alternatives:

PR from ARMmbed:master to ARMmbed:feature-hal-spec-rtc,
cherry pick only the commit with IAR fix - this should not change sha of existing commits.

What do you think?

0xc0170 · 2017-11-07T13:01:52Z

Ah that explains it, it was rebased. It should not be rebased as it's already in this repo as a branch and contains new commits, thus merge only.

Cherry-pick one comment would do the trick in this case, but we want to keep the branch up to date.

mprse · 2017-11-08T06:58:09Z

Merged master to feature branch.

0xc0170 · 2017-11-08T10:01:32Z

/morph build

mbed-ci · 2017-11-08T10:38:19Z

Build : FAILURE

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

mprse · 2017-11-08T10:50:46Z

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

Now we have some wifi issue on REALTEK_RTL8195AM:
[Error] mbed_config.h@60,90: 'WIFI_SSID' was not declared in this scope
[Error] mbed_config.h@60,101: 'WIFI_PASSWORD' was not declared in this scope
[Error] mbed_config.h@60,116: 'WIFI_SECURITY' was not declared in this scope
[Error] mbed_config.h@60,131: 'WIFI_CHANNEL' was not declared in this scope

0xc0170 · 2017-11-08T11:12:02Z

@mprse This was fixed 3 hours ago (was in the queue for CI thus was not picked up with this update yesterday). It is now on master (another build few mins after this one on master is green!). Can you please cherry-pick that one as well ?

…or_iar_failure

mprse · 2017-11-08T11:35:36Z

@mprse This was fixed 3 hours ago (was in the queue for CI thus was not picked up with this update yesterday). It is now on master (another build few mins after this one on master is green!). Can you please cherry-pick that one as well ?

Merged to the new master.

0xc0170 · 2017-11-08T11:37:50Z

/morph build

mbed-ci · 2017-11-08T12:24:35Z

Build : SUCCESS

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

Triggering tests

/morph test
/morph uvisor-test

mbed-ci · 2017-11-08T14:08:25Z

Test : SUCCESS

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

c1728p9 · 2017-11-08T16:48:10Z

Updating a feature branch by only merging master into it makes it hard to rebase in the future as we will need to do before merging these changes into master. @0xc0170 has strong feelings against rebasing the feature branch, so I'm proposing an alternative hybrid approach in #5460. @theotherjimmy @sg- @bulislaw

0xc0170 · 2017-11-08T17:00:42Z

Updating a feature branch by only merging master into makes it hard to rebase in the future as we will need to do before merging these changes into master. @0xc0170 has strong feelings against rebasing the feature branch, so I'm proposing an alternative hybrid approach in #5460. @theotherjimmy @sg- @bulislaw

cc @kjbracey-arm @SeppoTakalo who might have also suggestions for updating feature branches

sg- · 2017-11-08T17:39:11Z

Why are we not rebasing the feature branch on master? That is what we should be doing. PRs are only for board support of the feature or fixes to the feature.

mprse · 2017-11-09T06:40:32Z

I see that PR #5460 provides also these 4 commits which were already on the feature branch with modified hashes. This was my first approach and it was not acceptable since the hashes are changed.
Do we have some procedure for rebasing branch to master (to know how to do it properly in the future)?

Why are we not rebasing the feature branch on master? That is what we should be doing. PRs are only for board support of the feature or fixes to the feature.

This would have to be done by someone who has rights to perform changes on ARMmbed repository. I do not have, so it looks like PR is the only option.

0xc0170 · 2017-11-09T08:20:30Z

Do we have some procedure for rebasing branch to master (to know how to do it properly in the future)?

This branch will be updated later today @mprse , will let you know.

c1728p9 · 2017-11-09T21:45:47Z

feature-hal-spec-rtc rebased on master

c1728p9 and others added 5 commits October 25, 2017 17:16

Keep RTC API prototypes even when not enabled

690569f

Keep the prototypes in rtc_api.h even when DEVICE_RTC is not defined. This allows devices that aren't fully compliant with the RTC API to still use the header and prototypes.

Keep rtc code if low power timer is used

63cccd9

Keep the RTC code if either DEVICE_RTC or DEVICE_LOWPOWERTIMER is defined on the devices which use the RTC for both the rtc api and the low power timer api. This allows DEVICE_LOWPOWERTIMER to be enabled while DEVICE_RTC is turned off.

Add documentation and test the HAL RTC API

9244f70

Add requirements, tests, an example implementation and additional function documentation to the HAL RTC API.

Turn off RTC until updated

beb4ff3

Turn off RTC for all devices. When support for a device is added this should be re-enabled.

Merge pull request ARMmbed#5226 from c1728p9/rtc_specification_master_2

d312da9

RTC specification with test headers (branch feature-hal-spec-rtc)

mprse mentioned this pull request Nov 7, 2017

Update of RTC HAL API specification and tests. #5306

Merged

0xc0170 requested a review from c1728p9 November 7, 2017 11:17

mprse force-pushed the feature-hal-spec-rtc_fix_for_iar_failure branch from e901965 to c0f1c17 Compare November 7, 2017 13:10

Merge remote-tracking branch 'master' into feature-hal-spec-rtc_fix_f…

0068305

…or_iar_failure

mprse force-pushed the feature-hal-spec-rtc_fix_for_iar_failure branch from c0f1c17 to 0068305 Compare November 8, 2017 11:34

c1728p9 mentioned this pull request Nov 8, 2017

Rebase feature-hal-spec-rtc #5460

Closed

0xc0170 added the needs: review label Nov 9, 2017

c1728p9 force-pushed the feature-hal-spec-rtc branch from d312da9 to 5e6c46e Compare November 9, 2017 21:44

c1728p9 closed this Nov 9, 2017

sg- removed the needs: review label Nov 9, 2017

Provide fix for IAR failure to feature-hal-spec-rtc branch #5447

Provide fix for IAR failure to feature-hal-spec-rtc branch #5447

Uh oh!

Conversation

mprse commented Nov 7, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Status

Migrations

Related PRs

Uh oh!

0xc0170 commented Nov 7, 2017

Uh oh!

mprse commented Nov 7, 2017

Uh oh!

0xc0170 commented Nov 7, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mprse commented Nov 8, 2017

Uh oh!

0xc0170 commented Nov 8, 2017

Uh oh!

mbed-ci commented Nov 8, 2017

Build : FAILURE

Uh oh!

mprse commented Nov 8, 2017

Uh oh!

0xc0170 commented Nov 8, 2017

Uh oh!

mprse commented Nov 8, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0xc0170 commented Nov 8, 2017

Uh oh!

mbed-ci commented Nov 8, 2017

Build : SUCCESS

Triggering tests

Uh oh!

mbed-ci commented Nov 8, 2017

Test : SUCCESS

Uh oh!

c1728p9 commented Nov 8, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0xc0170 commented Nov 8, 2017

Uh oh!

sg- commented Nov 8, 2017

Uh oh!

mprse commented Nov 9, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0xc0170 commented Nov 9, 2017

Uh oh!

c1728p9 commented Nov 9, 2017

Uh oh!

Uh oh!

mprse commented Nov 7, 2017 •

edited

Loading

0xc0170 commented Nov 7, 2017 •

edited

Loading

mprse commented Nov 8, 2017 •

edited

Loading

c1728p9 commented Nov 8, 2017 •

edited

Loading

mprse commented Nov 9, 2017 •

edited

Loading