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 DA58EC636C9 for ; Mon, 19 Jul 2021 07:14:51 +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 3D5B161019 for ; Mon, 19 Jul 2021 07:14:51 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3D5B161019 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 8550E82C20; Mon, 19 Jul 2021 09:14:17 +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="PNYf7kms"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id B524E82BFF; Mon, 19 Jul 2021 09:13:55 +0200 (CEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20615.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::615]) (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 5E61E82BF5 for ; Mon, 19 Jul 2021 09:13:51 +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=FW4eVszrelrLMmb1cx+k47O3mQOu/g7ZvTq5tSM5MYcHVka0PhjuiDBANKaBF09v9vuL3MW5PLAq4xEU4OrTNPZBFFnmaRsZinkupEWcRst/9Y1HNKz9VhdmNVEO/VJsNKcoJUutc0EtIvGe8X4PieUC6ekpwfdvhWcQ3M3zKZp8l4XCwUZ2pwXfc1o0aK2Knrwj4AYKSqXBOTdUAARM2v/4mGK4SYKYOLcWVtCvvGwzNHcpPOSbcsNQFDDdZ6xoJZw9CLrat89/YLka2qG8eD6zDWwBbTivYcziQoANTOv8yIvdE49kXkzHyMyzfbADqtWj8/ESJBZgG1ec1QmBnw== 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=2CdJVRgx/TFlTRQA4a/RoTrpQIs9chuL1SglSONGSk0=; b=QONvsM3DbxuOSduZwS/SeW8eCoTR8DMB7GT7uHqaUJRlBpNZuq31lXJrDlBf/2BvzhnxeqMYN9YQII7u/f0b7o807W6THrO7qL95TXONmyTspEOwCBdfAcOT17dartJj2m41wXF2ydcrewZCz8apt7ZXqsmSWef6yH3YooTpjvt8SUvh1bosJkitbaBvWbwyx4wiKUVxKGxRzTzCgye+EywZc9iXMxOF1ePNdJ4ysnmrEqDS5cK16S1RpzYFS2w4uKfJdgaYISVpH7mlqLEmBAAyz3DAc0IdT1A/dZaFo9J4ssni5mZYEFbvV7xKOOJ+WCX8cl4Yx1TfDBYUU6DyTQ== 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=2CdJVRgx/TFlTRQA4a/RoTrpQIs9chuL1SglSONGSk0=; b=PNYf7kmsiu8K1LJV0sfiPBbcBrIf5qVrWAX08n2dIgaeuNNLYCYvO2uJcTzL73wkyXJpEwzOhlCt1VRrAIGblMh1nipbr0j5YIozIp195uTB9/CXYH6nyWYDLp+ftEvOyyUAUea2EYGqtttDf1C1uvWdcsbmmhLygYSveg8U2Hc= 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:49 +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:49 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: uboot-imx@nxp.com, u-boot@lists.denx.de, Ye Li Subject: [Patch V3 07/44] arm: imx8: Move container parser and image to mach-imx common folder Date: Mon, 19 Jul 2021 15:46:57 +0800 Message-Id: <20210719074734.29170-8-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:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bd5b2958-0889-490e-1caf-08d94a84c191 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:3826; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GLNxctmM+ilN269oQWCRFoG4wZHzPY7KAXzIj3WLQ4aAVKj8m1N/8JuRWqnAIkHDaJssrEEQZ9IYkLKvXhVDUzODEruMNFMjsjHPrnQZClFiDyQTnYG0bPvN0rk2H1szrek83vlMODYNbkEHo0hQG/kOjpoykC9SF4N0K31dpTejhjuCMA1UUSzmT29RyeRRa5yhKWY5V7darnfaHQsiR5drUH7gaRYjRpnU+seMPP+XDxrDkjZdcBEjtJ3eBp4PE7bVLI/70ttiqh2yGj4xhzXOqW/LpT3YJZChjk92Ba+qtKTtJAdweZcyMFlCjJs+W3ke2dkQ0Z4u6yBrmCGVniHDihaJK15b09DkmNPx+CinJF7fkUYIq1KSSb6jJ+G60DYmtiacAMxhruOmBeyGJNLuotahWIGqtIN4fEp0v9gQ6kpvHBKlL5ZdfrHR6g91MF05bFNv/qGudCCrsIYyJtlm1bz82bvYgEHzOwixol1fXQd7jMjcNlxtSeygc7J58MYXUXibsfZqkbYAyFCmm9oQX9Er4UnG83asJTGgcIE4ppLCeIJZTK9QfyRy4MIuEBjk00VVveYs501QeXK4NYaeDlKYNrybJPtCcxG7ukfkwWQTh8bRzingPFj8YpBBb0DFK7+BedoYCYl1ud4ex6eoy/9IMlZSpW95rtY330jif1fJ9z0bUGcso49ewZrTOhFhV3gBaIWjRp34y3YY4A== 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)(6666004)(316002)(956004)(83380400001)(8676002)(66946007)(6486002)(6512007)(66476007)(66556008)(8936002)(2616005)(1076003)(26005)(52116002)(4326008)(186003)(86362001)(38100700002)(6506007)(38350700002)(2906002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?G/BNBbIgjJ92OMG/SJ6l665ou6VxjOULLJSyibko5ijo0B0hgFS4u7JxoILb?= =?us-ascii?Q?XbDgvTEifyXnN4/cXOp/00f++4IcDvqWsciKmF+CZb1vJV3NGFGMMKHBx6Q6?= =?us-ascii?Q?XvUaBTX8tnTTfwEaxN/ywoNe0UjbgdzaddXRYpLrYIQnK3NOlK3sreNfllA3?= =?us-ascii?Q?90QzwfyoCR2oaHYrIXFrqOncr0prJwlY9YHtTGZF90/PV+gOVFU9gz24qkXX?= =?us-ascii?Q?6wi+jPPjTSxuolUSbqQnip8j3nGKUBnMPJbJrEfpSZEIqh19SKKm37oLndvk?= =?us-ascii?Q?dySzfH0J2TCzImDCzshZ+JJRmc50op3vzDFZRsuQwARVP2JTtliAqWcTVaN0?= =?us-ascii?Q?+Mu/TafhcU79GF2hTDX64eWAHTUITVYqsOjAkT/TjHTYQUOgGyuXVlZ/4D7F?= =?us-ascii?Q?IYhDWs4z2gjA76YB4AzHx0PwgwcFlUvfquN7BaMufPHg/LiKY06JQHzBrhLp?= =?us-ascii?Q?Euuccx1ut7JTILUMuFiu3jnNRb3QcfWM8egK/kimMdL0PyzrmMXc2vh/aoOi?= =?us-ascii?Q?qOI0FStEcp/zquH894cwP04O4pDvFZXFAORpdY9ECtTTWeHnJYm2ad2keGDT?= =?us-ascii?Q?5aewEks3TY2PNCPMCZZppnde8/NignyBEb7oY36J2rmAdX+ycOOaXeu8vHjl?= =?us-ascii?Q?bphZOy7duqzDi8ScrJLlrmdpHLckOetV6suFGPwNAlIQvtntTF7BMXj7f5Vy?= =?us-ascii?Q?YYuxrNicsD2Wg7c7oAG0aEGO2v5cmx8fFx1/Ql2sMCs3SLf/KxJssdRgF2cf?= =?us-ascii?Q?KPlH5PUOwwHcxAbs0H8dqzjzfvhK9uCvyuMn6LumUnd39tqnE5io4rlhPDXc?= =?us-ascii?Q?Ut0lXKVcjmzr/aaKd7YQvJKSQgzTM0rJFlKX1H+JldVTUA2/KoSYeoA/LqzB?= =?us-ascii?Q?g/tcXC4mFCKaQe1xBk9FjYPDeSnvFuCUE2T4KAgFKWXYVIJ1UfdRsC3FMsjK?= =?us-ascii?Q?larlIUfsA4ifuzkMzVLcYPXbg2dHnq6JFfVZjF1CcmoGW/3gEoJvSFCz7P7P?= =?us-ascii?Q?m21l/za+m9/oSvKwULY+bPzG1gB+AvtCWpD3/NbRCs5p9OQAg5dh5PS2Z/O+?= =?us-ascii?Q?YMq1waw9q4wuwdNukWqGxNVdF+wM+uhIj0aBm7y1UbrOW8RA61T5fPYSGLlc?= =?us-ascii?Q?CCJdEcivEH4g6Xp+sPSxWa8tzIsd/q/TgxYGIZ7A15BcuY0GzrOxBtVh+l3z?= =?us-ascii?Q?lpZnXgq+o6eVSIUK/E9DLAhGXgJ/M2XRD5ZAs6hIqVk2Y7C589bVpYb/hDP1?= =?us-ascii?Q?U3yXFL3SM6f0MwwRhXm3lnlKbzJQKMFLS47Imx/QobbNsQ0b6/YtYBfDld5I?= =?us-ascii?Q?g5whd2ZIT4kFu9Oad0Ns8WeU?= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd5b2958-0889-490e-1caf-08d94a84c191 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:49.5416 (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: UQynPMSorvxuGvEu1zzpH0JY70DjeNsn9AvOOHvVEllvsi/8IGrDBxeEV8d8X+lTkDxmHYcF5jt/BLAywKiQ3Q== 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 we will re-use the container parser on imx8ulp, move the codes to mach-imx Signed-off-by: Ye Li --- arch/arm/mach-imx/Makefile | 4 ++++ arch/arm/mach-imx/{imx8/image.c => image-container.c} | 0 arch/arm/mach-imx/imx8/Makefile | 3 --- arch/arm/mach-imx/{imx8 => }/parse-container.c | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename arch/arm/mach-imx/{imx8/image.c => image-container.c} (100%) rename arch/arm/mach-imx/{imx8 => }/parse-container.c (100%) diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 36224d8db9..0ef269563d 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -68,6 +68,10 @@ obj-$(CONFIG_CMD_DEKBLOB) += cmd_dek.o obj-$(CONFIG_CMD_NANDBCB) += cmd_nandbcb.o endif +ifeq ($(CONFIG_SPL_BUILD),y) +obj-$(CONFIG_SPL_LOAD_IMX_CONTAINER) += image-container.o parse-container.o +endif + PLUGIN = board/$(BOARDDIR)/plugin ifeq ($(CONFIG_USE_IMXIMG_PLUGIN),y) diff --git a/arch/arm/mach-imx/imx8/image.c b/arch/arm/mach-imx/image-container.c similarity index 100% rename from arch/arm/mach-imx/imx8/image.c rename to arch/arm/mach-imx/image-container.c diff --git a/arch/arm/mach-imx/imx8/Makefile b/arch/arm/mach-imx/imx8/Makefile index bbb41adbe4..4ca4c14bdd 100644 --- a/arch/arm/mach-imx/imx8/Makefile +++ b/arch/arm/mach-imx/imx8/Makefile @@ -8,7 +8,4 @@ obj-y += cpu.o iomux.o misc.o lowlevel_init.o obj-$(CONFIG_OF_SYSTEM_SETUP) += fdt.o obj-$(CONFIG_AHAB_BOOT) += ahab.o -ifdef CONFIG_SPL_BUILD -obj-$(CONFIG_SPL_LOAD_IMX_CONTAINER) += image.o parse-container.o -endif obj-$(CONFIG_IMX_SNVS_SEC_SC) += snvs_security_sc.o diff --git a/arch/arm/mach-imx/imx8/parse-container.c b/arch/arm/mach-imx/parse-container.c similarity index 100% rename from arch/arm/mach-imx/imx8/parse-container.c rename to arch/arm/mach-imx/parse-container.c -- 2.30.0