From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6883009067021762560 X-Received: by 2002:a2e:808a:: with SMTP id i10mr866252ljg.427.1602755024942; Thu, 15 Oct 2020 02:43:44 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:651c:14d:: with SMTP id c13ls446695ljd.8.gmail; Thu, 15 Oct 2020 02:43:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxo+1kKAVQeBgJOYYT4/iMNL+jseL3gouUmmHf+TZLqbPMcTJBk1QC2jTTLpKdgCdBMeAvg X-Received: by 2002:a2e:a374:: with SMTP id i20mr993414ljn.143.1602755023643; Thu, 15 Oct 2020 02:43:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1602755023; cv=none; d=google.com; s=arc-20160816; b=ijrXJNehTgmMmTJOoYTp89Q6rMjpVylmtNShun6sSRzuTA7KAWQAu7/u8UwJPdRpUL ld9QWB411Y7Fj5ppsafPaqm6p87xdjtDxkZZTr+tbWK/J74vEvNRlWMW0AdltJI1uVH2 7hcdXqBL1DZSEyYbcArin1Yt8CJepfHEXFaW5ThHMAya0e3B7rYEHfLo3s2onRx/FPRw 3szqeZ0awfJGHFdplRTGX3N/6KxkaQIqBp9Lw13Gxl+M5TTDbzPRo2+HnbpguRsynN0C 82SzxNBbnKzTcRkjfghc92QEI9E7Y6i9eSVKZ22YibFKxdiVawRiAvMjBBiY8W3xMfZw cl4Q== 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=PG/1d59b1j+hjcNMHWsTlmb/fz7Mf/Aq2NvsiwMOil8=; b=SP2PQkXUNQye2d52WVsCJs0wGKYTCbtSbCIonnZ6Nrr4GQtuyjGE6uYeD4PnWbEiHu Qi+LFPVNTQy7VeIAbTkSVw0ukS3eQ68Jw+u9LSd8V59+tCPOPttaF0YAznc3G5UqeQkW i5WI5a8HQrT6AgdLLfhLXHmw8VXFLnbXJrDNtlpg2sc0eXTzfyYObUZ8P0GMAgv1mxvq FIi4JbGz1OomNpCdY2BK8xfkYdRDTp6BMnoPecQEO8e9p/8XrX4DOyuegy53O+ZbJFNS BiKqcVwJxTcMSJauiBMy10il4pOYj6XLKaTuUoEn701HGPepdAN3sr58l0dpvT5vNS5n 0l3g== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 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 david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id x19si71745ljh.2.2020.10.15.02.43.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Oct 2020 02:43:43 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 192.35.17.14 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 david.siemens.de (8.15.2/8.15.2) with ESMTPS id 09F9hgMq015509 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Thu, 15 Oct 2020 11:43:42 +0200 Received: from md1f2u6c.ad001.siemens.net ([167.87.42.243]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 09F9heah028282 for ; Thu, 15 Oct 2020 11:43:42 +0200 From: Jan Kiszka To: isar-users Subject: [PATCH v2 08/11] stm32mp15x: Switch to TF-A based boot Date: Thu, 15 Oct 2020 11:43:37 +0200 Message-Id: <5584c38a98b554d8822e094e3935a7e2c3197037.1602755020.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: iEKDODORUQD9 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 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