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 6A32EC11F64 for ; Tue, 29 Jun 2021 02:00:55 +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 B977761CDD for ; Tue, 29 Jun 2021 02:00:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B977761CDD 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 4BA1E82EBD; Tue, 29 Jun 2021 03:59:43 +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="k0Zr6igv"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 87E7A82EB9; Tue, 29 Jun 2021 03:59:36 +0200 (CEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0627.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::627]) (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 8818282EA3 for ; Tue, 29 Jun 2021 03:59:32 +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=SPwT+iAHoiG1TfNt0norwbvGUJqfhZq4/m5vgHH1ZiNiqobsShj2Z6CSRt/4uEhjLY0XJ+jESrmtGkQdpGHQfrdzHj6aUHHkVng8nSJGIPuOkzNKFCJNiWsTLnSDnh4odf8fjww8P59VCsH0CXni3fBuiBQKwQl375ILSBOk6iDhMEPk1zjdrjf53Hk9B+fiGbD5FlYgdb8IrIYh5tNtJvrf6RGn2roG62WCsuqvxNnKWpVJVdthjh6FysRr/nZ6xJI4llIVG18sIMTVb6BZsqMGhDdoFs1VmGrcIhr3dsA4YppdDIHpXRo9WnXxPvkDidMhAL32AryUdbBOBQHhQg== 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=Q9ugd942emRItTkzC4oqDjC8YF9jD7I/sZo8AFC+o58H7PbDNuuc94xF2BR8LuszERmhpR+XCCsV7oGX+htsxZmQqxGz4BqrnyR3wzT9GN2Nfa4QPAasqVcayPm/jjssPhvtD9UmNKUIiXdKfr1EKJ/uJnuiDOyYcnePtYdQG/9sC3n6JWoFQuQjZz3f/gdKzDVA2X3kmNCa5cXCOx4Gr/LP/aIEXRghnI+iGAuV/6tBEhVE8RlSIy53tkDTpLWHCoWjo8JdIdR6D96V7e1lFGkghBEWZH3E8Qg98P2z1nfWmEJY+H1LJbfYhxUxmOdohMGGwvXe+MP4gpYBnHqZCQ== 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=k0Zr6igvTKGkC56ABThtY9ATSfxZk7nw4BrqIfOQrb1lfdrCV84YYFYNtty1EuXJJIdxZiKytHpYWTcY0wTZGbOoZSiI5RSMf2P14RSOEt8+qdsZKLvUbYbjBG2j53bhat3uOLqsNbCIT2w+PhWyrHwrYqBSJ9/84fOFtf6FTU8= 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 DB7PR04MB4633.eurprd04.prod.outlook.com (2603:10a6:5:36::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.19; Tue, 29 Jun 2021 01:59:31 +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.4264.026; Tue, 29 Jun 2021 01:59:31 +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 V2 08/46] arm: imx8: Move container image header file to mach-imx Date: Tue, 29 Jun 2021 10:32:02 +0800 Message-Id: <20210629023240.22394-9-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210629023240.22394-1-peng.fan@oss.nxp.com> References: <20210629023240.22394-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: SG2PR06CA0088.apcprd06.prod.outlook.com (2603:1096:3:14::14) 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 SG2PR06CA0088.apcprd06.prod.outlook.com (2603:1096:3:14::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4264.19 via Frontend Transport; Tue, 29 Jun 2021 01:59:29 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 35c6c0ad-0baa-4428-4b6b-08d93aa188ce X-MS-TrafficTypeDiagnostic: DB7PR04MB4633: 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-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mQQN+zD0szP3MZDW/xmHA/4/7+AmU5ndx3bOKaLQkjNZfdsx1xJuvCwNJ4mq0xGyeoCPrOZP7xknwnq6J1leA86Nwhl9fkygKxx/h/9aEQM1YFb8sEPjV9BQC/F/a3y438TNrPTunL/+CbeJEYcbdZL7ElMMfPAApjCehsg2wdRzU+l7uw2c7z9VGdwFP5TFKOqjPWFNmEgYQexqks52YvLtt+K5QYW61aqPcDzVxbvICUCokPUT/tsBgRXcg6s667CgWHKGYrymFnycp3+STDFfqyY8UYPS0t9lA0rjUb6xNMFR0yeaYXFAz+gPNxemfrSFa/6d7pBFI6t+nw+WUwO2yZ539T3DuS0v1CdxwcG3Gg7dmJmNc2avDHgDRvhtzyshQCVOXtD87PTNa/wiY1SqKKwWXiz284d3YOPABaydtdGR3oRgkrLGtg+ttQslujQHl52+1QVmmFUSz4NOPrt/kHHfUUp5/or9tpyGltYga297fBWgsOvHmlVppPOWKPz18bx8FA9Cv5aaI2YKmYDtayy+mENla2Dv0cwkT5Pmqphl56y21UbCjDnipKU0SUpH+ZF5newLBeLxOgERSuGSrCtcWS3M8RIrdqcUVRNNmyVuAwTW24GoBcUFJjkwXmpoqSZBwoqH/mYwu4g32Pf8JvL2iflhV6ZAM2zXfEQfr+MLv34n8Tqi8FrenmjxWgVstLwJLQgU2+LREeYNBw== 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)(346002)(376002)(39860400002)(136003)(366004)(396003)(16526019)(66946007)(38100700002)(38350700002)(8936002)(6666004)(4326008)(26005)(83380400001)(6506007)(1076003)(186003)(8676002)(2906002)(478600001)(54906003)(6486002)(2616005)(956004)(5660300002)(52116002)(86362001)(66476007)(6512007)(316002)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Tq1geyXa7406ZImVtU8MGwL3xJ2RgnB6OtONbRy7QqKP2c2ddu6fRRXo7Q1Y?= =?us-ascii?Q?WVomx32tMEI6fa190EEQZIflGJ8Fdaz/kKF884Vjd2SOLR2MX8y95+oaAk7o?= =?us-ascii?Q?3I1V75TRxAe3tYqbDd6YFYD36O5VKaXC0pKnU4EFql3kG6ofSAqGDMQnNZcs?= =?us-ascii?Q?Sdkm2RQ2nEzPRGzCXP4Dk+Kv0aYWwKe2E4nO17MQdRjuHykZl4ziv+9FNn9L?= =?us-ascii?Q?0MLn7D2+6Vzi9CzT7/31A+PGC+AolcAsfg23nMpcrjybNunjOTST2kFiOzbc?= =?us-ascii?Q?Z5J+n6pad/wiF4JMzXlPmXI+oOjOSNBzqmoA8SIXIzkTih7Rfvlg7n0Zyg3K?= =?us-ascii?Q?437YCq61tVp7WyLsNjIo4mA5U0SZ05IMN4VTotB53nhq+4lowYxNmwveKpFO?= =?us-ascii?Q?swKTSTtgonw8eLdhjkenyEl+WTAZNfHypf93B42wZIQG5Z/lmVKEM0l71tfq?= =?us-ascii?Q?+fCPR5GQ8F/WglQ/917g2s8JUiIRiTDwppJlqJHf8giZI/6swIiiUm2OdekO?= =?us-ascii?Q?k0JsN/+VHzXMDfOkhhQZpD46tzlwE0JQEDnBFv4rmE46aRp/+qUgbpOdrFK3?= =?us-ascii?Q?J/6fsJxPI92o/IjwTMBygI3WjYpCyXLGbaFVWvwXWfxPGK3tx3KHrNfFNJD+?= =?us-ascii?Q?xkyzNNChHsl1FILrKAO1NPJ26Of8dPYDpD7Hx9eKBcC4z0SwoVziIQG9l5hi?= =?us-ascii?Q?GgqWIISVDCqZSsf6vnCSk47LGnLfPCWkbByZmR/PYuV8CUpyZof/4r5b+Vd7?= =?us-ascii?Q?xKM16/B8woHy6z/eKBFinv9ZFsRtUI+PmrMSmvF8jZxb8kyOiq/pIWUUBPSw?= =?us-ascii?Q?RzN+3Sha8RuB+nZv6ey4K7ENXVYJHgANAdrLgGOdlPHpOFGyFB3qz1/j0Qcz?= =?us-ascii?Q?brmTkK6zwK5WKrkD+0hRngB9a81VuQQwW5F2pff223i3evWcJPLT+QrWOagq?= =?us-ascii?Q?jxhphI8A4/kBpcYRoGc+hHupav0AJgnzXbdgySXG1IpIr5Jow5ZDuFcwh2J7?= =?us-ascii?Q?XkK6gCYS7HtSWx0BK3RDEZTGkfZKyhlTv9Aydv+fFYAq7LOw+/0tC9daJegf?= =?us-ascii?Q?SDUCokLi+cT31PQhADTBdLE/T0nClA+5OsXz1431m6S+VlXaSDc0l40u4UV7?= =?us-ascii?Q?oTSuZsl1vhYwWQGcKq48qBI48J2axelV9jbOMQxNdCC3rqtp/czQ5xY5am5p?= =?us-ascii?Q?NGBmtLjg+0AY5rtubica4a4VEe/gp8sFGi05WhbnLTHjPw5spnX+02QgUBsb?= =?us-ascii?Q?Mq3mjFZPBMOYy3s1vEoU/50cTnX9KrjRR4LLjd6Tu6CCssoq333MHRbWoK63?= =?us-ascii?Q?NOfrI0nf3K9AgWTD0MGNpmCw?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 35c6c0ad-0baa-4428-4b6b-08d93aa188ce X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2021 01:59:31.0971 (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: cE7cwmXigZrGBgxG1HqzVEisj/No+L07mFzAuKi0yhmCAQL3OAaGSuLm5C69o4HYcr67mRwFPzSOe7f21s+SgA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4633 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