From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6883009067021762560 X-Received: by 2002:a2e:9510:: with SMTP id f16mr13583049ljh.408.1606118044788; Sun, 22 Nov 2020 23:54:04 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:ac2:58ed:: with SMTP id v13ls1048989lfo.2.gmail; Sun, 22 Nov 2020 23:54:03 -0800 (PST) X-Google-Smtp-Source: ABdhPJysGHJOSZFvLprHMqijCYmCW8myAIKnim3SJVYQgu6Xu0wW424zpAB73GzseaYoquz2QRWY X-Received: by 2002:a19:f702:: with SMTP id z2mr11881170lfe.257.1606118043551; Sun, 22 Nov 2020 23:54:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606118043; cv=none; d=google.com; s=arc-20160816; b=utaBXiMeXKt7JKO+JKXKTrFWXgvP3djcBp5fdkhg6+I6DPZZRAblwJYiJgsecbqwT7 isRIfgvSNPBMBkRQGQr38X1aqsWs7+fUUjCRezQPnrrJD/zmM05URqnw2eUaeWl8a8Jq C87Bwio4uWrs5BQCngW7I94+LsSG9kCy0+O8rsFGOkfug2uGj4UPrSE1+3r+SwT0B5VC PWlM8GOR7a/OO7YtN/H108XDZU743T2ULvAu700bBkxK1Zd3JHDKRF4OK6S1mMap/ilz /JXh0r/nB0cqmvncwtR1WnvrcNLxPzeE/Js7TefSfA1GDPNYtBFAR2q8LM633OkVbGzo Exhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from; bh=jkjz7OT4mn9vFoSjdUyK0RBRei5RDRAoh7eIJpnkRnw=; b=ntzYaD7KnZO8XLV0V/1c0wjQkOv6hv14Gm/DmfQ4SSqS+y2wm2ChUMxiUHMZKFfoGB dTANTZDnzVEiEbcgG7LNAwRgXFJ92wBQWYswOpdagvaiTlIzWfeuNzMglTNOcOHJ9YYf P2xtsqCyY1pwKXUyQCCDxgJzCb1dqAsimpOLAYMhsSXsangBza0DyECN5Xv0wAX+acGK vk7dogOe/YyYqvFn0/8kb3ey49Qs5GHDnqAc2P27YAm2Zs1IxZV1KJx/+Abas5EGPFsJ tOAtkAVZiqnmBmi4+S9kVCE1GA60XchfPMMuj7yJoCeOZjyq8QA0pD+qowyw9Nwvrzko q7cQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from thoth.sbs.de (thoth.sbs.de. [192.35.17.2]) by gmr-mx.google.com with ESMTPS id m18si328193lfr.11.2020.11.22.23.54.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Nov 2020 23:54:03 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) client-ip=192.35.17.2; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.2 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by thoth.sbs.de (8.15.2/8.15.2) with ESMTPS id 0AN7s2aa001755 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 23 Nov 2020 08:54:02 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.38.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0AN7rxU1017265 for ; Mon, 23 Nov 2020 08:54:02 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v4 11/11] meta-isar: Add OP-TEE to STM32MP15x board Date: Mon, 23 Nov 2020 08:53:59 +0100 Message-Id: <1a6ac5ef45644308b0287b58dd1a3443d7348cf2.1606118039.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: A5Ne5VUdaexD From: Jan Kiszka This builds OP-TEE 3.10.0 for the "stm32mp1" platform and installs the generated binaries in the required partitions for the STM32MP15x. Serves as a demo and test for building custom OP-TEE packages. Signed-off-by: Jan Kiszka --- meta-isar/conf/machine/stm32mp15x.conf | 4 ++-- .../optee-os/optee-os-stm32mp15x_3.10.0.bb | 19 +++++++++++++++++++ .../trusted-firmware-a-stm32mp15x_2.3.bb | 2 +- .../lib/wic/canned-wks/stm32mp15x.wks.in | 4 ++++ 4 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.10.0.bb diff --git a/meta-isar/conf/machine/stm32mp15x.conf b/meta-isar/conf/machine/stm32mp15x.conf index 66a47df4..e963d080 100644 --- a/meta-isar/conf/machine/stm32mp15x.conf +++ b/meta-isar/conf/machine/stm32mp15x.conf @@ -13,7 +13,7 @@ U_BOOT_BIN_stm32mp15x = "u-boot.stm32" IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "stm32mp15x.wks.in" -IMAGER_INSTALL += "trusted-firmware-a-stm32mp15x u-boot-stm32mp15x" -IMAGER_BUILD_DEPS += "trusted-firmware-a-stm32mp15x u-boot-stm32mp15x" +IMAGER_INSTALL += "trusted-firmware-a-stm32mp15x optee-os-stm32mp15x u-boot-stm32mp15x" +IMAGER_BUILD_DEPS += "trusted-firmware-a-stm32mp15x optee-os-stm32mp15x u-boot-stm32mp15x" IMAGE_INSTALL += "u-boot-script" diff --git a/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.10.0.bb b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.10.0.bb new file mode 100644 index 00000000..a2570946 --- /dev/null +++ b/meta-isar/recipes-bsp/optee-os/optee-os-stm32mp15x_3.10.0.bb @@ -0,0 +1,19 @@ +# +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + +require recipes-bsp/optee-os/optee-os-custom.inc + +SRC_URI += "https://github.com/OP-TEE/optee_os/archive/${PV}.tar.gz" +SRC_URI[sha256sum] = "d30776ab051b701cdd2b71d32ff5cd54285a688440cc90aefd14b4f0f6495d7c" + +S = "${WORKDIR}/optee_os-${PV}" + +DEBIAN_BUILD_DEPENDS += ", device-tree-compiler" + +OPTEE_PLATFORM = "stm32mp1" +OPTEE_EXTRA_BUILDARGS = " \ + ARCH=arm CFG_EMBED_DTB_SOURCE_FILE=stm32mp157c-ev1.dts \ + CFG_TEE_CORE_LOG_LEVEL=2" +OPTEE_BINARIES = "tee-header_v2.stm32 tee-pageable_v2.stm32 tee-pager_v2.stm32" diff --git a/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.3.bb b/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.3.bb index 97d683f7..123273d1 100644 --- a/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.3.bb +++ b/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.3.bb @@ -14,7 +14,7 @@ DEBIAN_BUILD_DEPENDS += ", device-tree-compiler" TF_A_PLATFORM = "stm32mp1" TF_A_EXTRA_BUILDARGS = " \ - ARCH=aarch32 ARM_ARCH_MAJOR=7 AARCH32_SP=sp_min \ + ARCH=aarch32 ARM_ARCH_MAJOR=7 AARCH32_SP=optee \ STM32MP_SDMMC=1 STM32MP_EMMC=1 \ STM32MP_RAW_NAND=1 STM32MP_SPI_NAND=1 STM32MP_SPI_NOR=1 \ DTB_FILE_NAME=stm32mp157c-ev1.dtb" diff --git a/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in b/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in index 5abaa833..744330e6 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in @@ -7,6 +7,10 @@ part fsbl1 --part-name fsbl1 --source rawcopy --sourceparams "file=/usr/lib/trus part fsbl2 --part-name fsbl2 --source rawcopy --sourceparams "file=/usr/lib/trusted-firmware-a/${MACHINE}/tf-a-stm32mp157c-ev1.stm32" --fstype=ext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size 256K part ssbl --part-name ssbl --source rawcopy --sourceparams "file=/usr/lib/u-boot/${MACHINE}/u-boot.stm32" --fstype=ext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size 2048K +part teeh --part-name teeh --source rawcopy --sourceparams "file=/usr/lib/optee-os/${MACHINE}/tee-header_v2.stm32" --fstype=ext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size 256K +part teed --part-name teed --source rawcopy --sourceparams "file=/usr/lib/optee-os/${MACHINE}/tee-pageable_v2.stm32" --fstype=ext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size 512K +part teex --part-name teex --source rawcopy --sourceparams "file=/usr/lib/optee-os/${MACHINE}/tee-pager_v2.stm32" --fstype=ext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size 256K + part / --source rootfs-u-boot --fstype ext4 --label root --align 1024 --active --use-uuid bootloader --ptable gpt --append="rootwait rw console=ttySTM0,115200" -- 2.26.2