From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7266376873610838016 X-Received: by 2002:a2e:97c8:0:b0:2b6:e6cc:9057 with SMTP id m8-20020a2e97c8000000b002b6e6cc9057mr3331155ljj.51.1691835204261; Sat, 12 Aug 2023 03:13:24 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:600c:6024:b0:3fe:1764:31a6 with SMTP id az36-20020a05600c602400b003fe176431a6ls993010wmb.2.-pod-prod-00-eu; Sat, 12 Aug 2023 03:13:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH7gP3HlZTS0txs//ZvVXvNKerlNBHDHbxNMeIHlZ0YbeEgM7dKCvn5BoWKoRS65CijaQBF X-Received: by 2002:a5d:6386:0:b0:317:dcdd:3fa1 with SMTP id p6-20020a5d6386000000b00317dcdd3fa1mr6103281wru.34.1691835202055; Sat, 12 Aug 2023 03:13:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1691835202; cv=pass; d=google.com; s=arc-20160816; b=kcJN/lG7lx/JUxGkQBYOeHMl3qCoXsX51qwJ8h1JRfbvi8qqsKaz86kHvoUSb7Qzmt 9Fc2zpBAumE9LnMYv1T9XoOMJt/ZcYNN1CSfHuEcuK60P+Xb3Zoe8bUYWh52tCZwuiPf 1v6xX4F5ChHx6+dfsGZ/eQ+YHbtXDRamyRYZK96Q7MEd0dPUsVeFD0kjVzY71zjn/OTc eyQYzE00LDg816+gksDIIg/jAB9ba9Hwm2S1foA89OKds5Ko8LC143s5e6IBq0laPZy5 7HxX6GC/NjTWcJoIRqCueRoKpuRAZjUaGKCKcg1ZHCNah8nJzKn96axjCuy+TK9BC6E+ j5sA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:to:content-language:subject :from:user-agent:date:message-id:dkim-signature; bh=hbQMvvYIxCG2qFvr9rkMe4jPmCnyjuYA/j37adeU4kU=; fh=Pax6ozv4yOFiGQ8+ZkC+rNKX7sUmjFhpVInBbGgbboM=; b=H3N22TtWPaBq6HgXq05YpERjNSfWLKynzChXYOpkuJ9QMzs+DJS888SjY485i/nki8 CEjXGsK3SmK3v2AqDFmwTwbst/mVZbUYazyxAjMGhJpJ2IIFC663l8HjpnHb0iPAZhj1 nPangC+XvvGvSRtEwxFXL32tPCxH5te2DjiZO71MCgujLqCh8n00kghUEm1xuGANibDW Jsueb1hGs6MThT6aVKd+1PWpXe7oVv4nqXzvisAND0bx19jdGY1lLSSDoeaU4qWbwLQY IXPR5T+AFpHtVD0Bf7YnaQjrl71SXalSDbNZb4BJ5JGxil/PBXECPuYEnHuumzhyYxrE gSZA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=OwG3zgLG; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7d00::60e as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2060e.outbound.protection.outlook.com. [2a01:111:f400:7d00::60e]) by gmr-mx.google.com with ESMTPS id fk12-20020a05600c0ccc00b003fe16346f71si905599wmb.1.2023.08.12.03.13.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Aug 2023 03:13:21 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7d00::60e as permitted sender) client-ip=2a01:111:f400:7d00::60e; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=selector2 header.b=OwG3zgLG; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of jan.kiszka@siemens.com designates 2a01:111:f400:7d00::60e as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eczRIlCz22rAxlp5rdcIhoxCuJpqNr4OFwBXhu9LHHZIrqQTKJaRO95G49nGyh02Hu4SzTWK05QwB4FjFUTHDEv6S8OTK+t4iTtexqO6DXihSu/T48stifponVXsWnhhA0bl76hdPKatlKvWDNyw1xdQaN7CthmIT6hQr6U8c3sOCyHO19KCa6ZEFP+PLzkDuzb1gbQqJcWRqZaSJ675feXmDb35RaeZ2DZGUZ0u2D/J+m1h24kOD+GZ23dRQMtkWNntJtsIu3M45r9DNigCmzLblm8CHX4awgQJSeh7mvl6m7Ry7rTLj4GrN/KPuhs7/UI6kFVdtN7k8BnhWTBXPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hbQMvvYIxCG2qFvr9rkMe4jPmCnyjuYA/j37adeU4kU=; b=RkXmBs0UYPmG4z/UBSm8CfWMAoFvq1F1nU7FosF8toXvTk3NtEv43Fm6rCMv7v3VY2f2jMsPBO0to/M8BN5XV4dyZjRBojNlA+i0Hv57oHDTqqugNjbUZBlaCGFrQlUBkE95uzGyD21+g9WnhMfDBNY0/Gxwg54GF5hrSBLMdIFffS4S5huEhPJwBABPTVS6RCUoPU402QWd9eF/AsCaZ06p5i5LzEh9cYOzT7MvqF1Y8C9F2qKDpDyCsfAitHUnrkuAna+zEdvdNXnCPQefrkF1PDJxg98kWNjR9Qjih3LjXxAjOSjmyVz6Y2KZCthcQAlbyH506/7la9wJxg9pIw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hbQMvvYIxCG2qFvr9rkMe4jPmCnyjuYA/j37adeU4kU=; b=OwG3zgLG/YcnVvdPuUWi9V2yHb1zlGbd9zJE7LmeXREVfowRvJ4SZMRuXNt7/EBTCtOYiUJf81fpTROyLdZKQkeMuQpwsswYCpVArJr+0x5rPBWlIh7fjUEQQJQBf/AH0gKEsLxNp3iCqwOODUu++vmK7g1gLEaGZuiDJ9rAE4qDCs0uLY2vMkLB+VM3khQB5TiStwsZaYjSpWDLC8Xm33RjKyinhpjwav/4k0zwrKH+Md5KYQkMNU5H+qiWxuqns/Rfno1AAMA+dYIoFYEXtJCiaHRX54lHZoOH34MZvTfwnUZlMjiOV8ok8BHERitSehKwDHjR/VcxXbhEy4HlLA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=siemens.com; Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) by VI1PR10MB3165.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:135::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.23; Sat, 12 Aug 2023 10:13:20 +0000 Received: from AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::7f20:d403:b43d:12e2]) by AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM ([fe80::7f20:d403:b43d:12e2%3]) with mapi id 15.20.6678.019; Sat, 12 Aug 2023 10:13:20 +0000 Message-ID: <84ae9868-09c2-486e-932f-f16c86483671@siemens.com> Date: Sat, 12 Aug 2023 12:13:17 +0200 User-Agent: Mozilla Thunderbird From: Jan Kiszka Subject: [PATCH] optee-ftpm: Improve parallel build fix patch Content-Language: en-US To: isar-users , Uladzimir Bely Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-ClientProxiedBy: FR0P281CA0153.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:b3::12) To AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:588::19) Return-Path: jan.kiszka@siemens.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS4PR10MB6181:EE_|VI1PR10MB3165:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a2fb15e-b536-43a3-c8c2-08db9b1cc0d6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: g+KA8F1BXvzBeBkdGFbBOvKSK34hHedHWFMgyvCGijBLiT4y+zDDw8lICPTKvWVEapb8MqDnpydGwPnm4caNZ84irxHNXZIiKhvkU2Qx0eDVvd+Z092RrmZhEgIV7IsH12id+hnhrEE5t2+Q51G2zUhb/w4F4NXuJ5s941qK7Io4QLKZukWKg9YOwtuPDCgzlMhEO6qJwogyRhKmyD/bVw6Dh2Cd2rG8xDm2lZw80a6LOXuqfYy5l4Le3egtiL15lUlIm90CoGdk08fqElbfyQdSz2QVg/rO7u18dc6OGA3Hqj5uvZ7DC9CHrLYC5pbFdXpNBwQjJYsuSuyGBecQS5O5bid/XhQ4Ewe+0dU+x63NIXXjRldmwnDWffmPuZ7UOr9H4k308H/yyWyLF856Vv0ORoBGmi4pOEvtonchOk9nBpCmLrHb/+8mdIj+Wln0RbQ4CDZdD3zCbMYQDu6y5t0+rMWlhj9xkhizLmXoYjJtPYD9AOB3hWPBWsl+Gmosb+larcxLKOfqoMT1b635VMWAc5iItnnynXaLlsQLb6rSXXP5OQSPyiVMNthTHBAUy9IgHfWQEXZ68BYmzOmnHXiXgRmttDe52i4Zoixrh3L5uDFDqnhAkFpf7vInRhKuRfWE8mIE1JPyrXTXbzfrVQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230028)(376002)(39860400002)(346002)(396003)(136003)(366004)(186006)(451199021)(1800799006)(38100700002)(82960400001)(36756003)(31696002)(86362001)(8936002)(8676002)(2616005)(44832011)(5660300002)(6512007)(83380400001)(2906002)(26005)(19627235002)(478600001)(316002)(66946007)(66476007)(66556008)(41300700001)(6486002)(6506007)(31686004)(110136005)(6666004)(43740500002)(45980500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZEIxRlNnZWsxZ3V3ak5tNEVqWFNxajFxK3JGZkp6MlhvOXRjVWhOYk1XWCtk?= =?utf-8?B?RzJoUTlJNTNzcC9tQjFoaWp3d2ljdUZrb1RxZFBxRVJ3SG45eTYwYVJkUjl5?= =?utf-8?B?ZjF1ak9LdEF5V01CNDg0bzNGQ2VkZjl3QXNWTmdFUzZLNU1LMytoeTR6akY4?= =?utf-8?B?VmZyUnJtdnRXWEhPQU9KN2NnWjVZcnQ4cmROOGlmU2dvSlJyV2R5ZEFmRjFa?= =?utf-8?B?NFo1TmNzWGdhSEFnbG1XV2ZxMlVrcjREbWNCc24wenJhSEhiVUZFNitYU3JZ?= =?utf-8?B?bjRQMktsWEp3N0hXaHVRV3JBQ3VTODN2V094eUVSc053QUh0ZnQ1U0NQckVk?= =?utf-8?B?cytxTHdQWlZZbHNUSm5ESDJmTUk1aVhMYTM5eVdOSEo3b3VuazIvZGE1QzN2?= =?utf-8?B?MFY0eVNVMlhHdVZpOHBJNFpWQW0reVJmRFltbHBOLzVWTFVDYWorVWI1R2tt?= =?utf-8?B?MVAzMVZJVEgxenF5S3YxREprSmNrZnlReW50VmpNak00TXBlYWVEbkkwMUNp?= =?utf-8?B?aWZNR2xnMDJrRkdaVHJpNmNkVUIwV0cwMnBaMGFJZHRxVjdiTzlnYkRCc21t?= =?utf-8?B?bFJIYjRMZVkybmhGWWlRbVYxRzk3UFJ4Nzl4M0FyQVpDVE5kYUhTQ0NPLzNa?= =?utf-8?B?em9jV0pnMEphbVNWWDVTL3A1S1ZkM0V3cEZObHhYOGtrZW9ramorRlh3eWVh?= =?utf-8?B?OEhIaHJQS3I5T3Fyd1RGSGJwQit6cGVpd3M2OXdEeTZEck1WRTVFcWVGS1NF?= =?utf-8?B?VzE1WmJBOEZqRFRvbFJoeXpabGsrQmkxZ01wR1I0NkE3bmtSUjc3WDE5bmls?= =?utf-8?B?eEJCVXlTOTcvbktWZ3FjVUkvZWJUWG9iQlIxL1g5YWtuZnlmT25WQmxqekNO?= =?utf-8?B?Q25RSE94SVpod1diZWdKd2RtL2greWI5RzVLWUhyaURJYklkV1R2WS81dVph?= =?utf-8?B?eXRsRS9ZQVRZdUczMUc0Ujd6VGJERWFCSFRQV0orOVl3dllLaGU3RVBNbDRM?= =?utf-8?B?Z3VCZDdTWkV5cGxZbU55YUNGc0RWeFRXOWxXL0tlQWVBdFA5VmFLN2hTR3ky?= =?utf-8?B?bkxnR3B1VjdjRml3d0t0OHBSRlZXZUYzS1RXQnVwTWdEMk1jZUwzS2ZQVStj?= =?utf-8?B?dklUNVJubWwxTTVZU1VCYVIzWWtxT1NkR2hremFFTFRnbzlnSmZnQ2xiNnFY?= =?utf-8?B?MUo0MXhNaWJDNStRWGZvdXdYcTFybkJ3cXZ2NmxWSzYrVURHWW1UN3l3WUxZ?= =?utf-8?B?S1VuZ29KRnFOU3NWMitLMHgrZjU0YTgweTVHSzM3YWx2VVRqL0ZOK3VqaitW?= =?utf-8?B?RUtPNGZiOEpmSFdvTU1VK3JkWmt6NUdiSFZoRXJkQm8wMHhLY3pkNFUwQmhq?= =?utf-8?B?M0hjZ3g1and2ZFpHdEE5WG5mMnh2T2VBVzFBNFh0dmVVWXdoRnBzRFRRSkE1?= =?utf-8?B?TVo4Ym1KcUQrZDRFYzk0bHVjcWkrWHAyai9YSlY2NnlYYkpjV3hPMEFoQWN3?= =?utf-8?B?bUJkMVIyc1J1MXhXT1dVcmJ2MUZTdjZVemJnaWVPYklhdGpLUTRtcURkQ3Fu?= =?utf-8?B?cGdBNW9EN3dZOWNESjhZM2lSVlNuT3dzVWpNNjhHM2JTVUV5d1NCY2dXSTFW?= =?utf-8?B?RmY5SmljOS82MEJLakY5TDUwSm5FMHNveE9LMzY3eEZNTy9xQkxKMVNPUFBM?= =?utf-8?B?M1VSOHJ1TDdURnV5Zjk1amZUdHhUdkF6ZjRMaHl2ZVZVQTJtVldjNlV2V0xM?= =?utf-8?B?RXRVQkNYTzNRYW81NStCL0RISXVScUtBdFFZSTJGTmE0djgrOWcrSCthMUZN?= =?utf-8?B?dTBQeGsyOVQ1NzMyZ3dWaVR4S2tNQ0xUdUV2WTNKTFFBUU9SWDFyVWpReCtV?= =?utf-8?B?REJJaUhpYVBHc2hocDBseE93ZlVBTFo2MzV1eXhxYlpKcWg2SE9LMFNtK09t?= =?utf-8?B?Q2NXamJsWmNsNkhRKyttd1lXYUFtdE8wV05qSmR3REFCSEozL0F5eFhxMTA2?= =?utf-8?B?RTd2ZlYxNVRMY0VNcFoxb1YxTXpLTVlvU2d2UXpTbFI1WkU0SEFBYkNVOGdi?= =?utf-8?B?QUNxVElsWmtFc3oxd0VrTTNrR1dFSkNtdm42YkJxOGRJQ2tSU2kwcTNnRmZx?= =?utf-8?B?MnRRVU02TFJFL3VBditONzVZL1RqV3d3djIyWE5NUnhsQ2VFVVMwdUdWWTYx?= =?utf-8?B?N1E9PQ==?= X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a2fb15e-b536-43a3-c8c2-08db9b1cc0d6 X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Aug 2023 10:13:20.1547 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: BOFW4RNd64Y63eVWGWGGNqtM4sv4624wW+VCmO614++SX8mXQTS4Xr6mvVy74TqLXIYylLdf+xTbdQLLaR6A0g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR10MB3165 X-TUID: SW3JpnyMDqPu From: Jan Kiszka The current version contains needless code duplication. Signed-off-by: Jan Kiszka --- .../0001-Fix-parallel-build-of-optee_ta.patch | 74 +++++++++++-------- 1 file changed, 45 insertions(+), 29 deletions(-) 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 index 383ef9f7..c1447cc1 100644 --- 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 @@ -1,11 +1,17 @@ -From ee13738d203aca490c0fb3d1f79cee1d8f9e0c88 Mon Sep 17 00:00:00 2001 -From: Uladzimir Bely -Date: Mon, 31 Jul 2023 14:42:52 +0300 +From f89333a5ee935c87a8c3ff7c72e100f59b03afbe 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 -TA devkit build system runs creating tpm and wolf symlinks in parallel -with building ftpm. This sometimes causes build fail: +The symlink must be established prio to building any of the source files +of the lib and 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' @@ -19,41 +25,51 @@ Establishing symlink. 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.... -It's easy to reproduce by adding a small sleep to the makefile rules -that create these symlinks just before 'ln -s' called. - -Signed-off-by: Uladzimir Bely +Signed-off-by: Jan Kiszka --- - Samples/ARM32-FirmwareTPM/optee_ta/Makefile | 1 + - Samples/ARM32-FirmwareTPM/optee_ta/fTPM/Makefile | 6 ++++++ - 2 files changed, 7 insertions(+) + Samples/ARM32-FirmwareTPM/optee_ta/Makefile | 9 ++++++++- + Samples/ARM32-FirmwareTPM/optee_ta/fTPM/sub.mk | 6 ------ + 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Samples/ARM32-FirmwareTPM/optee_ta/Makefile b/Samples/ARM32-FirmwareTPM/optee_ta/Makefile -index ddf6784..2053c01 100644 +index ddf6784..cef0c6f 100644 --- a/Samples/ARM32-FirmwareTPM/optee_ta/Makefile +++ b/Samples/ARM32-FirmwareTPM/optee_ta/Makefile -@@ -3,6 +3,7 @@ export V?=0 +@@ -3,8 +3,15 @@ export V?=0 .PHONY: all all: -+ $(MAKE) -C fTPM create_ftpm_lib_symlinks ++ # ++ # Link the required external code into the libraries folder. OP-TEE ++ # build does not work well when accessing anything below the root ++ # directory. Use symlinks to trick it. ++ # ++ $(MAKE) -C fTPM CROSS_COMPILE=$(TA_CROSS_COMPILE) create_lib_symlinks ++ # Run the actual build $(MAKE) -C fTPM CROSS_COMPILE=$(TA_CROSS_COMPILE) .PHONY: clean -diff --git a/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/Makefile b/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/Makefile -index c71eecd..2b4309c 100644 ---- a/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/Makefile -+++ b/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/Makefile -@@ -11,3 +11,9 @@ clean: clean_stripped_file - clean_stripped_file: - rm -f $(BINARY).stripped.elf + clean: +- $(MAKE) -C fTPM clean +\ No newline at end of file ++ $(MAKE) -C fTPM clean +diff --git a/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/sub.mk b/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/sub.mk +index 2d9ba24..4eaf286 100644 +--- a/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/sub.mk ++++ b/Samples/ARM32-FirmwareTPM/optee_ta/fTPM/sub.mk +@@ -36,12 +36,6 @@ cflags-y += -Os + cflags-y += -DNDEBUG + endif + +-# +-# Link the required external code into the libraries folder. OP-TEE build +-# does not work well when accessing anything below the root directory. Use +-# symlinks to trick it. +-# +-all: create_lib_symlinks + clean: clean_lib_symlinks -+.PHONY: create_ftpm_lib_symlinks -+create_ftpm_lib_symlinks: -+ @echo Establishing tpm_symlink. -+ ln -fs ../../$(TPM_ROOT) ./lib/tpm/tpm_symlink -+ @echo Establishing wolf_symlink. -+ ln -fs ../../$(WOLF_ROOT) ./lib/wolf/wolf_symlink + subdirs-y += lib -- -2.41.0 +2.35.3 -- 2.35.3