Skip to content

RTOS - Move per-target RTX config to mbed_rtx.h #2586

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

Merged
merged 1 commit into from
Sep 23, 2016

Conversation

tung7970
Copy link
Contributor

Disintegrate global RTX target config. Move per-target fragment
to mbed_rtx.h under each vendor's directory.

Right now, only one mbed_rtx.h is defined for each vendor, but the granularity of mbed_rtx.h can be per-chip, or per-board if necessary.

@tung7970 tung7970 force-pushed the feature-rtx-config branch 2 times, most recently from 06dfd18 to 8bcde6b Compare August 31, 2016 03:05
@sg-
Copy link
Contributor

sg- commented Sep 9, 2016

This is great! Why are there json changes for MTS targets in the change set?

@sg- sg- added the needs: work label Sep 9, 2016
@sg-
Copy link
Contributor

sg- commented Sep 9, 2016

@tung7970 please rebase

@tung7970
Copy link
Contributor Author

A couple of MTS boards set OS_CLOCK through targets.json file. Move that to mbed_rtx.h so all related config stay at the same place.

Commit is rebased and pushed upstream. Thanks.

@tung7970
Copy link
Contributor Author

Rebased again for disco_f769ni and NUC472 merges.

@sg-
Copy link
Contributor

sg- commented Sep 11, 2016

@c1728p9 please review

@c1728p9
Copy link
Contributor

c1728p9 commented Sep 11, 2016

This looks good to me!

@c1728p9
Copy link
Contributor

c1728p9 commented Sep 12, 2016

/morph test

@c1728p9
Copy link
Contributor

c1728p9 commented Sep 12, 2016

@mbed-bot: TEST

HOST_OSES=ALL
BUILD_TOOLCHAINS=ALL
TARGETS=ALL

@mbed-bot
Copy link

[Build 912]
FAILURE: Something went wrong when building and testing.

@bridadan
Copy link
Contributor

@mbed-bot: TEST

HOST_OSES=ALL
BUILD_TOOLCHAINS=ALL
TARGETS=ALL

@mbed-bot
Copy link

Result: FAILURE

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

/morph test

Output

mbed Build Number: 837

Build failed!

@bridadan
Copy link
Contributor

Log from the build failure (note that I've shortened some of the output):

12:44:11 Build failures:
12:44:11   * NUMAKER_PFM_NUC472::ARM::MBED-BUILD
12:44:11         Building library mbed-build (NUMAKER_PFM_NUC472, ARM)
12:44:11         Scan: 507
12:44:11         Scan: FEATURE_BLE
12:44:11         Scan: FEATURE_CLIENT
12:44:11         Scan: FEATURE_COMMON_PAL
12:44:11         Scan: FEATURE_UVISOR
12:44:11         Scan: FEATURE_IPV4
12:44:11         Scan: FEATURE_IPV6
12:44:11         Scan: FEATURE_STORAGE
12:44:11         Copy: greentea_serial.h
12:44:11         Copy: test_env.h
12:44:11         Copy: unity.h
12:44:11         Copy: unity_config.h
[... SNIP ...]
12:44:11         Compile: HAL_CM.c
12:44:11         Compile: nu_modutil.c
12:44:11         Compile: RTX_Conf_CM.c
12:44:11         [Error] RTX_CM_lib.h@395,0:  #35: #error directive: "no target defined"

The target NUMAKER_PFM_NUC472 is failing to build for ARM, GCC_ARM, and IAR

@mbed-bot
Copy link

[Build 916]
FAILURE: Something went wrong when building and testing.

@tung7970
Copy link
Contributor Author

NUC472 defines HEAP_START and HEAP_SIZE directly. Modified target test to check for INITIAL_SP or HEAP_START.

@tung7970
Copy link
Contributor Author

Rebased for TARGET_STM32F030R8 RTOS support removal.

@tung7970
Copy link
Contributor Author

Rebased for TARGET_UBLOX_C029 merge.

@tung7970
Copy link
Contributor Author

Did a quick fix by moving the target check after ICCARM sets the HEAP_START.

@sg- sg- added needs: CI and removed needs: work labels Sep 17, 2016
@sg-
Copy link
Contributor

sg- commented Sep 17, 2016

/morph test

@mbed-bot
Copy link

Result: SUCCESS

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

/morph test

Output

mbed Build Number: 886

All builds and test passed!

@sg-
Copy link
Contributor

sg- commented Sep 17, 2016

@mbed-bot: TEST

HOST_OSES=ALL
BUILD_TOOLCHAINS=ALL
TARGETS=ALL

@mbed-bot
Copy link

[Build 943]
FAILURE: Something went wrong when building and testing.

@sg-
Copy link
Contributor

sg- commented Sep 18, 2016

@mbed-bot: TEST

HOST_OSES=ALL
BUILD_TOOLCHAINS=ALL
TARGETS=ALL

@mbed-bot
Copy link

[Build 946]
SUCCESS: Building succeeded and tests were run! Be sure to check the test results

@sg-
Copy link
Contributor

sg- commented Sep 18, 2016

@tung7970 Can you rebase and resolve the conflicts. Ready to come in after that.

@tung7970
Copy link
Contributor Author

Rebased and pushed. Thanks.

Copy link
Contributor

@0xc0170 0xc0170 left a comment

Choose a reason for hiding this comment

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

Nitpick: preprocessor directives should start at the beginning (see coding guide)

Other than that, good work !

@tung7970 tung7970 force-pushed the feature-rtx-config branch 3 times, most recently from edc851b to ef5a590 Compare September 20, 2016 09:22
@tung7970
Copy link
Contributor Author

Thanks for the reminder. Pushed a new commit with leading spaces removed.

@sg-
Copy link
Contributor

sg- commented Sep 22, 2016

@tung7970 Can you rebase and resolve the conflicts. Ready to come in after that. Last time :)

Disintegrate global RTX target config. Move per-target fragment
to mbed_rtx.h under each vendor's directory.

One mbed_rtx.h is defined for each vendor at this moment, however,
the granularity of mbed_rtx.h can be per-chip, or per-board
if necessary.

Signed-off-by: Tony Wu <[email protected]>
@tung7970
Copy link
Contributor Author

Rebased and pushed. Thanks.

@0xc0170
Copy link
Contributor

0xc0170 commented Sep 22, 2016

/morph test

@mbed-bot
Copy link

Result: SUCCESS

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

/morph test

Output

mbed Build Number: 924

All builds and test passed!

@sg- sg- merged commit f0c00bf into ARMmbed:master Sep 23, 2016
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.

7 participants