From patchwork Mon Apr 12 12:12:36 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: 1465167 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=XIgONNgo; 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 4FJn1p0m4vz9sSC for ; Mon, 12 Apr 2021 21:43:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 85CBA82076; Mon, 12 Apr 2021 13:42:58 +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="XIgONNgo"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A64F281FC0; Mon, 12 Apr 2021 13:42:06 +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=1.0 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 EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02on0613.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe05::613]) (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 4F5D481E7F for ; Mon, 12 Apr 2021 13:41:47 +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=n7x/CB1873oo87FjARLAd6PiaLCfx6Ial//EOkuUZIGs7zCKS5pFQSy+4jaEvMDMEt2JYKBY47X4sUYINvqKqEbH2PDuJEwcuTSNWTOah9WVFAD/MIL1sy6TBeEImytJlCHiuv66FGZNEZcl87qLRA4rTe5VzErF5l0X/PZssdHo4I6aMT9uz7nGId5WCct/cGplU5DQxwTS0SahymKPK3xuzj3uIo8OTuwFcvIWpgxoAyWUTBUHJChxr7UoCgoulBE0W2MaqVL34QZ4/4DMfqbWZ7eORw9ReJglpdJhX+w9T3MJpiVFA6DoYQRuA/t6Sruym/0P21Vqr4IsZa/x1Q== 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=OyZxT55YSVf/kH0B0a8hkNJx7uschSoC3xIbxX/nCY97BCIjWoihdaZ8ddj/PfLU1ZiVeyykg0yyf6W9HXb3nA2ookyyKaR/fPN4SWcH3ulSDktXMQN0yQIGcn6wyULKrU81Qnb+nX1svwgncS2rGfYUmZzHNGVtV16DdvQT51uvXflyC2mK5fgrJ12KsWZomPuqPX/yIpxB95+3MS423qgRfM5+cHlGaUBBieXtrdCrsiMvvaaYVmsFi+c6vci35P+wDMEkINagnuiO2kagznf7WuAveqmiaf1sBoPjh0bsqatxdQOeR4HzophtHA4DPrSAnlONTmcIhwl0hr/Ccg== 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=XIgONNgorKc81pLsvjCj/l0N3wGnQ9OwJiLSBSWwLwClyuSYogvRmCMDm16Mu/BnAEqJxj35YChD2zJ6W9Bwg37B/YfqLxJMkY+j5Ak8TrSPPIdo6T1urRnMcY63l1U11Qus1JESIrqpMFltMHw0Wp3OZa5wGTQ6wnYIsetfOmo= 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 DB7PR04MB5244.eurprd04.prod.outlook.com (2603:10a6:10:21::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.18; Mon, 12 Apr 2021 11:41:44 +0000 Received: from DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c57a:6964:f72c:21cf]) by DB6PR0402MB2760.eurprd04.prod.outlook.com ([fe80::c57a:6964:f72c:21cf%11]) with mapi id 15.20.3999.032; Mon, 12 Apr 2021 11:41:43 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com Cc: u-boot@lists.denx.de, uboot-imx@nxp.com, Ye Li Subject: [PATCH 07/37] arm: imx8: Move container parser and image to mach-imx common folder Date: Mon, 12 Apr 2021 20:12:36 +0800 Message-Id: <20210412121306.11484-8-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210412121306.11484-1-peng.fan@oss.nxp.com> References: <20210412121306.11484-1-peng.fan@oss.nxp.com> X-Originating-IP: [119.31.174.71] X-ClientProxiedBy: HK2PR0401CA0009.apcprd04.prod.outlook.com (2603:1096:202:2::19) 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 HK2PR0401CA0009.apcprd04.prod.outlook.com (2603:1096:202:2::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4020.16 via Frontend Transport; Mon, 12 Apr 2021 11:41:42 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7fde0a25-46be-4420-db10-08d8fda7f21f X-MS-TrafficTypeDiagnostic: DB7PR04MB5244: 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: UWEpPT/wy8/I2GLkwH1EX6ll6GrcpeXoZ0U/jQMliCrNIVusvOhioOOAMjBbOOkuUDOSZq7pNs8eeuJt7YkKPwwurO7zZASQquA4ej06aFnS5BvEm15jZw5vaDFYHk1KB9evBMM6YLV7LulB/t0wBE3hcyHGA9NcWaLXIPXy5odTSvM7wDf7Zsa0f+G/1JEWeyHJr7saL5FpCLNaj7FSvrzOQD5tET5j3ZSPAljzZJjsGMOqNiexeVY2ITcTp15Kg8XVx2EXdUcPRgz0DlDN54clk9BntQDshqiJmNUKLX1DDIS1hZlpsCDTbrk8cvR40RBf80RjEDS2Z5UVADu8OyPVciiUbDPHN+ygnbiUiAg1K/Qx1BuzmJbDVOvU+doqh7UdtZA1zBan32BMYbH0VZyjrn6xx71+DVXfFGiuWjxWS2UcbfovB5BcKB29GD0fsDmPQUrHpiaoTvXbtTekYDfxGlVzTcpw3GWnQB3bLWVmYHUdKL9G2UpTGsZ83F32uUE8v9Ltdozgm5V35BbvIgPjoANfJXL6toawS+0uVzli0FRyJN4KqqQh9SLODzBip+00Mj5MN3suvLcc1Ser5kPwozMUKa21k1Eh7mWRtUExB3br4Pi3F5ct+zXzvNJolOdmigKXm+u1pvY/Edr6wPFTf6z3VavjDZjYMTSLG5o= 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)(376002)(346002)(136003)(366004)(39860400002)(396003)(16526019)(26005)(186003)(6506007)(38100700002)(66946007)(66556008)(66476007)(316002)(8936002)(38350700002)(4326008)(956004)(478600001)(6486002)(5660300002)(6666004)(86362001)(6512007)(2616005)(2906002)(8676002)(52116002)(83380400001)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: E4zceofgrYwvKogl2GWAdEkNJW5AX+XG4qcJfBDDItE2/aB/IVe63pq9OvZbb8TFf4wTlmbY7T49DSY+/PVsgEgAmHc/Rd4gfXQqQjE9L1s91TXnfQZwzd99y0hNlZbdmeto8rbxGQLfNeaqrhIRq0Ydu19f4Ki+UEyMdk3M1bAs0nYNRryBC4nCE4oFqR7Ag6eFu7IdFmTUpEBNYBzjbTUzJ2hUzClGlvidVhWyF2s8rn5bofeTbTlI76YSXuGKnqzCgI3HaJN8O/fKm2hfkwFaLn2kObh51meP0Mc2gzdRSPRGo07ITLhebO2dX5XO1TehCtKgi+SF7wNwgpuAtxhUC6ya4885dbfjyp9z4GxZhFxx9M5LDOOgBrUMXGD8iO0KTJvqxWAShoHG5fJsytO5JUJIadJ7pm/UK6T8iLKisHPakGaBb+3mtFlh+yNOkcVqRg3AGB5vYFGgLBlMh3Nv65lwScTxWgxJqZsCcj+JC8uhheoyvlXSN9bMrKQqHoLP+wOU2slmhAQ/5nzxEXcrIrEySlA6UnA8sx6ol8F2dcInQ6nXOdlqrnEGD/mYDUkzBvv/je/8NHRFnqX9uJiO8nDZ4rEkA0lzCfztsQl4wKlacR6y/i4nrruXwQjw2OLcDRk3l1FenHNZ2LIRDo4YU28/BVA+9YDnZ6ohqR1Ymx01f5fC8ZVSqxFzbYH3cj3X2SFvKG7gYIt+xTIp+3ShQQwKefJ2+G0zyIw3V4rYu4ZLsgwFS733O+ciwsVR6haT74VDEMBucJ234lloKvEyVni6m/hkkccdBlTLfZKe4hoGX5nQ6sB3JwGpBeW9H5MjdD4LSvKvIMTfE1yas0piNo2/YPU72yjxHPd0Qv0N2lqLol/A68lswsxKJqRyT5B//QsJcAZC9swQUqJ+Sgb8j2cDhHW5a/JK4D8QxJFK4wGzchALT35VeugLUstAi1BFF6oSJ6PDDecAG4CzH4u1hl/rF93Lz990Zn506yr+odMWzgb/Dui7gt24iCCzcB0jwrPBkP8uPzb3jTZLk6QFxOOThs8nQBPHIEjUBfW/+2OIOs7JrqEbL4DzrK9RSlHIUvlvqPI0hPUpk1c3+za4a49cxK9Vnl/l4rbc8iyV5XHd1KNP2ROTN9Mmi6EgYYUpjszXELFC2Ti4t3PO7rJNm1FTem0d/loIRQ4V3rU45/kuMZHGo2QJlnjLopVDKrIPvhmgH8C3T4M9+PBNLeoNmj4T25FqL34XaPbDlvXKhCduRF7R9q9yZPAX3CldR7SxYif1aBd0tXPDnkCCdl9I0njSinNMKkJMBjzcHJGWsAzJ5F9N2Q55xQTJ33gAPrvxeJ8DPHIsSMB2ag3Y2Q== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7fde0a25-46be-4420-db10-08d8fda7f21f X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Apr 2021 11:41:43.8414 (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: /uUQd5nbKz4mzsDaesoStKW1ENfWSIObwjlxUpBfL3zHBEHuemuhPuBk0c5VWMPg+jV/nknk21WnQ8s4G2p3XA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB5244 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.102.4 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