From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6883009067021762560 X-Received: by 2002:a05:6512:3587:: with SMTP id m7mr13927932lfr.149.1606118043930; Sun, 22 Nov 2020 23:54:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:d0e:: with SMTP id 14ls2478293lfn.0.gmail; Sun, 22 Nov 2020 23:54:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJyTCKrd3oUkEdaTKRwU05tftlFglTtOtqnua3qy7D5yzLDZZNF4j+Z+QHX2Rs6N/n9tgPIw X-Received: by 2002:a19:228f:: with SMTP id i137mr13788148lfi.477.1606118042907; Sun, 22 Nov 2020 23:54:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1606118042; cv=none; d=google.com; s=arc-20160816; b=ZzXUzKH69xxglXJ29bOGdVWgaYgn7V/Gh3BfR0UjaIJxR8g3xYs/HL8709n+wQSurh rkMUAvq+CunnrQ4Pzm0uM8T+5EHaJepIEFW9h2S1qIlaUUhNKorFqNEAF+juiVMWX+lE KS6Htc4n5+y8Clu21j1kaRkYIbYg2RJeAp0tGpSTRflY0zCYJmaev2ybsCOxiw86N9gS cDLb9L4tjY4N/KxNOkF2Y/LZRnUMGha9KuHk5SWQVM43158mN/3CEebxH2U45sKJHm45 3w2KgeaPZeSDO1OpSTVBpXCtvjcaN7PXwZ/rdDYEV77I6v+HQziAbG6rYHTJwao4P/4A 5v6g== 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=Vs/3tHHX5t2HMBuWLZpHDSjcSY7SLrLi6eUnZY5YR9c=; b=sOZqRdxPAJ5VIYsUvJERWa/HLhBZxQ/XbcMQSxhIuPahMZ+1uIuhxWDRcNKD8HUABD XnkWqgofi4oi+LnGAPI5Valirc+y0EgpcwsG0Bg4IKouC1bEGBPMA7sx+62PmC77yT/2 2a3ZzJGRV2328haRzNY1mqAf1eZlvW9ALSNaZWLQVRRlcR7E1I2+i48ZNzIpEGQQBvIk 920UCmTItKgvmAik7DtKUn9FcpPiGz8rDnobUgsfzgozC7R5VJT7JePRasgSibAr7KBu CUlmAVzFUOM3eRQWNxgXvptVZBs1UVdjEUvFDWz6QuuMMlH4H/flZZh7jOb+R9648WYe htaw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id y84si327778lfa.6.2020.11.22.23.54.02 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Nov 2020 23:54:02 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 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 gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 0AN7s2kJ007445 (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 0AN7rxTw017265 for ; Mon, 23 Nov 2020 08:54:02 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v4 08/11] stm32mp15x: Switch to TF-A based boot Date: Mon, 23 Nov 2020 08:53:56 +0100 Message-Id: <81dc720db952e9c6e7c88896517b7b1401ef0291.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: xj3JOoOHBg1T From: Jan Kiszka This demonstrates the usage of the TF-A include for building custom firmware versions. Signed-off-by: Jan Kiszka --- meta-isar/conf/machine/stm32mp15x.conf | 8 +++---- .../trusted-firmware-a-stm32mp15x_2.3.bb | 21 +++++++++++++++++++ .../lib/wic/canned-wks/stm32mp15x.wks.in | 6 +++--- 3 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.3.bb diff --git a/meta-isar/conf/machine/stm32mp15x.conf b/meta-isar/conf/machine/stm32mp15x.conf index 7ef36e68..66a47df4 100644 --- a/meta-isar/conf/machine/stm32mp15x.conf +++ b/meta-isar/conf/machine/stm32mp15x.conf @@ -8,12 +8,12 @@ DISTRO_ARCH ?= "armhf" KERNEL_NAME ?= "mainline" PREFERRED_PROVIDER_u-boot-stm32mp15x = "u-boot-stm32mp15x" -U_BOOT_CONFIG_stm32mp15x = "stm32mp15_basic_defconfig" -U_BOOT_BIN_stm32mp15x = "u-boot-spl.stm32 u-boot.img" +U_BOOT_CONFIG_stm32mp15x = "stm32mp15_trusted_defconfig" +U_BOOT_BIN_stm32mp15x = "u-boot.stm32" IMAGE_TYPE ?= "wic-img" WKS_FILE ?= "stm32mp15x.wks.in" -IMAGER_INSTALL += "u-boot-stm32mp15x" -IMAGER_BUILD_DEPS += "u-boot-stm32mp15x" +IMAGER_INSTALL += "trusted-firmware-a-stm32mp15x u-boot-stm32mp15x" +IMAGER_BUILD_DEPS += "trusted-firmware-a-stm32mp15x u-boot-stm32mp15x" IMAGE_INSTALL += "u-boot-script" 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 new file mode 100644 index 00000000..97d683f7 --- /dev/null +++ b/meta-isar/recipes-bsp/trusted-firmware-a/trusted-firmware-a-stm32mp15x_2.3.bb @@ -0,0 +1,21 @@ +# +# Copyright (c) Siemens AG, 2020 +# +# SPDX-License-Identifier: MIT + +require recipes-bsp/trusted-firmware-a/trusted-firmware-a-custom.inc + +SRC_URI += "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-${PV}.tar.gz" +SRC_URI[sha256sum] = "37f917922bcef181164908c470a2f941006791c0113d738c498d39d95d543b21" + +S = "${WORKDIR}/trusted-firmware-a-${PV}" + +DEBIAN_BUILD_DEPENDS += ", device-tree-compiler" + +TF_A_PLATFORM = "stm32mp1" +TF_A_EXTRA_BUILDARGS = " \ + ARCH=aarch32 ARM_ARCH_MAJOR=7 AARCH32_SP=sp_min \ + STM32MP_SDMMC=1 STM32MP_EMMC=1 \ + STM32MP_RAW_NAND=1 STM32MP_SPI_NAND=1 STM32MP_SPI_NOR=1 \ + DTB_FILE_NAME=stm32mp157c-ev1.dtb" +TF_A_BINARIES = "release/tf-a-stm32mp157c-ev1.stm32" 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 a9fb332d..5abaa833 100644 --- a/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in +++ b/meta-isar/scripts/lib/wic/canned-wks/stm32mp15x.wks.in @@ -3,9 +3,9 @@ # # SPDX-License-Identifier: MIT -part fsbl1 --part-name fsbl1 --source rawcopy --sourceparams "file=/usr/lib/u-boot/${MACHINE}/u-boot-spl.stm32" --fstype=ext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size 256K -part fsbl2 --part-name fsbl2 --source rawcopy --sourceparams "file=/usr/lib/u-boot/${MACHINE}/u-boot-spl.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.img" --fstype=ext4 --fsoptions "noauto" --part-type 0x8301 --fixed-size 2048K +part fsbl1 --part-name fsbl1 --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 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 / --source rootfs-u-boot --fstype ext4 --label root --align 1024 --active --use-uuid -- 2.26.2