Skip to content
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.

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

Removed Toshiba targets (AdBun-M066, M3H6 & M3HQ). #12746

Merged
merged 1 commit into from
Apr 17, 2020
Merged

Removed Toshiba targets (AdBun-M066, M3H6 & M3HQ). #12746

merged 1 commit into from
Apr 17, 2020

Conversation

deepak-shreshti
Copy link
Contributor

@deepak-shreshti deepak-shreshti commented Apr 2, 2020

Removed below Toshiba targets from the mbed-os github:-

AdBun-M066

Removed from targets.json

mbed-os/targets/targets.json

Lines 12900 to 12941 in 5d64e55

"TMPM066": {
"inherits": [
"Target"
],
"core": "Cortex-M0",
"is_disk_virtual": true,
"extra_labels": [
"TOSHIBA"
],
"macros": [
"__TMPM066__",
"CMSIS_VECTAB_VIRTUAL",
"CMSIS_VECTAB_VIRTUAL_HEADER_FILE=\"cmsis_nvic.h\""
],
"supported_toolchains": [
"GCC_ARM",
"ARM",
"IAR"
],
"device_has": [
"USTICKER",
"ANALOGIN",
"INTERRUPTIN",
"PORTIN",
"PORTINOUT",
"PORTOUT",
"RESET_REASON",
"SERIAL",
"SLEEP",
"I2C",
"I2CSLAVE",
"STDIO_MESSAGES",
"PWMOUT"
],
"device_name": "TMPM066FWUG",
"detect_code": [
"7011"
],
"release_versions": [
"5"
]
},

Deleted directory

https://github.com/ARMmbed/mbed-os/tree/master/targets/TARGET_TOSHIBA/TARGET_TMPM066

Removed from mbed_rtx.h

#if defined(TARGET_TMPM066)
#ifndef INITIAL_SP
#define INITIAL_SP (0x20004000UL)
#endif
#ifdef MBED_CONF_RTOS_MAIN_THREAD_STACK_SIZE
#undef MBED_CONF_RTOS_MAIN_THREAD_STACK_SIZE
#endif
#define MBED_CONF_RTOS_MAIN_THREAD_STACK_SIZE 3072
#endif

AdBun-M3H6

Removed from targets.json

mbed-os/targets/targets.json

Lines 13465 to 13507 in 5d64e55

"TMPM3H6": {
"inherits": [
"Target"
],
"core": "Cortex-M3",
"is_disk_virtual": true,
"extra_labels": [
"TOSHIBA"
],
"macros": [
"__TMPM3H6__"
],
"supported_toolchains": [
"GCC_ARM",
"ARM",
"IAR"
],
"device_has": [
"USTICKER",
"ANALOGIN",
"ANALOGOUT",
"INTERRUPTIN",
"PORTIN",
"PORTINOUT",
"PORTOUT",
"PWMOUT",
"RESET_REASON",
"SERIAL",
"SLEEP",
"SPI",
"I2C",
"I2CSLAVE",
"STDIO_MESSAGES",
"MPU"
],
"device_name": "TMPM3H6FWFG",
"detect_code": [
"7012"
],
"release_versions": [
"5"
]
},

Deleted directory

https://github.com/ARMmbed/mbed-os/tree/master/targets/TARGET_TOSHIBA/TARGET_TMPM3H6

Removed from mbed_rtx.h

#if defined(TARGET_TMPM3H6)
#ifndef INITIAL_SP
#define INITIAL_SP (0x20004000UL)
#endif
#endif

AdBun-M3HQ

Removed from targets.json

mbed-os/targets/targets.json

Lines 14159 to 14208 in 5d64e55

"TMPM3HQ": {
"inherits": [
"Target"
],
"core": "Cortex-M3",
"is_disk_virtual": true,
"extra_labels": [
"TOSHIBA"
],
"macros": [
"__TMPM3HQ__"
],
"supported_toolchains": [
"GCC_ARM",
"ARM",
"IAR"
],
"device_has": [
"USTICKER",
"ANALOGIN",
"ANALOGOUT",
"CRC",
"INTERRUPTIN",
"PORTIN",
"PORTINOUT",
"PORTOUT",
"PWMOUT",
"RESET_REASON",
"RTC",
"SERIAL",
"SERIAL_FC",
"SLEEP",
"SPI",
"SPI_ASYNCH",
"SPISLAVE",
"I2C",
"I2C_ASYNCH",
"I2CSLAVE",
"STDIO_MESSAGES",
"FLASH",
"MPU"
],
"device_name": "TMPM3HQFDFG",
"detect_code": [
"7014"
],
"release_versions": [
"5"
]
},

Deleted directory

https://github.com/ARMmbed/mbed-os/tree/master/targets/TARGET_TOSHIBA/TARGET_TMPM3HQ

Removed from mbed_rtx.h

#if defined(TARGET_TMPM3HQ)
#ifndef INITIAL_SP
#define INITIAL_SP (0x20010000UL)
#endif
#endif

Summary of changes

Impact of changes

These targets are now removed from Mbed OS 6:

AdBun-M066
AdBun-M3H6
AdBun-M3HQ

Migration actions required

Use previous Mbed OS 5.x version for these targets.

Documentation

None

Not needed for target removal like this.


Pull request type

[X] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results

[X] No Tests required for this change (E.g docs only update)
[] Covered by existing mbed-os tests (Greentea or Unittest)
[] Tests / results supplied as part of this PR

Reviewers


@ciarmcom ciarmcom requested a review from a team April 2, 2020 13:00
@ciarmcom
Copy link
Member

ciarmcom commented Apr 2, 2020

@deepak-shreshti, thank you for your changes.
@ARMmbed/mbed-os-maintainers please review.

0xc0170
0xc0170 previously approved these changes Apr 2, 2020
MarceloSalazar
MarceloSalazar previously approved these changes Apr 2, 2020
@0xc0170
Copy link
Contributor

0xc0170 commented Apr 5, 2020

CI started

@mbed-ci
Copy link

mbed-ci commented Apr 6, 2020

Test run: FAILED

Summary: 1 of 6 test jobs failed
Build number : 1
Build artifacts

Failed test jobs:

  • jenkins-ci/mbed-os-ci_greentea-test

@mergify
Copy link

mergify bot commented Apr 14, 2020

This PR cannot be merged due to conflicts. Please rebase to resolve them.

2 similar comments
@mergify
Copy link

mergify bot commented Apr 14, 2020

This PR cannot be merged due to conflicts. Please rebase to resolve them.

@mergify
Copy link

mergify bot commented Apr 14, 2020

This PR cannot be merged due to conflicts. Please rebase to resolve them.

@0xc0170
Copy link
Contributor

0xc0170 commented Apr 14, 2020

@deepak-shreshti Can you please rebase ? There was a big clean up merge today , we will restart CI and this should be integrated soon. Thanks

@mergify mergify bot dismissed stale reviews from 0xc0170 and MarceloSalazar April 14, 2020 10:06

Pull request has been modified.

@deepak-shreshti
Copy link
Contributor Author

Hi @0xc0170 , Rebased with master and resolved the conflict.

@mergify
Copy link

mergify bot commented Apr 16, 2020

This PR cannot be merged due to conflicts. Please rebase to resolve them.

@0xc0170
Copy link
Contributor

0xc0170 commented Apr 16, 2020

@deepak-shreshti Thanks, unfortunately there were other changes (there are more than usual changes to targets.json this week), please rebase. I'll keep this opened to start CI right away to get it in

targets/targets.json Outdated Show resolved Hide resolved
@deepak-shreshti
Copy link
Contributor Author

@deepak-shreshti Thanks, unfortunately there were other changes (there are more than usual changes to targets.json this week), please rebase. I'll keep this opened to start CI right away to get it in

Hi @0xc0170, Thanks for the review, rebased and resolved the conflict with the master.

@0xc0170
Copy link
Contributor

0xc0170 commented Apr 17, 2020

CI started

@mbed-ci
Copy link

mbed-ci commented Apr 17, 2020

Test run: SUCCESS

Summary: 6 of 6 test jobs passed
Build number : 2
Build artifacts

@0xc0170 0xc0170 merged commit 4f7abe9 into ARMmbed:master Apr 17, 2020
@mergify mergify bot removed the ready for merge label Apr 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants