Skip to content

Feature-emac combined merge #6936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 10 commits into from
May 20, 2018
Merged

Feature-emac combined merge #6936

merged 10 commits into from
May 20, 2018

Conversation

kjbracey
Copy link
Contributor

@kjbracey kjbracey commented May 17, 2018 •
edited
Loading

Description

Pull in 2 EMAC drivers and 1 lwIP/test fix into feature-emac

Combines 3 approved PRs:

#6810 has some extra fixes applied, as discussed on its PR

Pull request type

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

@kjbracey
Copy link
Contributor Author

/morph build

@mbed-ci
Copy link

mbed-ci commented May 17, 2018

Build : FAILURE

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

@kjbracey
Copy link
Contributor Author

/morph build

1 similar comment
@kjbracey
Copy link
Contributor Author

/morph build

@mmahadevan108
LPC546XX: Add ENET support
ffb5ce5 
Signed-off-by: Mahesh Mahadevan <[email protected]>
@mmahadevan108
Add memory configuration for LPC546XX
fa72cde 
Signed-off-by: Mahesh Mahadevan <[email protected]>
@mbed-ci
Copy link

mbed-ci commented May 17, 2018

Build : FAILURE

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

@kjbracey kjbracey force-pushed the feature-emac-17May-merge branch from f5fa927 to f447e2e Compare May 17, 2018 13:23
@kjbracey
Copy link
Contributor Author

Just had to re-edit #6904 - incorrect case in some includes which we missed on Windows compilation

Removed EMAC get default instance from EMAC tests
3320497 
Test environment now uses the EMAC defined by add ethernet interface.
@kjbracey kjbracey force-pushed the feature-emac-17May-merge branch from 6aa3a73 to 76aec1f Compare May 18, 2018 06:51
@kjbracey kjbracey mentioned this pull request May 18, 2018
Merged
kjbracey and others added 3 commits May 18, 2018 11:54
@kjbracey
LPC546XX: Correct Ethernet MAC address write
ba31be0 
Patch to LPC546XX SDK code - write the low Ethernet MAC address
register last, as that synchronises the update.

Without this change, the ENET_SetMacAddr call only seems to work prior
to MAC initialisation, causing problems for the new mbed OS EMAC system,
which expects it to be changable later.

Updated emac greentea tests #6851.
@kjbracey
LPC546XX: Correct Ethernet length calculations
39db644 
Subtract 4 from the received packet length - the buffer contains the
CRC, which we shouldn't pass up.

Ensure we allocate receive buffers of a size corresponding to the
rounded-up size we tell the hardware - the hardware was overrunning the
allocation by a couple of bytes.
WIFI_EMAC class renamed to OdinWiFiEMAC, Formatting
19d84a5 
Revert "in ODIN emac initialization required before connection"
@kjbracey kjbracey force-pushed the feature-emac-17May-merge branch from 76aec1f to 93d35eb Compare May 18, 2018 09:31
@kjbracey kjbracey mentioned this pull request May 18, 2018
Closed
@kjbracey kjbracey force-pushed the feature-emac-17May-merge branch from 93d35eb to 3cc5a95 Compare May 18, 2018 10:14
@kjbracey
Copy link
Contributor Author

/morph build

Asif Rizwan and others added 2 commits May 18, 2018 17:30
WiFi EMAC class name reflected in WiFi drivers binaries
a907278
@kjbracey
Merge branches 'pr6941', 'pr6810' and 'pr6913' into feature-emac-17Ma…
78e6748 
…y-merge

* pr6941:
  Removed EMAC get default instance from EMAC tests

* pr6810:
  LPC546XX: Correct Ethernet length calculations
  LPC546XX: Correct Ethernet MAC address write
  Add memory configuration for LPC546XX
  LPC546XX: Add ENET support

* pr6913:
  WiFi EMAC class name reflected in WiFi drivers binaries
  WIFI_EMAC class renamed to OdinWiFiEMAC, Formatting Revert "in ODIN emac initialization required before connection"
  in ODIN emac initialization required before connection
  EMAC adaption added, updated ODIN drivers to v2.5.0 RC1
@kjbracey kjbracey force-pushed the feature-emac-17May-merge branch from 3cc5a95 to 78e6748 Compare May 18, 2018 12:36
@kjbracey kjbracey mentioned this pull request May 18, 2018
Closed
@mbed-ci
Copy link

mbed-ci commented May 18, 2018

Build : FAILURE

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

@kjbracey
Copy link
Contributor Author

/morph build

@maclobdell
Copy link
Contributor

@kjbracey-arm Thanks a lot! Nice work!

@mbed-ci
Copy link

mbed-ci commented May 18, 2018

Build : SUCCESS

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

Triggering tests

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

@mbed-ci
Copy link

mbed-ci commented May 18, 2018

Test : FAILURE

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

@mbed-ci
Copy link

mbed-ci commented May 19, 2018

Exporter Build : SUCCESS

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

@0xc0170
Copy link
Contributor

0xc0170 commented May 19, 2018

/morph test

@mbed-ci
Copy link

mbed-ci commented May 19, 2018

Test : FAILURE

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

@0xc0170
Copy link
Contributor

0xc0170 commented May 20, 2018

/morph test

@mbed-ci
Copy link

mbed-ci commented May 20, 2018

Test : SUCCESS

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

@0xc0170 0xc0170 merged commit 76639b9 into feature-emac May 20, 2018
@kjbracey kjbracey deleted the feature-emac-17May-merge branch May 21, 2018 09:18
@kjbracey
Copy link
Contributor Author

This really wanted to be merged in rather than rebased - would have correctly marked all the member PRs merged. I'll clear up manually.

@kjbracey kjbracey mentioned this pull request May 21, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@kjbracey @mbed-ci @maclobdell @0xc0170 @mmahadevan108