From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MSGID_FROM_MTA_HEADER,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 920BFC12002 for ; Wed, 21 Jul 2021 13:44:54 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1B0616100C for ; Wed, 21 Jul 2021 13:44:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1B0616100C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=oss.nxp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A023282C6B; Wed, 21 Jul 2021 15:44:15 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.b="XiQtmU+2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BF2A282C55; Wed, 21 Jul 2021 15:43:44 +0200 (CEST) Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-ve1eur02on060b.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe06::60b]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 33AA282C08 for ; Wed, 21 Jul 2021 15:43:39 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=oss.nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@oss.nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dyFNL6uMhkqS5yF70CC225j2NbGS0eg9vaMVts6aklxsDXD/8aijQwHVFEPYhnYaiOSfc24Af34SoY89paKtMUV+EIFzAbZbJfqJntc6BcZ2VV9BXElE17VUMz5weAFCzrm00dOJUKH8VApDUGuHPl+fWqMNlRCVI5Vv/+znDnsCAiYS043TJd8LafgLAUt2JmX+zCCNp92k58WPsFQHhft94eOilD18dcJ+iVz2kAryMFxL68sfRbX9Ba/R4pv7WXU0NweHaadaMZVtGKP7Mt3Il5uMzpLV8WpQRCQvcIEGs3SNlLHmlpKNOtJnncYcGs1sJShNSFdrk4HWOD52Qw== 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-SenderADCheck; bh=gtlbDrQYQzLfdYLmvg22EfHlPtZ8A7zdmoRi/ROIgtg=; b=eKG2mA2r6IL8FhPvatws5b1usehwtL3/ICiQd0ciEz6b61hJN91ptzLrn0yvO2DDhdYj8VG4SzZ9j86uPduxWVvMDCOBSWmTNlbzGl34FErys7z3oKpEwiesRAUCvY0n3Fth8dNPs10XIU2gZbwa6encwcT55GoK1J53LujJOJS/w200TKZc5fxIc2dM4FDTka57iA48H2QvhkIV8ErH6GyMFQnmswRzfOPhplPcYjWj19kSOV5JI7pT7l+Ukh890wnvV0tI8i/02CdKDsX2xP4f0dZS36eaahiTjWOy3RrDCcuBEUCn5p6aNcoc9uO7y++GptmsUJEml5AAlKk6Vw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gtlbDrQYQzLfdYLmvg22EfHlPtZ8A7zdmoRi/ROIgtg=; b=XiQtmU+2QC00R2syQqGOJV4hJi7Qffq1yRhcfMwRCvmTYdS3JcyU4S2YxFv15GS0L0vNCp0XAZ43P8aWza94NFEgooDSg8Vnd1i3kM/LFZ8MTFV2pYtZ9X/PmnACVEbi07AsrHaQCr5Kfy1EjH025uaIjbOFJ5EZ/4RiXv9jmVo= Authentication-Results: denx.de; dkim=none (message not signed) header.d=none;denx.de; dmarc=none action=none header.from=oss.nxp.com; Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) by DB8PR04MB5802.eurprd04.prod.outlook.com (2603:10a6:10:a4::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4352.24; Wed, 21 Jul 2021 13:43:36 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c445:d742:eb76:86dd]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c445:d742:eb76:86dd%9]) with mapi id 15.20.4331.034; Wed, 21 Jul 2021 13:43:36 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li , Peng Fan Subject: [PATCH V4 08/44] arm: imx8: Move container image header file to mach-imx Date: Wed, 21 Jul 2021 22:16:49 +0800 Message-Id: <20210721141725.23346-9-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210721141725.23346-1-peng.fan@oss.nxp.com> References: <20210721141725.23346-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR0401CA0015.apcprd04.prod.outlook.com (2603:1096:3:1::25) To DB6PR0402MB2760.eurprd04.prod.outlook.com (2603:10a6:4:a1::14) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from linux-1xn6.ap.freescale.net (119.31.174.71) by SG2PR0401CA0015.apcprd04.prod.outlook.com (2603:1096:3:1::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21 via Frontend Transport; Wed, 21 Jul 2021 13:43:34 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dd0e8db2-bea2-4f17-6ae6-08d94c4d8a10 X-MS-TrafficTypeDiagnostic: DB8PR04MB5802: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:800; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rK0WSVSgrui89NQDkXNNcW9hZngzg8HXAg54C1tqnWUh4jOiRalEHXfCAoWqQAC8C58xejVu362Kh0yHxKZASO4ePJZOMzD25BlTjge0X9MQuhEhBtFolm/VXArVIRzqfNO9Z7+fNLAe43xzEzMWtr08ZDlsy2DS+ZA7Z7ia8NsTqeoUtQu69/hbEI2VXogSxBnWpghnR/0ig+TBU9WyKLGc3+ROWIBq+C/TWuGAR6vJi3aikv45WZpClVCpMqs5HMpIhxzopPiJjx1nQy6F59o1senBg7mZYSycsrxs+Kqvv3effvLraJE+0lzu1itZp+R38pMi97CsCadvjBLtabTm3oyziON7ffE0JjsZsci/yn34mEmr8MS0b34lZoI9P8JKaST3oE726mw7/dpC7MnnXOcLgO1ttgHQrjwOaWnswZaDbtoguYNal+rgtrnBXDw7LLjlwv/Tb7Y2Tq+odxZcJp6UXjV1JxWC1velYDuNAspSH7DSqODbI3ZkbHzSoG82sozJcUAUSg9q5wDJclqGsIU13JkH5LqJwlc1WzaFXM32Lo2msP60vJLb/52hwk7nBW/UhYoMIlXC7NPk8xX9LsuUKVBx/TFPkXu3UERmp9JX+kn1ZGPk+VSfyh5YhCT0ACQ9Xk3QfJkOmk6S4+WB3O9+lp5I6OCyh34zjwxSPSnh2X74wBHPS3mLa6VbqtoxbXE/UqsOI9/xes7lnw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0402MB2760.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(376002)(39860400002)(396003)(346002)(136003)(6666004)(8936002)(6512007)(4326008)(5660300002)(8676002)(2906002)(54906003)(1076003)(38350700002)(38100700002)(956004)(66556008)(66476007)(66946007)(316002)(86362001)(6486002)(26005)(83380400001)(52116002)(2616005)(186003)(6506007)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZHoPQV8ww2DgQl+w8wIFPUFSsdscVwNogFrYyznOJ7p6VXXasoEaaoVzTSQw?= =?us-ascii?Q?FlkwxjJGZBNDwlz8R4YH8/4kHcdogKhqBl/TQc8yUoJq58PaeUmSsDeevWOk?= =?us-ascii?Q?n2cSyHBC1OJZPEof6awogKuJFBL09c8shdpudkVXhGNK2eW/Z9Z7eeTCdc8f?= =?us-ascii?Q?YPBOcK84ZbXTpMgyWxFrhwpAQU+rU6Vaak1ty7W6gDhQCSX9ETdbsyzZ4BLT?= =?us-ascii?Q?+F12sH9zOpI1A+NDAwWNietCRWDL8Yh0CpVJtQpYLMDazjVaHZIjq6jRRu3K?= =?us-ascii?Q?n/ejgmZA1SmeaI27p6xPFp98c0lsRqRTPdS435zOn6f2/DNMrJCY4lbuollA?= =?us-ascii?Q?qoJCTkvGnAjkcOcAcfBq6JkeG5RgX44AmSwKAzDv3AVtuDOu2CHnA8wTESqX?= =?us-ascii?Q?jSmjrZ7YbCINWXiFFnvDSY6CbggYGhLLa7us3mcHBnMJI77jCeTuuBEP1W8c?= =?us-ascii?Q?NYggZyZmowayMYT21vC0qA5CC0H6P4xJHJ+wyPVk2pB89peOaKDCiqJ02D3u?= =?us-ascii?Q?IimfSKfy23NkEDGCB0vbokskWqm8e6dRzvmlsyyuV8zaTy7GB3HsFgNMsVR2?= =?us-ascii?Q?Rn5P+D9bg7Fktb5zQbIcLmKKkmFiQwwq671xtehK5yjCCT8VQJFYjr4qzU83?= =?us-ascii?Q?JcLgsgQoZl+60lMBDtjv4VTnE6UWr/JG2dEmUD/4+79by3+Qz38suWxJYBai?= =?us-ascii?Q?ETjOY6ppN6mhGg7A/i9lTNdNwSHrEshryM5tm1AiX+rujEffUZj4fS2KhWZI?= =?us-ascii?Q?UNAl6pNCxznyr16LT2esZPfyFL5DNYWm219foQIPHyeUbLnmH54M3kpxDDxu?= =?us-ascii?Q?22P5FitGHUkR7Y4WaXq/EVls1sKKW2xuYtL9W71CE61n7tHZmApqZm93heNt?= =?us-ascii?Q?dO+lgoSqNv2nQjGqdONxwUMbPK1e2DiMnzZWFYt2t1FiQftEATFMwL7Zi1VF?= =?us-ascii?Q?BRf/ojm/0cdzpvMSaF/dXKEi15MvNbCr1mTpymrBznuC8bMd1711Ve8QwUwT?= =?us-ascii?Q?3lkfIc8qDuJA2Q4hsqvjQ4vFQVyWaY6iHSMoQPKNXVX5DWX+ugli0nj0HIcp?= =?us-ascii?Q?Pte1NlrBQQ8R7Z1pu74u2r0E68L6vBRevkpqWWD6qJExyXe6hyxu+hHf16aP?= =?us-ascii?Q?IgCvqI+7XiNUVpcLm5/5KPAYccyJkq2N9pxlFSv8AMSj4CzEPAyhQKawaNRB?= =?us-ascii?Q?QK3974t4NXiBMHwXqFEyR4SoHQEiT3zdBXfxNwCR1UjWlju+HNgFMSprKgXC?= =?us-ascii?Q?Ws/+xIzQIDYgjNd2JlE/PBTRQsm5a+wo9Ugm5E7QrxytW0erGzpED88v4Md/?= =?us-ascii?Q?Fdfg/TOPiLmeC30rd9B8qXfy?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: dd0e8db2-bea2-4f17-6ae6-08d94c4d8a10 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jul 2021 13:43:36.4629 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FHVGLdK3a1bK/8VOyndCpJnMsZaT8GsuwicR5v27MkjlO1d72cYS4vZSnfXXrqihOdCAwe1rmwAr2dad0c1BSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB5802 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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.2 at phobos.denx.de X-Virus-Status: Clean From: Ye Li Since the container is shared among i.MX platforms, move its header file to mach-imx Signed-off-by: Ye Li Signed-off-by: Peng Fan --- arch/arm/include/asm/{arch-imx8 => mach-imx}/image.h | 0 arch/arm/mach-imx/cmd_dek.c | 2 +- arch/arm/mach-imx/image-container.c | 2 +- arch/arm/mach-imx/imx8/ahab.c | 2 +- arch/arm/mach-imx/parse-container.c | 2 +- 5 files changed, 4 insertions(+), 4 deletions(-) rename arch/arm/include/asm/{arch-imx8 => mach-imx}/image.h (100%) diff --git a/arch/arm/include/asm/arch-imx8/image.h b/arch/arm/include/asm/mach-imx/image.h similarity index 100% rename from arch/arm/include/asm/arch-imx8/image.h rename to arch/arm/include/asm/mach-imx/image.h diff --git a/arch/arm/mach-imx/cmd_dek.c b/arch/arm/mach-imx/cmd_dek.c index b10ead1942..b81c24d7ef 100644 --- a/arch/arm/mach-imx/cmd_dek.c +++ b/arch/arm/mach-imx/cmd_dek.c @@ -17,7 +17,7 @@ #include #ifdef CONFIG_IMX_SECO_DEK_ENCAP #include -#include +#include #endif #include diff --git a/arch/arm/mach-imx/image-container.c b/arch/arm/mach-imx/image-container.c index 5abc0d3a39..9e18f6630f 100644 --- a/arch/arm/mach-imx/image-container.c +++ b/arch/arm/mach-imx/image-container.c @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/arm/mach-imx/imx8/ahab.c b/arch/arm/mach-imx/imx8/ahab.c index 6392fe267a..39721b0ac0 100644 --- a/arch/arm/mach-imx/imx8/ahab.c +++ b/arch/arm/mach-imx/imx8/ahab.c @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include diff --git a/arch/arm/mach-imx/parse-container.c b/arch/arm/mach-imx/parse-container.c index 375098902f..e4354bf930 100644 --- a/arch/arm/mach-imx/parse-container.c +++ b/arch/arm/mach-imx/parse-container.c @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #define SEC_SECURE_RAM_BASE 0x31800000UL -- 2.30.0