From patchwork Tue Jun 29 02:32:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1498159 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=NXP1.onmicrosoft.com header.i=@NXP1.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-NXP1-onmicrosoft-com header.b=ZSfKRodV; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GDSP72xg6z9sWQ for ; Tue, 29 Jun 2021 12:00:43 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CC87F82EB9; Tue, 29 Jun 2021 03:59:40 +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="ZSfKRodV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 0E37482EAC; Tue, 29 Jun 2021 03:59:33 +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=-0.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04on0616.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe0c::616]) (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 BDA1E82E73 for ; Tue, 29 Jun 2021 03:59:29 +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=iRokCXwVj/atQy3eSBhiRX3oJVgLmFfL2ShB6pduPxG7JdjIT4CAwiVJSzmlfDkJ9Ba4OXt2mQMvJdIovypOEGUjlYF0yeY6uvHvzuBsuWgRtvuYiiJiwJCroGEQx6cf0nTVYXZ7mfy0ixILVOoINTb11chkIKco+BcKtcecOdl5GyaPK4XC2BvwPhk7tJnuyfPqtefqwhwLCUOVUWjN7cbQP8vJ3DKH8jjSnY8jsVXcbq9RM4HWQO+lFCuyU393rVCSGm7A6ndy0pieNRWBvaqq0UkH7FToiy8gQg7kLJlQk+GAqHiCp8nhMF+aeE2Fc2S7uVBJIC9tPDqhoxP8oQ== 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=VXsUUJLhSBHT3WXwWZNROyfp103cmVbtiPyVdNyJUYrOsV5/p37dSlmHlww2wJL1fsYYmHhmE1zSizmLZQAHhoG+WyL/evXrbvJuQMvsNn5fBDLUB/lX05i0rpFKMMbUpLfLtz91fJfVh8a7Xq0OnKsZUwK5xjK/f8GH6VZKbWeYd6e9F8GhdPw5W3cfJD6Hs3+BDZ04qp0ZlqRR3jmmUXqxyk82L/Oo5nZqAyGk2JVV1jCzBdraG2xP9GF0vH3vj84Or+tw8Uqkpv2pEspatUCgaEYml9fjX6eYhOU3QqSowSuzi9g56FZjnMZQNbbLFYGvOx4ozTnGUYOUauFkig== 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=ZSfKRodVoVmMkMueaWRaL/uIpqP7oFZ2RmKhZxQ0XOQV/Xsquvo+SORr6y35BU3wqm1kBsvr0ueYLV8u5i8rMGjcFBZd03wiJwE5mtfbBNbv8tRC4RXqTXA9Yl8m/WrYesOngEGto1iGAXQ7HCd1P8V8cGTaRozP67ipCz7OltM= 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:28 +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:28 +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 V2 07/46] arm: imx8: Move container parser and image to mach-imx common folder Date: Tue, 29 Jun 2021 10:32:01 +0800 Message-Id: <20210629023240.22394-8-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> 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:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c51d2192-be92-4d90-a1e7-08d93aa18722 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:3826; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nILeuprxy/iym0vh2ZRHsSPlsN12qYpnaLDHYyEnif1Wa1dI7uF1iO8Ooe/7vvzezURempIFeMCzB/J8AvtrgFq3WOpQKFcH6kEwQ2AYGvJDBL1cKg+lGDWMepsBAXUJyTs2fLF7cl+/YJ4AbnTbRYcM2MKHHNqYf/yX7lU/HjrdSJVsr9PM+Ho1lVK2wtvBVG5K4kFC2BnZ14X3zmeGLn+d647f0JlxqG5/l9NIDiD8wlqkDQMAHdyeoujcphCZZmFraKE1DqrS55nMatcgDi5jVJu+A20wk/e5rn75YoS7wF+jyMOOKc3fVvxD6pROvDtxL91OC1QOFOxTTRCh6yKiD0ZYTgMT5SO8llh/TnEoWlTXRfJZdcn9Boek6vruqYh6xBOW+Mn8Hap6TW8xWtblRXRhyKu9G5vVNqH6SXVVxQtwMYUIltWwUSC+HiQyqpSYccTT8ZDaSf9ghDhNWMio5K6kx/WKnvL+D15Izmm3nI0qohKV0VfsmCotHF3NshiSsiE6Jrdc3Egsh45KcmYKlLQHTxZHTWi00c5Mv3v3wS8M0phIQkQZKgmrSqTirfrw0DrJc2lkXEXvOOzAbwSLCGB8hzSwIO09UQ/EIB7LWH0ve91nH4kO9V9PV+vHnhbDOri8TvCn01gIlV51ZBIYoLJMRxzMRhkTSJvDc9WqE7qxuG6WfUTKa3iKn7J202mDpy3iWJrkl9FlLfdQLw== 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)(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: aYyShTu5aOfz+JBLMpyNBl0SYOa9D3yPt83/dcHgAJQMpoxn/Lozaz9CvCLlvbuVFRmvz1S753JkbYEivq6V0obWN2lQ8/9/bIaPrnCPi7vW6iWWGua2OGWKH1xTWFSnrYDTxQDLXKnD1//4az1ZoUFwxx6mCzvLgNbKW5nJkTSGHSYzglh7ah7HE0Qs9el0yQYjycbDZPi4Jt7SdA6rKRwe31ayot9nkZNkkTj+Ii+Tro50bMqiCAFBGuuDXwNUGsGPthemSb+Oh0s2RFpLkCY6M7ysYnjHf8wUrKn5qQ82T0qUSjNoYFFisgojH2Hdwc8WRQ8/TJxEOMrGCpVWV5gGXCOB8laydCNoLJkI4jVh3odj07lMqaWRZgWOgCvjDSZVZVe+VAYw8KqNh0uzgQI4EZWdCwpVow0fopiT7m+2eqvDbgVq54q0lVKPALjdYJF6uQxWfBwfi/hFIIj7LJRQ1pHWtQ5YxbOyy29aAFW7akg3CL0rmSIw7xWbO1rZygSp8XJM/bLxEPhl5NJnnaB/jJq6NpppieWgwNWGqJ2dSur3S8MKabcrHWBV4avBoZGnkU2qAj3yZjyP06l6INCVOJBKNbmVq0j0/QefSS4YveOvYWyXO+lb/k2zj10nSe7xZPq0tWyrKMSzD4O15ZrQWYFg7IrfkQqE7Lob75sxN75Mi85vY1GXTmY90/wgzrNZXcnwnay9rrD/2RD/vf4UQNM8rI+EIuKyUHT+Seti+LiU77TC4s4DHFJTH3CFhm5HD3SkrJZgdoY5/nR0s8CByTTLnI8nWdt+iCCocQpESIsN9Td3ZElXNy1T3i1yRullk1OJkQgi7WtqaqSMcfSPSolRyQvSTMBvN1cCIb81oY9ghvlyW8nXLuTxabAL6voBuGyMX/DWotV3WWQQcHr3vBmvS5VAA1WlxmDMG97RUG6MeDc3lEByNsKpz9cHel9Bs9Z8wVj3C6RXdLPHbLfrTjhs2vDBEjC3yirqIQ+Dm7UvaabrF/ege7cAendKjgNHFX83cl8QXWiTLLHk5J7Oo/OsJGX9VaGK/ggKRDtPo1CsN/4MmZTxKRXR4A3eev/c3mIQmF5GAM9MrZLhlFz+qqX4haSse2VvD9TpB33EDi/KqXtJxi1sRRfCb4NVnL2rR97aNiS8G7cMAR8FHyVc/lbuZ+EvPgKzGldYZGo24v/x6W1M+bPkFWD4KclsFbnafteLKyoP3JAHx+DUUdnYYbpxcIE1CN30WphphNoqmp3EAmYCXdEY3krfEolo4i5spQwGHnlPNC05HHUWtt9QIjSE3zBVC++Tozq1QMGt1QvD4uPxvjOLR3/7s5S5 X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c51d2192-be92-4d90-a1e7-08d93aa18722 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:28.3434 (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: F4yIZL9+PjC0e7CpKcXsMd6XHB3cngJCX5ger3o0LfTo/JR+B8NgdhMxchXEonqfMLkJugS9VeDWkliRiS6Ptw== 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 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