From patchwork Mon May 16 08:21:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Bedel, Alban" X-Patchwork-Id: 1631339 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=l2task.onmicrosoft.com header.i=@l2task.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-l2task-onmicrosoft-com header.b=US8DScjZ; dkim=fail reason="signature verification failed" (1024-bit key) header.d=l2task.onmicrosoft.com header.i=@l2task.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-l2task-onmicrosoft-com header.b=hIqaa4gi; dkim=pass (2048-bit key; unprotected) header.d=aerq.com header.i=@aerq.com header.a=rsa-sha256 header.s=hse1 header.b=SsrP0HOQ; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L1sjQ6Krvz9s5V for ; Mon, 16 May 2022 18:24:10 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CE0E4840DE; Mon, 16 May 2022 10:23:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=aerq.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=l2task.onmicrosoft.com header.i=@l2task.onmicrosoft.com header.b="US8DScjZ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=l2task.onmicrosoft.com header.i=@l2task.onmicrosoft.com header.b="hIqaa4gi"; dkim=pass (2048-bit key; unprotected) header.d=aerq.com header.i=@aerq.com header.b="SsrP0HOQ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 507B984216; Mon, 16 May 2022 10:23:31 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.2 Received: from mx-relay22-hz1.antispameurope.com (mx-relay22-hz1.antispameurope.com [94.100.132.222]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 1C1DF840E7 for ; Mon, 16 May 2022 10:23:20 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=quarantine dis=none) header.from=aerq.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=alban.bedel@aerq.com Received: from mail-ve1eur03lp2059.outbound.protection.outlook.com ([104.47.9.59]) by mx-relay22-hz1.antispameurope.com; Mon, 16 May 2022 10:23:16 +0200 ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=fail; b=MVbf1qdkIcG50Rivm8k3fUkYcbjk7tlDoVg9U52JxO/A2XNNwk5O4jD1ECRfC5ct3GCzNCY3VCREInNGv+Q23sdPrwpIxvGG0LOXAT5CJHx45YvU14E8Fivd1JYAQ4uJeoaQNkC5EDWh/gJOfnESXb5ohTMkimO9QpbgJQDHuvyW8TIPpbEsIkOyZl3pMURi4SeYaCpH0UjglhgnexmXoqFoQQ+bGmAswRq+Q+urkM1NUWvFz/PhUdihzb7Zi6BJcge86puf94hwroGtzWmMjg2y8tEyeJObQuIbfDteXQ/gNCPzLrXuEIkDDHIn38phzomopBrGYQgS0ZkxxV3fGg== ARC-Message-Signature: i=2; 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=VVY/ELeenmiyqoBOQNImsoPA/G1bpRma/XIPz7zrHaA=; b=EOTFn7m9mOREhwaI2CSpZk6NVOOAc2+qAbnROjw9s/Cryv/QNBieR2XslmaJnh8qdzFDVz0yGvRUfwUqE4EFmU8R5wlo31ucquV6QgZX3bQvZLlBq6qRl4E/IkSKWdVh4b8tfH/6zVlxm1OEu5GMeSi0LS/MZ82OFlHOHqA5+HA55lkJnErDeg/HkxXdLdUpBNCYtShLjnMjMkq3bjLpwBcFS3yIemIF16JG0Hoii7c5sLfH9UTGOcenvNRcZyov4i8hCqul9lU+o8EVEWZYz4xcqc/2uMXbMbhl1pa/AGQPRacPG72pqOJmB2CD/dsVcZZroLJJaAAJC1FAKFs/3A== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=softfail (sender ip is 52.169.0.179) smtp.rcpttodomain=lists.denx.de smtp.mailfrom=aerq.com; dmarc=fail (p=quarantine sp=quarantine pct=100) action=quarantine header.from=aerq.com; dkim=fail (body hash did not verify) header.d=l2task.onmicrosoft.com; arc=fail (47) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=l2task.onmicrosoft.com; s=selector1-l2task-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VVY/ELeenmiyqoBOQNImsoPA/G1bpRma/XIPz7zrHaA=; b=US8DScjZkyCYDAC1+q9IsNMbnPGjOQMBy2yCU2TlNWoYUXiA8EQDSDhpGIyHBFfdIznklRBSl5abRwR4LODxUcFZFu5AWIMyBypjoz+xFD6K8WrQgJSOiOg1qTBPt+kr6ZvEUjJVTTJGLkLCgql+OMqlKnyUbMLytREa0iZQKAg= Received: from DU2PR04CA0176.eurprd04.prod.outlook.com (2603:10a6:10:2b0::31) by VE1PR10MB3008.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:108::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13; Mon, 16 May 2022 08:22:51 +0000 Received: from DBAEUR03FT030.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:2b0:cafe::ac) by DU2PR04CA0176.outlook.office365.com (2603:10a6:10:2b0::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18 via Frontend Transport; Mon, 16 May 2022 08:22:51 +0000 X-MS-Exchange-Authentication-Results: spf=softfail (sender IP is 52.169.0.179) smtp.mailfrom=aerq.com; dkim=fail (body hash did not verify) header.d=l2task.onmicrosoft.com;dmarc=fail action=quarantine header.from=aerq.com; Received-SPF: SoftFail (protection.outlook.com: domain of transitioning aerq.com discourages use of 52.169.0.179 as permitted sender) Received: from eu2.smtp.exclaimer.net (52.169.0.179) by DBAEUR03FT030.mail.protection.outlook.com (100.127.142.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5250.13 via Frontend Transport; Mon, 16 May 2022 08:22:50 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (104.47.13.56) by eu2.smtp.exclaimer.net (52.169.0.179) with Exclaimer Signature Manager ESMTP Proxy eu2.smtp.exclaimer.net (tlsversion=TLS12, tlscipher=TLS_ECDHE_WITH_AES256_SHA384); Mon, 16 May 2022 08:22:51 +0000 X-ExclaimerHostedSignatures-MessageProcessed: true X-ExclaimerProxyLatency: 17699016 X-ExclaimerImprintLatency: 2051032 X-ExclaimerImprintAction: c73ec3f0f053432fb236f809e556caff ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iQTkcZa7GY9gGFrKwlbMGz/mKhuRqqqc5SwCmXXfPWKiWoHeRAP3poA9lH6PYsR3M8Llwzv9LiaO0EGAjyHpUMXr+hpiLMpZ8BMoRHc8tI/Uqyv6lY5T3eBIqsbcYtG2wd4PAErncVQfdL9dbT2nAgGq6tIitipdfSOiAHOrFiVGWRzFB+RaRTxJRQRk1ZRmlZQnoPYyf5G/aVB10QQUIiGPPAiZXDTEGC1pUT3t0im4+RFFpMzU+AcXPeILT80rMNmfmBFvZ2LG5VN4Ciwh3+JOThdnQjnxHAC5AC5NcXwayfUc99wYOL7zmpN++AxvKdVrp/NwSKyLzDy6vOCL6g== 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=9kJLa0f3r506mT4m1ZDd6wc44Zsb78UUn6dFdv+LbZI=; b=bsoWEs0PRY38q5RiAZcXYZWGHrEDi51vQ4H0jJoyxs84HcE1FWrsH3svAMJeplldD7zUuNdBd6/DM1XbpShQ8Lz5dVJx+3pRMbRxSFYJ8sMbz1SJoroLj0uvVfAJepEjT59ZFle9ugSTaPLh1DNED4S4442Li6hJPz7eOfdoHZ+lsoDMA9xY0shfPjzLNiOpb/uYEuprcZkrzg7vZdor5coTIfwLaX+IY7fATPuWBPQFalq0fqZ8HM+M18PLLqg433doWQnobpgWhHTYkJv0JHRrWC0yRkLdsQuoIMlSA5RkneQLwBAJ0ufgjFLiceihqHOeVkbZydA3KSFtNKdd1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=aerq.com; dmarc=pass action=none header.from=aerq.com; dkim=pass header.d=aerq.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=l2task.onmicrosoft.com; s=selector1-l2task-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9kJLa0f3r506mT4m1ZDd6wc44Zsb78UUn6dFdv+LbZI=; b=hIqaa4gi9zl3conr/sZA5kFmnivYuhfajuoWgHlOTqlKt+zi+n+Ngg/Q1LrNIv4RUmAkMAMWlTKcorqfW51EIzNiNXNa6eJZoY2leO04F466cc72pMJT/VUDuq3VKOB4/vulmuvQAK6ld2sb7Y//F8kLxJwJ+aZT/Bt1yqy4bbs= Authentication-Results-Original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=aerq.com; Received: from AS8PR10MB5000.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:405::24) by VE1PR10MB3101.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:803:105::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.17; Mon, 16 May 2022 08:22:41 +0000 Received: from AS8PR10MB5000.EURPRD10.PROD.OUTLOOK.COM ([fe80::cc70:6b36:244:dd5c]) by AS8PR10MB5000.EURPRD10.PROD.OUTLOOK.COM ([fe80::cc70:6b36:244:dd5c%6]) with mapi id 15.20.5250.018; Mon, 16 May 2022 08:22:41 +0000 From: Alban Bedel To: u-boot@lists.denx.de CC: Stefano Babic , Fabio Estevam , "NXP i.MX U-Boot Team" , Marcel Ziswiler , Oliver Graute , Anatolij Gustschin , Peng Fan , Jens Wiklander , "Bryan O'Donoghue" , Alban Bedel , Marek Vasut , Ye Li , Frieder Schrempf , Ricardo Salveti , Michael Trimarchi Subject: [PATCH 3/3] imx8: Use the optee lib to add the optee firmware node to the FDT Date: Mon, 16 May 2022 10:21:39 +0200 Message-ID: <20220516082139.26090-4-alban.bedel@aerq.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220516082139.26090-1-alban.bedel@aerq.com> References: <20220516082139.26090-1-alban.bedel@aerq.com> X-ClientProxiedBy: AM6PR08CA0025.eurprd08.prod.outlook.com (2603:10a6:20b:c0::13) To AS8PR10MB5000.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:405::24) X-MS-Office365-Filtering-Correlation-Id: 31cce544-9139-443f-a39b-08da371544ef X-MS-TrafficTypeDiagnostic: VE1PR10MB3101:EE_|DBAEUR03FT030:EE_|VE1PR10MB3008:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: faW1vfgn18Y4A3I8Zc9yy7kus1xqfLVgu3Co4nYYWG9tpIg8Y1Oup8gxMBQGovhFmDUItrIqHqLc5hdrBtzZ+ym2XmD7YPTD4AuKfmdHBmG39ItpSplFLa/tBHIzz62YTkGBUvbJ+jFSBNzwgKbdR4d8ESP6rYUUmIgMjz04X7elC9YpTs2TrkeszV7hqv4rJG2u4ERVnyYNhIKPzKwGV/2qvVjwVmwNtQcvoDNoPO+xnLH6VQ25r+cqydVo95P/GDMcjQtOVgHkF4EXeIb4RAmh0DMbSV9jgD72O0FjcfLdGOXzwMTpF9Pld4ZXUvXiP1pP7mfWxPS4l0nkI+MEgNwFPxw7KDUlTm8FaYeWViqHOHbnKiT4ErlN5EegFY3696J8vRhE2EvT5igovAtuUdm80P2J1wQHrGfxG47573esPxgjbBUxv9IpaNFednG54kwMjC2IcVVqgnuQ2Hssl1upoQ+jlHI8UivVMN5U+cVpq5ECWbm72dEi5t+lFum3cUefLPfT8NWZGvh3XYAhegJK0nHhl/NTU4/4CcqInCgHVAAPn/Blk3ljbSTTwUzlS7n41285Q8W2OeXJGrwh1iF0EDMUFui8+BGLO58sGT+qAu0+zgQSXwo2D0MOmbvX2c6F+9OAmNoXfzt9Jc8SDQ== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AS8PR10MB5000.EURPRD10.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(6512007)(2906002)(1076003)(6486002)(54906003)(186003)(6916009)(6506007)(83380400001)(508600001)(8936002)(44832011)(66946007)(66556008)(7416002)(316002)(36756003)(2616005)(5660300002)(82960400001)(66476007)(52116002)(8676002)(4326008)(86362001)(38100700002); DIR:OUT; SFP:1102; X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR10MB3101 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DBAEUR03FT030.eop-EUR03.prod.protection.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id-Prvs: 74ce76ba-e63c-41f8-4541-08da37153ea5 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cRm3oYVVbzc/J8q9EXRn235aFoQarRCViYBriXY3AbYyWaJuf+sYltMzGUcAXVNwndIEAvIGk4w34MX8R64pkKwAeHtim6Rk1+j7D/PL+xGiOOBbIftBQbwhrudPZzt4xTu1HUso/xvot2vk8Do8wVHNzQS58BEaSgm8MwqeNbmW8k7Sn/UY4/omDvYybbr+xShG8W5lmsMM3rxE9+I9ggx82T44WJzDvu+G2pw2mhPLcgDQbSK/aM9fEqSCoidi0jX3n8amI8uBZvtKLt0nEmHtmZWxqSbjeXKDkI3iaBojvQ27Qf8W519ZDZWg8HaYGbMc8fP7WdPDqVt4FYWflTB4+k3/EhKyAfgoxS+sDfe4dTdG+PYdk2NLVzgpAVCpEVzHZyeQq5olDJH5u4jcLEGlMHWzarKTu5bQm6noFMcAkWa7WtRAdDh6FMWAUm/5489HrTatnM/MsJZHCXigw4iWns1QGdjOvumFuAMRlt9c1cZI8wwpAhp4l49XiC5/fbcE0/rBOntwSuNjul55j+be8sjhySLq3oYfhPEIni1G4qiZMG8ZWUEFLoeQCzGVRWX/h2aTd9JCxQcCj1DowssqNsQUdScdAyFkxjR5aRowNVzh3nrEkGbbrluSEI/7jbFmEk/5AIjcFazETjrNLw== X-Forefront-Antispam-Report: CIP:52.169.0.179; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:eu2.smtp.exclaimer.net; PTR:eu2.smtp.exclaimer.net; CAT:NONE; SFS:(13230001)(4636009)(46966006)(36840700001)(8936002)(6486002)(508600001)(36860700001)(26005)(82310400005)(83380400001)(86362001)(6506007)(6512007)(36756003)(54906003)(6916009)(316002)(336012)(47076005)(70586007)(70206006)(8676002)(186003)(4326008)(1076003)(2616005)(44832011)(82960400001)(2906002)(356005)(5660300002)(7636003)(7596003)(7416002); DIR:OUT; SFP:1102; X-OriginatorOrg: aerq.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2022 08:22:50.1119 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 31cce544-9139-443f-a39b-08da371544ef X-MS-Exchange-CrossTenant-Id: bf24ff3e-ad0a-4c79-a44a-df7092489e22 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=bf24ff3e-ad0a-4c79-a44a-df7092489e22; Ip=[52.169.0.179]; Helo=[eu2.smtp.exclaimer.net] X-MS-Exchange-CrossTenant-AuthSource: DBAEUR03FT030.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR10MB3008 MIME-Version: 1.0 X-cloud-security-sender: alban.bedel@aerq.com X-cloud-security-recipient: u-boot@lists.denx.de X-cloud-security-crypt: load encryption module X-cloud-security-crypt-policy: TRYSMIME X-cloud-security-Mailarchiv: E-Mail archived for: alban.bedel@aerq.com X-cloud-security-Mailarchivtype: outbound X-cloud-security-Virusscan: CLEAN X-cloud-security-disclaimer: This E-Mail was scanned by E-Mailservice on mx-relay22-hz1.antispameurope.com with 7F4A8E400B3 X-cloud-security-connect: mail-ve1eur03lp2059.outbound.protection.outlook.com[104.47.9.59], TLS=1, IP=104.47.9.59 X-cloud-security-Digest: 71ccad6e95a8109041f78baca52bc0b5 X-cloud-security-crypt: smime sign status=06 sign_complete X-cloud-security: scantime:1.667 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=aerq.com; h=from:to:cc :subject:date:message-id:in-reply-to:references :content-transfer-encoding:mime-version:content-type; s=hse1; bh=GLZcPxV8MF0nr9yPH5xhuBITzpDVJT++nEdxLtKcQSA=; b=SsrP0HOQWFd7 0aaHPfMKov4lOgS33mladECZLg+ls34SEqLjvnqs/1LlNJuwVYHRX/JCnvOr1l1j Pan4fzUEB1si+C3gt6Diupa2PetPyU63+eVbMRawWltutt1tJiGwGhQY1J12NRTu 8N35Qda/91sopzfcXuV1Cv+88BExT1VdIlPySZtnm3XANK92uOju6RH8upjSRnsW oE1/d5LX1S/njbFhIZ3NOG15jqAcvRHzIZ4O9Gn36jkWg7kYcxMzc0cT5oXFYncS c5wUk6fG7TqBIR0KUrDTQkQBZ0HIt2NEKIp8d10sLSDLOMeG4cawfMeNvlecPtlu x6G3rvCSGg== X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean Use the function provided by the optee lib to add the firmware node to the FDT. Enable the optee lib on all imx8 defconfig to keep the same behavior. Signed-off-by: Alban Bedel --- arch/arm/mach-imx/imx8/fdt.c | 59 ++++---------------------- configs/apalis-imx8_defconfig | 1 + configs/cgtqmx8_defconfig | 1 + configs/colibri-imx8x_defconfig | 1 + configs/deneb_defconfig | 1 + configs/giedi_defconfig | 1 + configs/imx8qm_mek_defconfig | 1 + configs/imx8qm_rom7720_a1_4G_defconfig | 1 + configs/imx8qxp_mek_defconfig | 1 + 9 files changed, 16 insertions(+), 51 deletions(-) diff --git a/arch/arm/mach-imx/imx8/fdt.c b/arch/arm/mach-imx/imx8/fdt.c index a132ce2e6a3a..60d6a6bb85b8 100644 --- a/arch/arm/mach-imx/imx8/fdt.c +++ b/arch/arm/mach-imx/imx8/fdt.c @@ -11,6 +11,7 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; @@ -229,56 +230,6 @@ static int config_smmu_fdt(void *blob) return 0; } -static int ft_add_optee_node(void *fdt, struct bd_info *bd) -{ - const char *path, *subpath; - int offs; - - /* - * No TEE space allocated indicating no TEE running, so no - * need to add optee node in dts - */ - if (!boot_pointer[1]) - return 0; - - offs = fdt_increase_size(fdt, 512); - if (offs) { - printf("No Space for dtb\n"); - return 1; - } - - path = "/firmware"; - offs = fdt_path_offset(fdt, path); - if (offs < 0) { - path = "/"; - offs = fdt_path_offset(fdt, path); - - if (offs < 0) { - printf("Could not find root node.\n"); - return offs; - } - - subpath = "firmware"; - offs = fdt_add_subnode(fdt, offs, subpath); - if (offs < 0) { - printf("Could not create %s node.\n", subpath); - return offs; - } - } - - subpath = "optee"; - offs = fdt_add_subnode(fdt, offs, subpath); - if (offs < 0) { - printf("Could not create %s node.\n", subpath); - return offs; - } - - fdt_setprop_string(fdt, offs, "compatible", "linaro,optee-tz"); - fdt_setprop_string(fdt, offs, "method", "smc"); - - return 0; -} - int ft_system_setup(void *blob, struct bd_info *bd) { int ret; @@ -300,5 +251,11 @@ int ft_system_setup(void *blob, struct bd_info *bd) return ret; } - return ft_add_optee_node(blob, bd); + if (boot_pointer[1]) { + ret = optee_add_firmware_node(blob, "linaro,optee-tz", "smc"); + if (ret) + return ret; + } + + return 0; } diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig index beb20f6e1c01..f3dbb4bd9c19 100644 --- a/configs/apalis-imx8_defconfig +++ b/configs/apalis-imx8_defconfig @@ -72,3 +72,4 @@ CONFIG_FSL_LPUART=y CONFIG_DM_THERMAL=y CONFIG_IMX_SCU_THERMAL=y # CONFIG_EFI_LOADER is not set +CONFIG_OPTEE_LIB=y diff --git a/configs/cgtqmx8_defconfig b/configs/cgtqmx8_defconfig index 2cf882f826ab..ac251f37fed5 100644 --- a/configs/cgtqmx8_defconfig +++ b/configs/cgtqmx8_defconfig @@ -90,3 +90,4 @@ CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y CONFIG_SPL_TINY_MEMSET=y # CONFIG_EFI_LOADER is not set +CONFIG_OPTEE_LIB=y diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index 0c9d6b64c1b6..f37da2411b04 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -70,3 +70,4 @@ CONFIG_FSL_LPUART=y CONFIG_DM_THERMAL=y CONFIG_IMX_SCU_THERMAL=y # CONFIG_EFI_LOADER is not set +CONFIG_OPTEE_LIB=y diff --git a/configs/deneb_defconfig b/configs/deneb_defconfig index 425fff6c70a6..e8f8cd18cacf 100644 --- a/configs/deneb_defconfig +++ b/configs/deneb_defconfig @@ -114,3 +114,4 @@ CONFIG_IMX_SCU_THERMAL=y # CONFIG_SPL_WDT is not set CONFIG_SPL_TINY_MEMSET=y # CONFIG_EFI_LOADER is not set +CONFIG_OPTEE_LIB=y diff --git a/configs/giedi_defconfig b/configs/giedi_defconfig index 4fbf7ebdcd95..7ee50e1f45c5 100644 --- a/configs/giedi_defconfig +++ b/configs/giedi_defconfig @@ -114,3 +114,4 @@ CONFIG_IMX_SCU_THERMAL=y # CONFIG_SPL_WDT is not set CONFIG_SPL_TINY_MEMSET=y # CONFIG_EFI_LOADER is not set +CONFIG_OPTEE_LIB=y diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig index 2e42872f843d..10b61d62a821 100644 --- a/configs/imx8qm_mek_defconfig +++ b/configs/imx8qm_mek_defconfig @@ -91,3 +91,4 @@ CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y CONFIG_SPL_TINY_MEMSET=y # CONFIG_EFI_LOADER is not set +CONFIG_OPTEE_LIB=y diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index d9997cfa8280..dc94fc67261c 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -86,3 +86,4 @@ CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y CONFIG_SPL_TINY_MEMSET=y # CONFIG_EFI_LOADER is not set +CONFIG_OPTEE_LIB=y diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index 43f42f7a58af..250ce43758cf 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -94,3 +94,4 @@ CONFIG_DM_THERMAL=y CONFIG_IMX_SCU_THERMAL=y CONFIG_SPL_TINY_MEMSET=y # CONFIG_EFI_LOADER is not set +CONFIG_OPTEE_LIB=y