Skip to content

Target system - Inherit names from target parents #3578

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 2 commits into from
Jan 26, 2017
Merged

Target system - Inherit names from target parents #3578

merged 2 commits into from
Jan 26, 2017

Conversation

theotherjimmy
Copy link
Contributor

@theotherjimmy theotherjimmy commented Jan 12, 2017 •
edited by bridadan
Loading

Status

READY

Resolves #3129

Todos

  • Tests - /morph test

bridadan
bridadan approved these changes Jan 12, 2017
View reviewed changes
Copy link
Contributor

@bridadan bridadan left a comment

Choose a reason for hiding this comment

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

LGTM

@bridadan
Copy link
Contributor

/morph test

@mbed-bot
Copy link

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 1392

Build failed!

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 13, 2017

LPC4088_DM broke or was a glitch?

@theotherjimmy
Copy link
Contributor Author

@0xc0170 Definetly broke.

@theotherjimmy
Copy link
Contributor Author

theotherjimmy commented Jan 13, 2017 •
edited
Loading

it's including both:

  1. targets/TARGET_NXP/TARGET_LPC408X/TARGET_LPC4088_DM
  2. targets/TARGET_NXP/TARGET_LPC408X/TARGET_LPC4088

The files in those folders are almost identical.

@bridadan
Copy link
Contributor

Ah, the LPC4088_DM inherits from the LPC4088, but both are release targets! That's a no no!

They just need to be refactored so there is a different, shared MCU between the two. Something like this:

"MCU_LPC4088": {
    "inherits": ["LPCTarget"],
    "core": "Cortex-M4F",
    "extra_labels": ["NXP", "LPC408X"],
    "is_disk_virtual": true,
    "supported_toolchains": ["ARM", "GCC_CR", "GCC_ARM", "IAR"],
    "post_binary_hook": {
        "function": "LPC4088Code.binary_hook"
    },
    "device_has": ["ANALOGIN", "ANALOGOUT", "CAN", "DEBUG_AWARENESS", "ERROR_PATTERN", "ETHERNET", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"],
    "device_name": "LPC4088FBD144"
},
"LPC4088": {
    "inherits": ["MCU_LPC4088"],
    "release_versions": ["2", "5"]
},
"LPC4088_DM": {
    "inherits": ["MCU_LPC4088"],
    "release_versions": ["2", "5"]
}

That should do the trick I think.

@theotherjimmy
Copy link
Contributor Author

/morph test

bridadan
bridadan suggested changes Jan 17, 2017
View reviewed changes
targets/targets.json
@@ -336,7 +336,7 @@
"default_lib": "small",
"release_versions": ["2"]
},
"LPC4088": {
"MCU_PC4088": {
Copy link
Contributor

Choose a reason for hiding this comment

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

This should be MCU_LPC4088.

Also, you need to remove the "release_versions": ["2", "5"] line from MCU_LPC4088.

Copy link
Contributor

Choose a reason for hiding this comment

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

This is broken again :(

@mbed-bot
Copy link

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test

@0xc0170
Copy link
Contributor

0xc0170 commented Jan 19, 2017

@theotherjimmy bump

@theotherjimmy
Copy link
Contributor Author

yup. on it.

@theotherjimmy
Copy link
Contributor Author

Okay let's try this again

/morph test.

@bridadan
Copy link
Contributor

The bot didn't like the period at the end of your comment @theotherjimmy 😄

/morph test

@geky
Copy link
Contributor

geky commented Jan 19, 2017

/morph test?

@theotherjimmy
Copy link
Contributor Author

/morph test!

@mbed-bot
Copy link

Result: ABORTED

Your command has finished executing! Here's what you wrote!

/morph test

bridadan
bridadan suggested changes Jan 19, 2017
View reviewed changes
targets/targets.json
@@ -336,7 +336,7 @@
"default_lib": "small",
"release_versions": ["2"]
},
"LPC4088": {
"MCU_PC4088": {
Copy link
Contributor

Choose a reason for hiding this comment

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

This is broken again :(

@theotherjimmy
Copy link
Contributor Author

lol. Different machine different version of the codebase....

@theotherjimmy
Copy link
Contributor Author

@bridadan, want to run a test on this, or are the defaults enough?

@bridadan
Copy link
Contributor

bridadan commented Jan 20, 2017 •
edited
Loading

@theotherjimmy Yeah let's get a bot run on this sucker.

/morph test

@mbed-bot
Copy link

Result: SUCCESS

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 1438

All builds and test passed!

bridadan
bridadan approved these changes Jan 20, 2017
View reviewed changes
Copy link
Contributor

@bridadan bridadan left a comment

Choose a reason for hiding this comment

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

Huzzah, looks good!

@0xc0170 0xc0170 merged commit 25ba021 into ARMmbed:master Jan 26, 2017
aisair pushed a commit to aisair/mbed that referenced this pull request Apr 30, 2024
Release 135 of the mbed library
139db30 
Ports for Upcoming Targets

3571: DISCO_F769NI introduction ARMmbed/mbed-os#3571
3605: Add DELTA_DFCM_NNN50 platform ARMmbed/mbed-os#3605
3640: [MAX32630FTHR] Adding new platform ARMmbed/mbed-os#3640

Fixes and Changes

3397: Add uVisor support for the DISCO_F429ZI ARMmbed/mbed-os#3397
3573: fix failing RTC initialization for MTS_DRAGONFLY_F411RE ARMmbed/mbed-os#3573
3575: Dev stm factorize gpio ARMmbed/mbed-os#3575
3584: STM32: make PeripheralPins.h a common file ARMmbed/mbed-os#3584
3583: STM32F7 Cube FW new release v1.5.1 ARMmbed/mbed-os#3583
3578: Target system - Inherit names from target parents ARMmbed/mbed-os#3578
3599: K22F: Enable TRNG ARMmbed/mbed-os#3599
3614: STM32: make PortNames.h a common file ARMmbed/mbed-os#3614
3617: EFM32GG: Fix GCC_ARM linker script ARMmbed/mbed-os#3617
3618: STM32: Move types definitions to a common file ARMmbed/mbed-os#3618
3631: F3 CUBE update V1.7.0 ARMmbed/mbed-os#3631
3635: STM32 I2C : Fix bug in i2c_byte_read function ARMmbed/mbed-os#3635
3651: Max32630 - fix LED4 ARMmbed/mbed-os#3651
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bridadan bridadan bridadan approved these changes

Assignees
No one assigned
Labels
release-version: 5.3.4
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@theotherjimmy @bridadan @mbed-bot @0xc0170 @geky @adbridge