From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7257948820735000576 X-Received: by 2002:a05:6402:1909:b0:521:e27b:df8c with SMTP id e9-20020a056402190900b00521e27bdf8cmr713610edz.19.1689872896611; Thu, 20 Jul 2023 10:08:16 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:aa7:d743:0:b0:514:a0b8:647d with SMTP id a3-20020aa7d743000000b00514a0b8647dls384863eds.0.-pod-prod-02-eu; Thu, 20 Jul 2023 10:08:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlFrYra8n1tEbGbwN3YSKsWjakHvEmcncr4lpK8I8QPh+aDK9H7L6qRHyBnR7fgPhiPkFNEM X-Received: by 2002:a50:fc0b:0:b0:51e:1932:db07 with SMTP id i11-20020a50fc0b000000b0051e1932db07mr5009017edr.34.1689872894819; Thu, 20 Jul 2023 10:08:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689872894; cv=none; d=google.com; s=arc-20160816; b=mB3/cLTAjJ/MtXNHiZqqK/jl5wROAILaXzpbF20/tlJctzFRDy/KpJuAhH5Bi3yMOT 7Ejzxa1h77gt7Ij5ti7E8o+Ue+6NZkwvKC1cVZVK3RQVWbOw2DCgfqD45hqdIYA/puyQ 2KXd3Zjs0Br/3XR1lb/2rF3t8WZQ/5TpArj61wLYW9EMXZFgs+lofZMSFljVVsz01dP7 ip/XOC9sZ6jvpHEL8Cs9O1ErvSDWhfIG2M/qH5roxkbZLmaPkVPdi3MxZ3Vbb9onvx2A 2SnhrG+2aWh/azheS/uTqVZOjKHAeVdb7vEozaWZpIcbjqgvow9IwN5rm4kw4epHoIvJ Cfsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=PeIfRyDznuMZn1E7UiAodXv1M2wS0dnqPksjR+2pnnA=; fh=i2rMp76O4OuqKOrPWESC/E2VYXjzqUtPdBv0yMcUYYM=; b=eVipPbcK+UEt8dzJSCcDWL9czRU7WxgUdbi/5t/9cU+my5b12qF3bbzCmZgqUCip0X CoX0dq+4P0sUfhvQ/ZdFcI1M5OuLIldeAbI4WRSrwhZeRacGSpTFzOHjli3XlwlGuY1O DPSmoEmJQ1CQVMNpZCAiYFccmtRkNddwQP9sTWXTfnbOfuUj8r+lqWKkP4VUvx+cyp2A TQ5sr3lbSHtqqpZlt9yVyhPhfx9E5lBrgA3ZXVP82gL+Q6FeEk7W5gCDVEuSIycQv/AJ oaDPPxapBWvMvNK6DS7xJNKg34nMyiqgnSSgOZUrM83OoCXaiwBb5EiyjYAM7sf2APxD 6cvQ== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bWfF2RGO; spf=pass (google.com: domain of fm-294854-20230720170814bf56bd149faa31ba7b-lg2vfp@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20230720170814bf56bd149faa31ba7b-Lg2Vfp@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from mta-64-226.siemens.flowmailer.net (mta-64-226.siemens.flowmailer.net. [185.136.64.226]) by gmr-mx.google.com with ESMTPS id z9-20020a05640235c900b0052171bda268si79174edc.3.2023.07.20.10.08.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 20 Jul 2023 10:08:14 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-294854-20230720170814bf56bd149faa31ba7b-lg2vfp@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) client-ip=185.136.64.226; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm1 header.b=bWfF2RGO; spf=pass (google.com: domain of fm-294854-20230720170814bf56bd149faa31ba7b-lg2vfp@rts-flowmailer.siemens.com designates 185.136.64.226 as permitted sender) smtp.mailfrom=fm-294854-20230720170814bf56bd149faa31ba7b-Lg2Vfp@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: by mta-64-226.siemens.flowmailer.net with ESMTPSA id 20230720170814bf56bd149faa31ba7b for ; Thu, 20 Jul 2023 19:08:14 +0200 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; s=fm1; d=siemens.com; i=jan.kiszka@siemens.com; h=Date:From:Subject:To:Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:Cc:References:In-Reply-To; bh=PeIfRyDznuMZn1E7UiAodXv1M2wS0dnqPksjR+2pnnA=; b=bWfF2RGOMDmJfloL0mezS6trgcj3O8oPMpJVpOG8EYZ0bKjCrWsN9O0roJW7OKTla8WJQU e39HAYLuNYFeNNicM2Lupa2gxreX88EE6gip3OpO919NKM6eVU0GNxsbshHvAxDHUmSYm7QS MAMzRgj/ndd32taxGw1K/Rs7GF3rM=; From: Jan Kiszka To: isar-users Cc: Bao Cheng Su Subject: [PATCH v3 11/11] optee-ftpm-stm32mp15x: Add patch to fix parallel build issues Date: Thu, 20 Jul 2023 19:08:12 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-294854:519-21489:flowmailer X-TUID: 1uarK0JzfJOX From: Jan Kiszka Signed-off-by: Jan Kiszka --- .../0001-Fix-parallel-build-of-optee_ta.patch | 45 +++++++++++++++++++ .../optee-ftpm-stm32mp15x_0~230316+git.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta-isar/recipes-bsp/optee-ftpm/files/0001-Fix-parallel-build-of-optee_ta.patch diff --git a/meta-isar/recipes-bsp/optee-ftpm/files/0001-Fix-parallel-build-of-optee_ta.patch b/meta-isar/recipes-bsp/optee-ftpm/files/0001-Fix-parallel-build-of-optee_ta.patch new file mode 100644 index 00000000..4ee20f41 --- /dev/null +++ b/meta-isar/recipes-bsp/optee-ftpm/files/0001-Fix-parallel-build-of-optee_ta.patch @@ -0,0 +1,45 @@ +From ff34f1a64bd5dbc83df26cfc8e74478f854a0acf Mon Sep 17 00:00:00 2001 +From: Jan Kiszka +Date: Thu, 20 Jul 2023 16:32:26 +0200 +Subject: [PATCH] Fix parallel build of optee_ta + +The symlink must be established prio to building any of the source files +of WolfSSL, or things will fail: + + TA_CROSS_COMPILE= \ + TA_CPU=cortex-a7 \ + TA_DEV_KIT_DIR=/usr/lib/optee-os/stm32mp15x/export-ta_arm32 \ + CFG_TEE_TA_LOG_LEVEL=2 \ + CFG_FTPM_USE_WOLF=y \ + /usr/bin/make -j 24 +make[2]: Entering directory '/<>/Samples/ARM32-FirmwareTPM/optee_ta' +/usr/bin/make -C fTPM CROSS_COMPILE= +make[3]: Entering directory '/<>/Samples/ARM32-FirmwareTPM/optee_ta/fTPM' +Checking symlink to the TPM folder: /<> +Checking symlink to the WolfSSL folder: /<>/external/wolfssl +Establishing symlink. + CC ../out/fTPM/platform/Cancel.o +Establishing symlink. + CC ../out/fTPM/platform/AdminPPI.o + CC ../out/fTPM/platform/Entropy.o +make[3]: *** No rule to make target 'lib/wolf/wolf_symlink/wolfcrypt/src/aes.c', needed by '../out/fTPM/./lib/wolf/wolf_symlink/wolfcrypt/src/aes.o'. Stop. +make[3]: *** Waiting for unfinished jobs.... + +Signed-off-by: Jan Kiszka +--- + Samples/ARM32-FirmwareTPM/optee_ta/fTPM/lib/wolf/sub.mk | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/lib/wolf/sub.mk b/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/lib/wolf/sub.mk +index 0a43f46..eb239e3 100644 +--- a/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/lib/wolf/sub.mk ++++ b/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/lib/wolf/sub.mk +@@ -56,3 +56,5 @@ srcs-y += wolf_symlink/wolfcrypt/src/tfm.c + srcs-y += wolf_symlink/wolfcrypt/src/wolfmath.c + srcs-y += wolf_symlink/wolfcrypt/src/des3.c + srcs-y += wolf_symlink/wolfcrypt/src/random.c ++ ++$(srcs-y): wolf_symlink +-- +2.35.3 + diff --git a/meta-isar/recipes-bsp/optee-ftpm/optee-ftpm-stm32mp15x_0~230316+git.bb b/meta-isar/recipes-bsp/optee-ftpm/optee-ftpm-stm32mp15x_0~230316+git.bb index 441bc4ac..c92620e1 100644 --- a/meta-isar/recipes-bsp/optee-ftpm/optee-ftpm-stm32mp15x_0~230316+git.bb +++ b/meta-isar/recipes-bsp/optee-ftpm/optee-ftpm-stm32mp15x_0~230316+git.bb @@ -12,6 +12,7 @@ SRC_URI += " \ https://github.com/Microsoft/ms-tpm-20-ref/archive/${SRCREV}.tar.gz \ https://github.com/wolfSSL/wolfssl/archive/${SRCREV-wolfssl}.tar.gz;name=wolfssl \ file://0001-add-enum-to-ta-flags.patch \ + file://0001-Fix-parallel-build-of-optee_ta.patch \ " SRCREV = "f74c0d9686625c02b0fdd5b2bbe792a22aa96cb6" -- 2.35.3