From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6883009067021762560 X-Received: by 2002:a17:906:e24c:: with SMTP id gq12mr33233408ejb.359.1602575432739; Tue, 13 Oct 2020 00:50:32 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:d19b:: with SMTP id c27ls3004090ejz.1.gmail; Tue, 13 Oct 2020 00:50:31 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6RTX22nwCvD+wTbNynQX7TodK94rlukqkOtsUQhg+Y+ncg1uxKOwSYg3c4my3yOlOS42C X-Received: by 2002:a17:906:4ecb:: with SMTP id i11mr32692903ejv.387.1602575431750; Tue, 13 Oct 2020 00:50:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602575431; cv=none; d=google.com; s=arc-20160816; b=nRZc2BZ8bZc+pFwPMXcdLVy4gOEIBSxGFclOpgk9zTpJkwdstt6nOz7mJ/ObUpXsm9 80WNMASLKMjBSMxvzH84yH8rGJq8g162bQe3vwXnPljSHAkTUXVPPszk0yu9WXT7bv2+ F4TObfSaOJ6DTqHHWcf2XbvhB3Rd4tSislRbrRmUiG0/OrW12TAtIcBE+t4EPSO/+1uJ DKwNBMPx53hbozZKCTgpOwkuYHbKctongIdMgZtbs3uATi0g7bj38whJl8U1su6GSjKa 6Sp+mvZp1mpH8FaoqLNGLQ2jv7Xjp/T/WxciS+1FzXR49crDMBKcfr31+jaux9nHki4Y wJbg== 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=xbf3xeesPxzCx7SFkuFozAnqRLqxirqIIwXeLhltSko=; b=ch01W7cauDeUyASeaUM7528ZEAV2FkJPjycrS3BVtzGBF3o+oJvVu+Xxvdp/z4bFN1 e+CdkPzAkIvSbJkZuPjzIESnIj8PooJ3KuZGog9/BvNd+3Dlo6rPGakOmVN1q1meV/k4 Q3ci2lSxm8wH5EnbFsTjxROREWLPx2t99oUrDO0l57xQpCtDHqbF4G2WbwYm5zPwWWqK 1hsLNXF1GI09/Kr/OiNlvYTe7mKWu5/97Z/wDiHlGv/tYAthbDXG3eRME7pZkHjlzMlZ Cxg22VWodvVqzGZCMDDeMh9OAFuea8Z23QVsx5h73cyACBAuDUcIdTDJANQNRKso/4DA t3fg== 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 n11si188039edi.1.2020.10.13.00.50.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Oct 2020 00:50:31 -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 09D7oVBO032003 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 13 Oct 2020 09:50:31 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.21.249]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 09D7oTb0020807 for ; Tue, 13 Oct 2020 09:50:31 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH 08/11] stm32mp15x: Switch to TF-A based boot Date: Tue, 13 Oct 2020 09:50:25 +0200 Message-Id: X-Mailer: git-send-email 2.26.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TUID: 9VEPUFq9532H 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..0a45ec36 --- /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 = "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 a8dc3727..5a518d3f 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 --label 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 --label 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 --label 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 --label 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 --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 / --source rootfs-u-boot --fstype ext4 --label root --align 1024 --active --use-uuid -- 2.26.2