-
Notifications
You must be signed in to change notification settings - Fork 3k
Add ARM_MUSCA_A1 target #9221
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
Add ARM_MUSCA_A1 target #9221
Changes from all commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
ff1c769
Add ARM_MUSCA_A1 as a new target platform
79976e0
Update storage mbed_lib.json for MUSCA_A1_S
a5fd917
Update target license headers
36a8514
Add documentation on Musca-A1 signing key
96268d9
Updates after rebase
0701fb1
Move us_ticker.c to NS side
b8745b8
Build PS tests only if FLASHIAP exists
cebf30a
Increase secure heap size to 0x4000
71683cb
Fix secure linker script
84bde31
Increase Secure RAM by 4K
c83ef8a
Add license files
1a182df
Add serial_tx_pinmap() and serial_rx_pinmap() to serial_api.c
ef9c272
Fix PinMap_UART_XX
0fc629c
MUSCA_A1_NS: Add IAR support
bde2557
Update secure binaries for ARM_MUSCA_A1_S
40627a5
Fix last issues
gaborkertesz 67905bd
Use build directory in postbuild
a115c93
gpio: indent fix
0xc0170 fee07dc
ARM_SSG: mbed_rtx remove empty line
0xc0170 ed29d64
CR changes
6348753
Update secure binaries
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -34,6 +34,9 @@ | |
}, | ||
"LPC55S69_S": { | ||
"storage_type": "TDB_INTERNAL" | ||
}, | ||
"ARM_MUSCA_A1_S": { | ||
"storage_type": "TDB_INTERNAL" | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
Unless specifically indicated otherwise in a file, MUSCA_A1 files in this directory are licensed under the BSD-3-Clause license, | ||
as can be found in: LICENSE-bsd-3-clause.txt |
26 changes: 26 additions & 0 deletions
26
targets/TARGET_ARM_SSG/TARGET_MUSCA_A1/LICENSE-BSD-3-Clause
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
Copyright 2019 Arm Limited and affiliates. | ||
SPDX-License-Identifier: BSD-3-Clause | ||
|
||
Redistribution and use in source and binary forms, with or without | ||
modification, are permitted provided that the following conditions are met: | ||
|
||
1. Redistributions of source code must retain the above copyright | ||
notice, this list of conditions and the following disclaimer. | ||
2. Redistributions in binary form must reproduce the above copyright | ||
notice, this list of conditions and the following disclaimer in the | ||
documentation and/or other materials provided with the distribution. | ||
3. Neither the name of the copyright holder nor the | ||
names of its contributors may be used to endorse or promote products | ||
derived from this software without specific prior written permission. | ||
|
||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\" | ||
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
POSSIBILITY OF SUCH DAMAGE. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
/* mbed Microcontroller Library | ||
* Copyright (c) 2019 Arm Limited | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#ifndef MBED_PERIPHERALNAMES_H | ||
#define MBED_PERIPHERALNAMES_H | ||
|
||
#include "cmsis.h" | ||
|
||
#ifdef __cplusplus | ||
extern "C" { | ||
#endif | ||
|
||
typedef enum { | ||
PORTNUM_0 = 0 | ||
} PortName; | ||
|
||
typedef enum { | ||
UART_0 = 0, | ||
UART_1 | ||
} UARTName; | ||
|
||
#define STDIO_UART_TX UART1_TX | ||
#define STDIO_UART_RX UART1_RX | ||
#define STDIO_UART UART_1 | ||
|
||
#define USBTX STDIO_UART_TX | ||
#define USBRX STDIO_UART_RX | ||
|
||
#ifdef __cplusplus | ||
} | ||
#endif | ||
|
||
#endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,112 @@ | ||
/* mbed Microcontroller Library | ||
* Copyright (c) 2019 Arm Limited | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#ifndef MBED_PINNAMES_H | ||
#define MBED_PINNAMES_H | ||
|
||
#include "cmsis.h" | ||
|
||
#ifdef __cplusplus | ||
extern "C" { | ||
#endif | ||
|
||
typedef enum { | ||
PIN_INPUT, | ||
PIN_OUTPUT | ||
} PinDirection; | ||
|
||
typedef enum { | ||
PA0 = 0, | ||
PA1 = 1, | ||
PA2 = 2, | ||
PA3 = 3, | ||
PA4 = 4, | ||
PA5 = 5, | ||
PA6 = 6, | ||
PA7 = 7, | ||
PA8 = 8, | ||
PA9 = 9, | ||
PA10 = 10, | ||
PA11 = 11, | ||
PA12 = 12, | ||
PA13 = 13, | ||
PA14 = 14, | ||
PA15 = 15, | ||
PA16 = 16, | ||
PA17 = 17, | ||
PA18 = 18, | ||
PA19 = 19, | ||
PA20 = 20, | ||
PA21 = 21, | ||
PA22 = 22, | ||
PA23 = 23, | ||
PA24 = 24, | ||
PA25 = 25, | ||
|
||
/* Arduino Connector Namings */ | ||
D0 = PA0, | ||
D1 = PA1, | ||
D2 = PA2, | ||
D3 = PA3, | ||
D4 = PA4, | ||
D5 = PA5, | ||
D6 = PA6, | ||
D7 = PA7, | ||
D8 = PA8, | ||
D9 = PA9, | ||
D10 = PA10, | ||
D11 = PA11, | ||
D12 = PA12, | ||
D13 = PA13, | ||
D14 = PA14, | ||
D15 = PA15, | ||
|
||
/* UART pins */ | ||
UART0_RX = PA0, /* Alternate Function - 1 */ | ||
UART0_TX = PA1, /* Alternate Function - 1 */ | ||
UART1_RX = PA16, | ||
UART1_TX = PA17, | ||
|
||
LED1 = PA2, | ||
LED2 = PA3, | ||
LED3 = PA4, | ||
|
||
/* Not connected */ | ||
NC = (int)0xFFFFFFFF | ||
} PinName; | ||
|
||
typedef enum { | ||
PRIMARY_FUNC = 0, | ||
ALTERNATE_FUNC_1 = 1, | ||
ALTERNATE_FUNC_2 = 2, | ||
ALTERNATE_FUNC_3 = 3 | ||
} PinFunction; | ||
|
||
typedef enum { | ||
PullNone = 0, | ||
PullUp, | ||
PullDown, | ||
PullDefault = PullNone | ||
} PinMode; | ||
|
||
#ifdef __cplusplus | ||
} | ||
#endif | ||
|
||
#endif | ||
|
64 changes: 64 additions & 0 deletions
64
...ets/TARGET_ARM_SSG/TARGET_MUSCA_A1/TARGET_MUSCA_A1_NS/device/TOOLCHAIN_ARMC6/musca_ns.sct
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,64 @@ | ||
#! armclang --target=arm-arm-none-eabi -march=armv8-m.main -E -xc | ||
|
||
/* | ||
* Copyright (c) 2019 ARM Limited | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#include "../../../partition/region_defs.h" | ||
#include "../cmsis_nvic.h" | ||
|
||
#if !defined(MBED_ROM_START) | ||
#define MBED_ROM_START NS_CODE_START // 0x000a0400 | ||
#endif | ||
|
||
#if !defined(MBED_ROM_SIZE) | ||
#define MBED_ROM_SIZE NS_CODE_SIZE // 0x5f800 | ||
#endif | ||
|
||
#if !defined(MBED_RAM_START) | ||
#define MBED_RAM_START NS_DATA_START | ||
#endif | ||
|
||
#if !defined(MBED_RAM_SIZE) | ||
#define MBED_RAM_SIZE NS_DATA_SIZE | ||
#endif | ||
|
||
#define VECTOR_SIZE NVIC_RAM_VECTOR_SIZE | ||
|
||
#if !defined(MBED_BOOT_STACK_SIZE) | ||
#define MBED_BOOT_STACK_SIZE 0x400 | ||
#endif | ||
|
||
#define RAM_FIXED_SIZE (MBED_BOOT_STACK_SIZE+VECTOR_SIZE) | ||
|
||
LR_CODE MBED_ROM_START MBED_ROM_SIZE { | ||
ER_CODE MBED_ROM_START MBED_ROM_SIZE { | ||
*.o (VECTOR +First) | ||
.ANY (+RO) | ||
} | ||
|
||
RW_IRAM1 (MBED_RAM_START+VECTOR_SIZE) (MBED_RAM_SIZE-VECTOR_SIZE) { | ||
* (+RW) ; RW data that gets copied from Flash to SRAM | ||
* (+ZI) ; ZI data that gets initialised to zero in SRAM | ||
} | ||
|
||
ARM_LIB_HEAP AlignExpr(+0, 16) EMPTY (MBED_RAM_SIZE-RAM_FIXED_SIZE+MBED_RAM_START-AlignExpr(ImageLimit(RW_IRAM1), 16)) { | ||
} | ||
|
||
ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -MBED_BOOT_STACK_SIZE { ; stack | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't the
its (internal trusted storage)
tests be wrapped with#if COMPONENT_FLASHIAP
instead ofps
(external protected storage)?@orenc17 suggestion?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
in MUSCA A1 we dont have access to the flash for NS
protected storage is set to use flash storage on the non-secure domain
this is a workaround for this board