From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6883009067021762560 X-Received: by 2002:adf:a551:: with SMTP id j17mr23485956wrb.217.1605966162209; Sat, 21 Nov 2020 05:42:42 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:414c:: with SMTP id h12ls796102wmm.2.gmail; Sat, 21 Nov 2020 05:42:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJzsKCLExMCh6r8T6iXfyUV8HHzOUKMI0JLyHB0rS4GGuz2AXzeOYhX5wpa5Z8Xhwel4wpQ4 X-Received: by 2002:a7b:c7d3:: with SMTP id z19mr15369024wmk.4.1605966161268; Sat, 21 Nov 2020 05:42:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1605966161; cv=none; d=google.com; s=arc-20160816; b=ZPKcpYmTCTFtQlvRdh04zxTzpRWMhsYlIIyEBgM/xIqf46bT3LP4TT8C4VwGUPEGTR iGbjDfE2/ws98mBtdhIc6WFGtpVMdAtw6ysUm8/4YiTElfRwRyeG/W9wWLxpzlF/JcMB IRF1IBxAYn0vkxn2u5Z3TxOamORZZAMVLMCspe9GiiQMSRrprngGtoAWCG32WKHuzoj6 tlx0vl4W4vSQjJOnxHuBmPrXy9HCd03By9J39HNfxddo6LxqeZ9G9LVj7kjCy3CHpMpi Y1He4MzeS3pNvWMVxCE39rWdTHiHwjcUDvHgjh5cHbGJXArfCKOZFOFoxdfJ53rfDFoP w8uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:in-reply-to:mime-version :user-agent:date:message-id:references:to:from:subject; bh=5rq4tWqH1XbNOQPQBH/1tl65OS8ILb4uMA9W2npbyhA=; b=D2oiNw/XJYLhUayxzgW4FMTYBrP6AW3QMQcDjwChdOE75O/sCNmnDxvq2U896AETIY 5xOfTp7do1QxOY/GMXR17EgBLWqyLwuTHS3CxeXpG7DKcE5YSFljnGAJB8Jsz8ogG7lQ g4XTNDWFtydB5c1IJE+x6+WcwBLNcYkZwEeJxr4ocWGQsvYO2PePzyQ24BBWWdlN9st1 cJofML0FKwX0YW1A0rWZgMvbCzV2GS+bSQ1CYGiZ+uwYPQRztWi7tNxSMHz8P1dLKHMc TFHt3w7zsO9a3KVDaCVjFjjcUQdPWxclbKq9cfzHOhNMDab7O0VfhVbteHwZxH9EBR+m z94A== 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 w65si149315wmg.1.2020.11.21.05.42.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Nov 2020 05:42:41 -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 0ALDgexD002507 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Sat, 21 Nov 2020 14:42:40 +0100 Received: from [167.87.38.29] ([167.87.38.29]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 0ALDge9L004558 for ; Sat, 21 Nov 2020 14:42:40 +0100 Subject: [PATCH v3 08/11] stm32mp15x: Switch to TF-A based boot From: Jan Kiszka To: isar-users References: <5584c38a98b554d8822e094e3935a7e2c3197037.1602755020.git.jan.kiszka@siemens.com> Message-ID: <2037b9dc-544d-aa98-f1d6-cc219aec7dfe@siemens.com> Date: Sat, 21 Nov 2020 14:42:40 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: <5584c38a98b554d8822e094e3935a7e2c3197037.1602755020.git.jan.kiszka@siemens.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-TUID: kzmvMbbxkw6k From: Jan Kiszka This demonstrates the usage of the TF-A include for building custom firmware versions. Signed-off-by: Jan Kiszka --- Changes in v3: - adjust TF_A_BINARIES 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