mirror of https://github.com/ARMmbed/mbed-os.git
Remove: ARM_MUSCA_A1 support
ARM_MUSCA_A1 is not supported since Mbed OS 6.0 Refer: https://github.com/ARMmbed/mbed-os/pull/13165 Therefore remove files from kv_config and TF-M post binary hook script.pull/14333/head
Vikas Katariya
Lingkai Dong
parent
ef9ed987bc
commit
8648e4f4d6
|
|
@ -38,9 +38,6 @@
|
||||||
"LPC55S69_S": {
|
"LPC55S69_S": {
|
||||||
"storage_type": "TDB_INTERNAL"
|
"storage_type": "TDB_INTERNAL"
|
||||||
},
|
},
|
||||||
"ARM_MUSCA_A1_S": {
|
|
||||||
"storage_type": "TDB_INTERNAL"
|
|
||||||
},
|
|
||||||
"ARM_MUSCA_B1_S": {
|
"ARM_MUSCA_B1_S": {
|
||||||
"storage_type": "TDB_INTERNAL"
|
"storage_type": "TDB_INTERNAL"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -23,10 +23,6 @@
|
||||||
"internal_size": "2*FLASH_SECTOR_SIZE",
|
"internal_size": "2*FLASH_SECTOR_SIZE",
|
||||||
"internal_base_address": "0x080C0000"
|
"internal_base_address": "0x080C0000"
|
||||||
},
|
},
|
||||||
"ARM_MUSCA_A1_S": {
|
|
||||||
"internal_size": "0x8000",
|
|
||||||
"internal_base_address": "0x00420000"
|
|
||||||
},
|
|
||||||
"ARM_MUSCA_B1_S": {
|
"ARM_MUSCA_B1_S": {
|
||||||
"internal_size": "0x8000",
|
"internal_size": "0x8000",
|
||||||
"internal_base_address": "0x10000000"
|
"internal_base_address": "0x10000000"
|
||||||
|
|
|
||||||
|
|
@ -1,91 +0,0 @@
|
||||||
#!/usr/bin/python
|
|
||||||
# Copyright (c) 2017-2020 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.
|
|
||||||
|
|
||||||
import os
|
|
||||||
from os.path import abspath, basename, dirname, splitext, isdir
|
|
||||||
from os.path import join as path_join
|
|
||||||
import re
|
|
||||||
from argparse import Namespace
|
|
||||||
from tools.psa.tfm.bin_utils.assemble import Assembly
|
|
||||||
from tools.psa.tfm.bin_utils.imgtool import do_sign
|
|
||||||
from tools.psa.tfm.bin_utils.imgtool_lib import version
|
|
||||||
|
|
||||||
SCRIPT_DIR = dirname(abspath(__file__))
|
|
||||||
MBED_OS_ROOT = abspath(path_join(SCRIPT_DIR, os.pardir, os.pardir))
|
|
||||||
MUSCA_A1_BASE = path_join(MBED_OS_ROOT, 'targets', 'TARGET_ARM_SSG', 'TARGET_MUSCA_A1')
|
|
||||||
|
|
||||||
|
|
||||||
def musca_tfm_bin(t_self, non_secure_bin, secure_bin):
|
|
||||||
|
|
||||||
assert os.path.isfile(secure_bin)
|
|
||||||
assert os.path.isfile(non_secure_bin)
|
|
||||||
|
|
||||||
build_dir = dirname(non_secure_bin)
|
|
||||||
tempdir = path_join(build_dir, 'temp')
|
|
||||||
if not isdir(tempdir):
|
|
||||||
os.makedirs(tempdir)
|
|
||||||
flash_layout = path_join(MUSCA_A1_BASE, 'partition', 'flash_layout.h')
|
|
||||||
mcuboot_bin = path_join(MUSCA_A1_BASE, 'mcuboot.bin')
|
|
||||||
image_macros = path_join(MUSCA_A1_BASE, 'partition', 'image_macros_preprocessed.c')
|
|
||||||
ns_bin_name, ns_bin_ext = splitext(basename(non_secure_bin))
|
|
||||||
concatenated_bin = path_join(tempdir, 'tfm_' + ns_bin_name + ns_bin_ext)
|
|
||||||
signed_bin = path_join(tempdir, 'tfm_' + ns_bin_name + '_signed' + ns_bin_ext)
|
|
||||||
|
|
||||||
assert os.path.isfile(image_macros)
|
|
||||||
|
|
||||||
#1. Concatenate secure TFM and non-secure mbed binaries
|
|
||||||
output = Assembly(image_macros, concatenated_bin)
|
|
||||||
output.add_image(secure_bin, "SECURE")
|
|
||||||
output.add_image(non_secure_bin, "NON_SECURE")
|
|
||||||
|
|
||||||
#2. Run imgtool to sign the concatenated binary
|
|
||||||
sign_args = Namespace(
|
|
||||||
layout=image_macros,
|
|
||||||
key=path_join(SCRIPT_DIR, 'musca_a1-root-rsa-3072.pem'),
|
|
||||||
public_key_format=None,
|
|
||||||
align=1,
|
|
||||||
dependencies=None,
|
|
||||||
version=version.decode_version('1.0'),
|
|
||||||
header_size=0x400,
|
|
||||||
pad=0x100000,
|
|
||||||
security_counter=None,
|
|
||||||
rsa_pkcs1_15=False,
|
|
||||||
included_header=False,
|
|
||||||
infile=concatenated_bin,
|
|
||||||
outfile=signed_bin
|
|
||||||
)
|
|
||||||
do_sign(sign_args)
|
|
||||||
|
|
||||||
#3. Concatenate mcuboot and signed binary and overwrite mbed built binary file
|
|
||||||
mcuboot_image_size = find_bl2_size(flash_layout)
|
|
||||||
with open(mcuboot_bin, "rb") as mcuboot_fh, open(signed_bin, "rb") as signed_fh:
|
|
||||||
with open(non_secure_bin, "w+b") as out_fh:
|
|
||||||
out_fh.write(mcuboot_fh.read())
|
|
||||||
out_fh.seek(mcuboot_image_size)
|
|
||||||
out_fh.write(signed_fh.read())
|
|
||||||
|
|
||||||
|
|
||||||
def find_bl2_size(configFile):
|
|
||||||
bl2_size_re = re.compile(r"^#define\s+FLASH_AREA_BL2_SIZE\s+\({0,1}(0x[0-9a-fA-F]+)\){0,1}")
|
|
||||||
bl2_size = None
|
|
||||||
with open(configFile, 'r') as flash_layout_file:
|
|
||||||
for line in flash_layout_file:
|
|
||||||
m = bl2_size_re.match(line)
|
|
||||||
if m is not None:
|
|
||||||
bl2_size = int(m.group(1), 0)
|
|
||||||
break
|
|
||||||
return bl2_size
|
|
||||||
|
|
@ -681,21 +681,6 @@ class PSOC6Code(object):
|
||||||
psoc6_sign_image(t_self, resources, elf, binf, m0hexf)
|
psoc6_sign_image(t_self, resources, elf, binf, m0hexf)
|
||||||
|
|
||||||
|
|
||||||
class ArmMuscaA1Code(object):
|
|
||||||
"""Musca-A1 Hooks"""
|
|
||||||
@staticmethod
|
|
||||||
def binary_hook(t_self, resources, elf, binf):
|
|
||||||
from tools.targets.ARM_MUSCA_A1 import musca_tfm_bin
|
|
||||||
configured_secure_image_filename = t_self.target.secure_image_filename
|
|
||||||
secure_bin = find_secure_image(
|
|
||||||
t_self.notify,
|
|
||||||
resources,
|
|
||||||
binf,
|
|
||||||
configured_secure_image_filename,
|
|
||||||
FileType.BIN
|
|
||||||
)
|
|
||||||
musca_tfm_bin(t_self, binf, secure_bin)
|
|
||||||
|
|
||||||
class ArmMuscaB1Code(object):
|
class ArmMuscaB1Code(object):
|
||||||
"""Musca-B1 Hooks"""
|
"""Musca-B1 Hooks"""
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
# Musca-A1 RSA keypair
|
|
||||||
|
|
||||||
A default RSA key pair is given to the Musca-A1 target.
|
|
||||||
|
|
||||||
Public key was pre-compiled to `targets/TARGET_ARM_SSG/TARGET_MUSCA_A1/prebuilt/mcuboot.bin` and private key is in `musca_a1-root-rsa-3072.pem`.
|
|
||||||
|
|
||||||
DO NOT use them in production code, they are exclusively for testing!
|
|
||||||
|
|
||||||
Private key must be stored in a safe place outside of the repository.
|
|
||||||
|
|
||||||
`tools/psa/tfm/bin_utils/imgtool.py` can be used to generate new key pairs.
|
|
||||||
|
|
@ -1,39 +0,0 @@
|
||||||
-----BEGIN RSA PRIVATE KEY-----
|
|
||||||
MIIG4gIBAAKCAYEAnLrCWr/MxU8gDE9vbFFPXAqrgLhrEMSbK8RSMglLOyeUah3V
|
|
||||||
TKhcoMB2lXsmBLETfngn1gy06LAtklKK+2n/QhCqVgyDyGVuug1fjvcrKZL8Qi0t
|
|
||||||
+YD1hSGH6qxAqMvQqDvi0uzwFEgOzyuKS6TNoQVbF2Yd3m5E/kajDdBpv4ytqRZo
|
|
||||||
Uet5kSDmgQMHiUBVS+vPZ/gxxxxUTlILYOiiUAfRz84SJs2Ogo1OZKn3xyGZJQfd
|
|
||||||
xdVf9GP6zCvaBlxZZ7AGNemqkkU15aAD/xwCtcdOlEturXOdzm8Js7GPYGyi+s13
|
|
||||||
D8wn5jZYs1L3j75JmLfpYP2XV83q0wvfokL3RNOH3uAQA5Ta/LzdvpOzSitY3JYS
|
|
||||||
8m8jujs3/vwYH3V9VAEOvj0YE7MouTQs1fvFM72HvTvkHdcCPRxyZXJDQzao+uZz
|
|
||||||
LaRh6AKcOlZNHNF2nIyqXxvrHEr1ubhvQUsnh972lB/d5vGpwgLCT6P8pANa2W94
|
|
||||||
/YTw5f09pU0brVtLAgMBAAECggGAG786mltbctEL0PIdPVV10cs3yq2bktfjys9S
|
|
||||||
Z/ZaQcpDjbfjY9NotrLsK5GmTO1WkKzQDKaqPom2P7HqVhFRdg5CQcKscAV5IWot
|
|
||||||
sT9T/mO90i9ydLoefWfOyr6dIeUXdzlG8mWtKUIKkSXZsYOnPesXUeCryA3InCXA
|
|
||||||
RzlPB3Dt68ICTQJ9vrJO7KcvJd7kWvEQAo2frmr3B/iheBInbji8LeiDMShyIu3G
|
|
||||||
Y67tpWzu0m3+lsAsYTV0GMJosniVulaZ3hYQQazHUk+zDzMSC7zryICrpjEbgzWU
|
|
||||||
HZI9EGi1B890nwUtdhlCpkr8zoWDb0BjawpftiGz7fRm7q2TQkYAWGzNKm3DZlIS
|
|
||||||
4LsRACvHnPZ17wUSze9tqP14Pb593WR3nOTiVjrJWm+4Z5hgV3QfoEqW5swOAYl4
|
|
||||||
6QmKZsCXAfGkozJiHnYcyaULkGBVegn1LQ5rcb8JUMribQddrHZxCVHrbgwh2zm/
|
|
||||||
v9CYfTtpWCnKHq+wF3mwjl6w7m4JAoHBALolVbgs919Dx0xjcPnW5MSxW3ctflI9
|
|
||||||
2ZE1BOH/Rtg5gfBwR/aToUM3a/ZgIJHQYhVty2TzUVtthtmLNTRKu2FSqWN8//GJ
|
|
||||||
wmj4bcNBshMgniHEfkutlBiP9exhdvCZX4bYpdTkJAyvOmUGjEM8QBFsod60u0z7
|
|
||||||
Bd0EIXs7PIURP0fNAUXCgSHMPjdICLljhwHinr31VEIU2/xehw8DBIJwkR/rCsPq
|
|
||||||
xBmlIwPWVjzCRTnYUxQuxCAYf+qvgNylKQKBwQDXi3UGI7t30rYNMdIjMn1GPkhW
|
|
||||||
o62BOJNCusoXiGnbVOkj8qBayf7kPu10ONBzHcYL7+SQYeVVXQY+DH033ji8oa0J
|
|
||||||
p1xMGIlx4JZEduQYlk0ke4hUNrcBQczTRA47DmMm2kIdWlaTHtB7aCJNx72IrwWn
|
|
||||||
lVTY9TWm6+yOPcpV5JfyCMM6GqoRycikgNS5IQug5hl2pFVLw+UTfxo6msYaAOnp
|
|
||||||
ICUjoeDUKS0Z8+FtzGhAkWTk8GXIiPbfu7RoN1MCgcAcah6Poq2QKTR/AJ76REdf
|
|
||||||
jwM7SgKCY1aWx9Ua+nDCCOVA4qLZjOeM7yTX0wyltX2Db+MgYdQFdM6k3o8ckFvS
|
|
||||||
G2AoA6i+Ih0/EM0QhTK9oLkCxo/Q1YpJxY/wqWASkhb26pNF0B2Aoi7zxPAcQ1I0
|
|
||||||
VrTO3h/JPHhEqKDDwuMWHO/f8fdDwtEba6YDokdSpVKygvlgXdaiz7RU7ckIDZne
|
|
||||||
n3hHuwVFqsyMbZzOtSUs2SrgDZmA9zKRA6xjEq9E/yECgcAnm7XecfSCGVNg61XN
|
|
||||||
J/sDTHCokx1QEKBm88ItPuEM7/aDp5M1+8Z+FN43rDUJ4l/BU8zxhzvISvbZshvU
|
|
||||||
h15vs1oD2yBHz356UaXrYNmbdwsn+BdeOku4zGmiLPBcg9FOk27wy+f60v/GnaUo
|
|
||||||
G9tFYbwtRnC4CZ9ZVCM9JDepPv9494lAhSPZbvYS3KW6e0sSvxXQynPuH0paIdIl
|
|
||||||
EMn0f1R8hW6ttJKHCiYCjeFP9u71ZoJe25oolpqfFHQbbocCgcAuBR4w3Qmnbscm
|
|
||||||
3b7fyy8n3AXa1gIfYjjPpR35qyp1K9thiLyj66YZIl0ACC/dt08lmI9/lguRoNIQ
|
|
||||||
AfjzZ8DByZa0caiSiFIMlgNZXdh7N3BUNNbIQk98Wd91gBlWDAiFEhrJKFPpRkmv
|
|
||||||
FySATPYcq0lcrjJb3IW2GDK4uo/jb4Nb7Cfog95W6T76XcSKHS5O8k1aI4kFPRsr
|
|
||||||
1wGZw64OkA8VXVaCaEBQ4brZ1YKB3mx4/tDqwn0I6bqkGRX3RJg=
|
|
||||||
-----END RSA PRIVATE KEY-----
|
|
||||||
Loading…
Reference in New Issue