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.7 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 533D3C636C9 for ; Mon, 19 Jul 2021 07:15:04 +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 9E0FD61019 for ; Mon, 19 Jul 2021 07:15:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E0FD61019 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 5532682C46; Mon, 19 Jul 2021 09:14:20 +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="BaQiEZ47"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 8592082C11; Mon, 19 Jul 2021 09:13:57 +0200 (CEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20601.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::601]) (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 0AE6882C11 for ; Mon, 19 Jul 2021 09:13:54 +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=WVf0eiaEw0D4TrFJmVp/DxJdWsMErV1hOcpIxg98Rg+59+qyT+8WijOYcaOZLfL5PcAgxf7WofWrw1g6abdlre+o5Y/lc95YrTbj5e0X64BBOMPZvGyfjMxiUo8qcihoLA/4wH/xVUi12VJfI+gys4rIiC8MDkzIKlKZk14+PRin+OvCZDXXQeNVwU9TBlUSagdHfh2vNVBuvOpcb4QyoGbUWrbb6dD9ujDeKAjsWPepZACE0WbOCX1CVW/iB3EFfFHjI9ya2KQXTL8XCadD4ohLIAKEDlbIPNRqsJ0DscnsKvfxxHydyCHrT/Ja3s7p8Pnrou2NJRNc3RmpP5ckJg== 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=BzgwzLjeIyN25uzv+uM61MsXK495p1BdzWXPs5irOevV4y2KgdaA5kcOcKqfkyNnvsCXr49zPMxfzIPcuyPgWvcDi5IjFdSqai37i45pOp+lR5Y5NGi9bE9xHF2QUtlof6p3HqyoQ99TxjWqgMfZlwYL2w1ozwhaHHZG7FSz6BJx7r4PJ+83AXx/rQva0h7LsJWqoV7+WNgfQSiWlRm3k1w37n6WdErb8iUipVBFCcP7zBKnf/W5lK1GfUbkUEHeZggQ3n7uIjQP6a7XvSo+yYSNNSFwX5I43e1ucupBt47kFtu0sbvlSR6rdDuXKEuYs7VVTF+672YZU5pXPEtEww== 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=BaQiEZ47026ZyVhEH6O6ZuxOTFr9ABJ9oBqpjOiiF3e/JMh5i7YKbOQ7nd/iPWB0hJ8Dmg/cg12fUwVZOagLspL2/J74fJur7SuKdU1tm9SYbccWH7yK/J5iyGbAtVUYPg35pVbS/c6/P1QQiGs1o5EFB4faCcLFJkSotlC9lGA= 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 DB6PR0402MB2933.eurprd04.prod.outlook.com (2603:10a6:4:9c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21; Mon, 19 Jul 2021 07:13:52 +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.032; Mon, 19 Jul 2021 07:13:52 +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 V3 08/44] arm: imx8: Move container image header file to mach-imx Date: Mon, 19 Jul 2021 15:46:58 +0800 Message-Id: <20210719074734.29170-9-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210719074734.29170-1-peng.fan@oss.nxp.com> References: <20210719074734.29170-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SGAP274CA0006.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::18) 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 SGAP274CA0006.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4331.21 via Frontend Transport; Mon, 19 Jul 2021 07:13:50 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5d5443d5-34d5-470b-7036-08d94a84c32e X-MS-TrafficTypeDiagnostic: DB6PR0402MB2933: 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: nccEErz2EcbBgqrAVB918VnoupVU+RmRmWfCQoaWcT9zOSvM+y6smMYX7/JNUZ+bLrnjFIN0QsD2BK84CogAvqr9btGsU2CvukcjeI+dg7Zi60ZGSbjw1FmmeD02xFr2V1L65Y98yxuBRTAQBag99DNas71/dip1v8WmvmkKAtSl4PJ6YQhPj4EqGUKVrvAZ+SJu6csiM6PWOdg+nUmCkHSQGsUX+e6BlbmOsj8s5GuSSGfZ5q8y8N6BejrUr2//aSKdfbolh9Pl+u5G5XqS2K98lfJb3kenu0Ytb/o2iKSPAYIT42mwzKifKIHnF4gKzRQJOubOynsfqqE4ObnFYZ6W6mCeq7HmwGIyUFDeXmSQnv605X7vfi0wejdsyvJFa4/P+Ivc/gz0aq5RVG1Enoz8UPCB/2FjisjWD8cetbaj4gfjwV0tNUVKr0dxHDlIWyhm+WGnaUxeRsdvvEQ7y8PYvsui+EpcTYmjU5fbk6lEdQI2Py1QwR+kX/OUp4ACxODGcxt3ua877BFvMazqxujvI9IDQ5Bq2ZjXIKn/Ma8WHilWzI06fBnrTx4Hm0OhujMQEh41Okjweguf4lDmu7NonRg59P/O/S1CEqfoADunHeG0ADG76HVQVspCPfJpUKzS4Ok4DmUetp5AyTCk2FTuUoOix6nMpf7U5kpcFeBG0K+HC/Cd9c5x3+QdOiJsgdLemOof/M14OcdgZ/rgFA== 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)(5660300002)(508600001)(316002)(956004)(83380400001)(8676002)(66946007)(6486002)(6512007)(66476007)(66556008)(8936002)(2616005)(1076003)(26005)(52116002)(4326008)(186003)(86362001)(38100700002)(6506007)(38350700002)(54906003)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?268C7Cq5OspfXTNjKvo28f3CFaINWa+fZDww2T5u653r+1GYmPblHvz8q/1H?= =?us-ascii?Q?gLGtkYaI/Oy4I3GfOA2WaDPMfdwklND1ou3eZMSeixHbr6KFQyguhBEIe3Rp?= =?us-ascii?Q?KgEi/KRY/ex2z9EX7KUiUfl3FMFC0u/dqGUYZ/Rbpuusy5GuFnDlkuQ6mc5g?= =?us-ascii?Q?M2yr0L7fjMOqxZjRAONnPuPHETd/4REuXMCLg8pKzoYXJSUwAEBy4X/lRfpj?= =?us-ascii?Q?7suhc77MSuzwIjMrQpk+rvKxsqTwZYOTnlqJPmo17sLO8DJEH1vulbwJVzR6?= =?us-ascii?Q?ZjcWeyK22dqmDe1QSO0jXYWgJ5Oph+B+UJ9xhmzRcHbeuOjkItQ7RuGUyP5S?= =?us-ascii?Q?wThA6G1aUg6kuAjgDshxdQmgWUuLILgYVwV5udsueXCn7Kd8MPsUlDBeCCgx?= =?us-ascii?Q?OAFghjX8iRKCWjI0BE9OMI4vUEhx/65GKX9J5evkGTY7g0COI/Xuj1TYn2Gy?= =?us-ascii?Q?V2WRYNUCbOV4K3eSbLMu7BxqaHjaRWKthJhx80fRd3GPleatrcKLGZWkf9We?= =?us-ascii?Q?CvApdSHZATsq2lhnQZyJos50F2DtmtzHb0NZjUDHECbewnSFcUj8QxAjZHlT?= =?us-ascii?Q?TFdZ5w+Ns0ffNAUFaaQpZYLE9G9k2VcO4CyDHFAffpIfZSQMj2q/Y+MA/UGw?= =?us-ascii?Q?98iYooG/uYbTHhhUKUZ8TjBhO+QywgJmNHiCsMDFD/12jKGarYA6epEv2k0Q?= =?us-ascii?Q?kWnAoKSsLSAhe+lh/JRrIO1xCNfiFocVjmyLjfdb990ySZW8HTH6z389RI68?= =?us-ascii?Q?8Btz0CjMaPNarFNXrMt8SItFMoMgyPGv/jD40+kltxZpv59knGSSHa/K9lYl?= =?us-ascii?Q?DJ0nFJOlR83iReXAZJr+eOtQL6nfwia+90+Q7u4V2ayNzf6Wf/QJfTUt7Ha8?= =?us-ascii?Q?XuT4f7vEpou2W9WrjN+h6qoio8JRrjT4pIApGEBbGbde0MY6ZY070fF9dpcP?= =?us-ascii?Q?T2aTxoLi8GnZYVVZCZwu/Fyi9Ab9PijKTKmCRHJE4QE1qw5etc4zxfIiskN9?= =?us-ascii?Q?PmXy+zZwc/pbAngrSnLpDMBC0ed+swn4TimJOBqkh2dDITMqMfFXuLueqPsw?= =?us-ascii?Q?NajK0zozjRknlS1QCWjJi+840nQvkGsadficM19xMoxJCo9aXIVeFnJHwMoq?= =?us-ascii?Q?4Q2M58sN4oOxPYYc4lKHduNP/xWJfujdBTkajsm3vDOUpugp6YQWMScvpoLl?= =?us-ascii?Q?Hq9E9nNY9mNb1i39vnoDYQxPmO7aG1b/FFs+90rAwvmGuo5LDi3qGnJ6Zcsi?= =?us-ascii?Q?KGRMQIqXx3hK0feuy/twvqhz4B3CXxAFdv/w9U5mLnnLTxmkWknqljVjutBf?= =?us-ascii?Q?qGO/c+6JcpI9WoKFxfgE8/bF?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5d5443d5-34d5-470b-7036-08d94a84c32e X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2021 07:13:52.2473 (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: IkTUHHy7KhO30cKqkT8TT/bMm5kGlOk/VvpyODFASjlE6GH9Ll/qrP6YH4Qkt1uT0rFkkWj6q2lwwxiJfEUXsQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0402MB2933 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