From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6883009067021762560 X-Received: by 2002:adf:f3c7:: with SMTP id g7mr36301030wrp.394.1602575433528; Tue, 13 Oct 2020 00:50:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:7d02:: with SMTP id y2ls4174002wmc.2.canary-gmail; Tue, 13 Oct 2020 00:50:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw12vvYk6sC2NUwUZ/53SPdcmcaURLRB+H3eyWHATzoGjarl1VjkJiId8L8ugOUXqo1navM X-Received: by 2002:a1c:f715:: with SMTP id v21mr15238765wmh.117.1602575432488; Tue, 13 Oct 2020 00:50:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602575432; cv=none; d=google.com; s=arc-20160816; b=P4LOfPcBKCsWhBinR/tN2WlPgmvP7YEp7HIEFuoTU1rgauKFSL1iSnPhchbgZVvDTG DuhHJFLoCwbS6Zv1d7qDfcJTekOSVk8R/AIB558ufA6Fo3QewPTeiGVuFSY4r3S0VjfE tYW6l6cBgA5tHF+LULUm9h9T4HZJXJ0nYW3CluGtGOie357VWmWavxp+6uvKCRo6+YHz gY1jkmT46Wmp5NUbn7TNoJD1WKuttXKLBnpuW698Ob2xASwgzwQ9wqQBExLuHjUZX3Un vRmYkS9a/pm5hjmjhcbyLQqiIUkwCebtwrRzHRirs2jGfV3KxAGwO5V3NVYpxXUZBksI jc2Q== 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=OvsWGU+nJym4QAUKa+3+LwCj1Zc8AsWP0yRGUT7TFVs=; b=mm2+XLfdgr9e53dWWA/XsX4yrf+P67K0sBFrh9I/nGFuXg9RGbGY6ySAzWmIXMbV1C sCWgnwQfGzry1feS7XUmdx1WugOxpg4+VaYoptK35Vb2P96wekKdJ4PQ2qnbmFYkLStJ QVKiYBpaJTM4HCPcOrE6aeit38ZBRevvDYoQixKeqQwaHMo1ho+EVZ9/btb3/4ag7xOY m4gI6G/AIyvsVyhxwyJFaQs3pNTH4NF1vrtkOmIm5ZAm8tB2OT0UikBsjGl18xXJjPv5 Q/nTdxQrk5li3xaNz6SmvLxUX9mRSHiNhdDdq0N9ZqmzyLjPVDPHqXRWw1Dt5+v/KAwH i3gQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 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 goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id 63si480271wrc.0.2020.10.13.00.50.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Oct 2020 00:50:32 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.28 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 goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 09D7oWPU032026 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 13 Oct 2020 09:50:32 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.21.249]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 09D7oTb3020807 for ; Tue, 13 Oct 2020 09:50:31 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 11/11] meta-isar: Add OP-TEE to STM32MP15x board Date: Tue, 13 Oct 2020 09:50:28 +0200 Message-Id: <7632753564a0c879061c269c60d24393b36e7c63.1602575428.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: PkDDj+KsdOF1 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 0a45ec36..33836ea9 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 5a518d3f..878e86de 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 --label fsbl1 --source rawcopy --sourceparams "file=/usr/lib/trusted- part fsbl2 --label 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 --label 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 --label 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 --label 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 --label 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