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

Renesas: fix cmsis lib build #5770

Merged
merged 5 commits into from Jan 2, 2018

Conversation

Projects
None yet
4 participants
@0xc0170
Member

0xc0170 commented Dec 31, 2017

device header file not needed in cmsis implementation, thus removed - causing problems to build cmsis lib in mbed 2

another fix is for renesas target code that implements os tick, should only be available if rtos is present

Tested locally with GCC ARM

@ARMmbed/team-renesas please verify this patch

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Dec 31, 2017

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Dec 31, 2017

@0xc0170 0xc0170 requested a review from bulislaw Dec 31, 2017

@@ -24,8 +24,6 @@

#include <stddef.h>

#include <cmsis.h>

This comment has been minimized.

@0xc0170

0xc0170 Dec 31, 2017

Member

Need to fix this, it has real dependency on the target header file (to get gic present macro in), thus I'll look at cmsis build api, and propose a solution)

@0xc0170 0xc0170 added needs: work and removed needs: review labels Dec 31, 2017

@0xc0170 0xc0170 force-pushed the 0xc0170:fix_rza1h branch from 63f6edd to 658336a Dec 31, 2017

renesas: os tick only for rtos
As this is os tick implementation for rtos, it should not be compilied if rtos
not present (mbed 2)

@0xc0170 0xc0170 force-pushed the 0xc0170:fix_rza1h branch from 658336a to b5f20b2 Dec 31, 2017

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Jan 1, 2018

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Jan 1, 2018

Build : SUCCESS

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

Triggering tests

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

@0xc0170 0xc0170 force-pushed the 0xc0170:fix_rza1h branch from 7145f42 to 9609262 Jan 1, 2018

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@0xc0170 0xc0170 force-pushed the 0xc0170:fix_rza1h branch from 9609262 to def7f9d Jan 2, 2018

@0xc0170 0xc0170 changed the title from Renesas: fix cmsis device header and os tick target implementation to Renesas: fix cmsis lib build Jan 2, 2018

@0xc0170 0xc0170 requested review from theotherjimmy and adbridge Jan 2, 2018

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Jan 2, 2018

I fixed also VK RZ A1H (added to travis to find all those errors there, so both renesas targets are in travis now, should help us).

Waiting for travis, this PR should fix Cortex A mbed 2 errors we have seen. The main change here is cmsis build for mbed 2 (in build_api). cmsis now contains target dependencies in some cases (they include it via RTE components). For instance in our case it was for Cortex A to get GIC presence (see https://github.com/ARMmbed/mbed-os/blob/master/cmsis/TARGET_CORTEX_A/irq_ctrl_gic.c#L31), that one is defined in targets cmsis header file.
To fix this, I moved cmsis lib to be along with hal (previously cmsis, then common headers and hal), how it is common headers, hal + cmsis, etc) in the mbed libs API (the change is minimal, and only affects mbed lib build). The diff is not that obvious here but if you compare those lines you will see that only compile line changed (https://github.com/ARMmbed/mbed-os/pull/5770/files#diff-8ae3dde46b55f3a922724cd3585922b2R1031), the rest there is few lines moved (lines 1002-1014)

@adbridge

Minor formatting

{"target": "RZ_A1H",
"toolchains": "GCC_ARM",
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
}

This comment has been minimized.

@adbridge

adbridge Jan 2, 2018

Contributor

NIT: extra space

"toolchains": "GCC_ARM",
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
}
},

This comment has been minimized.

@adbridge

adbridge Jan 2, 2018

Contributor

NIT: extra space

{"target": "VK_RZ_A1H",
"toolchains": "GCC_ARM",
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
}

This comment has been minimized.

@adbridge

adbridge Jan 2, 2018

Contributor

NIT: extra space

This comment has been minimized.

@0xc0170

0xc0170 Jan 2, 2018

Member

Once travis finishes I can fix these, I used formatting that was in the file (many of the lines have this).

"toolchains": "GCC_ARM",
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
}
}

This comment has been minimized.

@adbridge

adbridge Jan 2, 2018

Contributor

NIT: extra space

@0xc0170 0xc0170 force-pushed the 0xc0170:fix_rza1h branch from 5aa7a09 to e56b1d9 Jan 2, 2018

0xc0170 added some commits Dec 31, 2017

Travis: add RZ_A1H target
Travis: dsp only for cortex-m
tools: cmsis and hal are build together
Build api used to build cmsis separately (how mbed 2 is being build). This is
currently not how cmsis is being defined. As there target dependencies in some
cases, we should include paths from targets when building cmsis
@adbridge

This comment has been minimized.

Contributor

adbridge commented Jan 2, 2018

Additional updates look good to me.

VK RZ A1H: remove target from mbed 2 release
As it does not share the codebase with RZ A1H, it needs to be disabled until
bring it up to date with the latest changes to cmsis. There are changes
regarding caches, mmu and others

@0xc0170 0xc0170 force-pushed the 0xc0170:fix_rza1h branch from e56b1d9 to a8fc394 Jan 2, 2018

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Jan 2, 2018

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Jan 2, 2018

Build : SUCCESS

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

Triggering tests

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

@mbed-ci

This comment has been minimized.

@0xc0170 0xc0170 added needs: CI and removed needs: work labels Jan 2, 2018

@mbed-ci

This comment has been minimized.

@adbridge adbridge merged commit c832515 into ARMmbed:master Jan 2, 2018

18 checks passed

AWS-CI uVisor Build & Test Verification build successful.
Details
ci-morph-build build completed
Details
ci-morph-exporter build completed
Details
ci-morph-test test completed
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/events Local events testing has passed
Details
travis-ci/littlefs Local littlefs testing has passed
Details
travis-ci/mbed2-ATMEL Local mbed2-ATMEL testing has passed
Details
travis-ci/mbed2-MAXIM Local mbed2-MAXIM testing has passed
Details
travis-ci/mbed2-NORDIC Local mbed2-NORDIC testing has passed
Details
travis-ci/mbed2-NUVOTON Local mbed2-NUVOTON testing has passed
Details
travis-ci/mbed2-NXP Local mbed2-NXP testing has passed
Details
travis-ci/mbed2-RENESAS Local mbed2-RENESAS testing has passed
Details
travis-ci/mbed2-SILICON_LABS Local mbed2-SILICON_LABS testing has passed
Details
travis-ci/mbed2-STM Local mbed2-STM testing has passed
Details
travis-ci/tools Local tools testing has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment