Message ID | 20210412121306.11484-9-peng.fan@oss.nxp.com |
---|---|
State | Awaiting Upstream |
Delegated to: | Stefano Babic |
Headers | show
Return-Path: <u-boot-bounces@lists.denx.de> 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=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>) 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=HGUmqRfp; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (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 4FJn1Z0YBNz9sW0 for <incoming@patchwork.ozlabs.org>; Mon, 12 Apr 2021 21:43:29 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 76F1C82064; Mon, 12 Apr 2021 13:42:52 +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="HGUmqRfp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 69EDD81FD5; 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 0D05281F60 for <u-boot@lists.denx.de>; Mon, 12 Apr 2021 13:41:48 +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=ZiPxTPspZILmLy36+wRMjUzcnOGDgp0lkrvg/X/r4ANCJC1HmLQojMFZ6Ip9Sa7OE3Bn6m+k4uHVj3bPZI9F8HJjBn5xy2mDKKQqK+GY8EER8CKxj3sExhS4IFOdf0PMb8Ei7zcYggYkoulqHJ6mDL0jj2JnnXu9vsa2RLe496Z/NRc9WjsAmR9ogigcmyRtOFqX9fsFQYOm4RiQqZoKUawHp6y1DWfX4owm+czcxPeGnjI0X4+zNelcRvH/w6JHnXY7FRxAAg/xX/r31b/UK3fJaT4B4WO8pWjJXJA+9kZJXXR9NCPt3Afxopu8ImwByNKrEh61PdBPM6TeYXPnnQ== 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=l+vjlunyi4eLrIU/ypWmbLkA1BSlgc3Bw0nmNmpg8bta5fajdsOFh101yyjL8Mjaur7gxLCU823NBVg8vUWFz8RddaYhn4GJElpmNr2+3sGluP6stEG//a1vds1oRIdev3Etqy9S+ovnjrMr0xB9BqEAxm2NSRnS6IxGUNm3tYtBsJ/QXVUdigoPtQFRTfzQkJPH8gsKXGG0ECMmKCT7yoUnYc+H2JcmglhOlex5BqXv+TVzQxDumlHrPPOYno5rT4Mm3+IeuDhj2mqbOY15AA9AQesHF8Srcr5FX6rtxbCsdl7KYc3TgDsr7DrrM3g7XZWdTZtD9Ss+meTeRkpvEw== 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=HGUmqRfpcIgL7V5pCgMMWkDsHclO1NTaO1fW/Rvz+mJ8kLOHrp/Zxb1/oAGoAjYclmSA5F7YJa99FPmDnbRV8GOdOcnRIxayg2u95a+aQ2Xy+70FEpVsZ/bdKktNDk45QwAlccG+dxrdR3kxPhql2jJAI+So8Fl9vBNh8LN6FUg= 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:46 +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:46 +0000 From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> To: sbabic@denx.de, festevam@gmail.com Cc: u-boot@lists.denx.de, uboot-imx@nxp.com, Ye Li <ye.li@nxp.com>, Peng Fan <peng.fan@nxp.com> Subject: [PATCH 08/37] arm: imx8: Move container image header file to mach-imx Date: Mon, 12 Apr 2021 20:12:37 +0800 Message-Id: <20210412121306.11484-9-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> Content-Transfer-Encoding: 8bit Content-Type: text/plain 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:44 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 362f3d8c-8ed7-4fca-3fdd-08d8fda7f3ac X-MS-TrafficTypeDiagnostic: DB7PR04MB5244: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: <DB7PR04MB52446E2D6DA16F9F41E95967C9709@DB7PR04MB5244.eurprd04.prod.outlook.com> X-MS-Oob-TLC-OOBClassifiers: OLM:800; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +UPK4E1Y+y8Rynp88EH5xS6RO5oZ//Z+vvQ6MnAdTL1IBiUq6JFEpGYSN1rvwB2XomXv4nvpdlaq8Dd3/crpboqvmyMbUqqVd6ICX7ng4FVfvNjQX5euuEaC7NK1n38knkWUB8hRTa1ChjemJoXHXRbcJVutBEJHXD7SqTeVXTN8VYoKc2aXnkEQu9XAwctKCx92RbNwDA1kgzEUxoyWWvXPnNHpGoRPZfXsAhVR5XclOVq3hPRfP7tpen/3znawyqbGc59DDtg7k/pOtxvZdbX3vzdlHC7xPLbvW7t9+M8aESm8IFf8q/XaanchvHDu+kJo/7XmCOWWiWSIUmGAYX7KG9cK11yggjtf+iTVoTMqkrDW3VDnbDsCXPccaK7unPVKANiO6nn/pYbI8TsRNdzYUizJbl/c6BzHjwh8mt3AmiGPGYHEvTaloVht8TrmUKKY5YA3qVwNfp897/Xfu049yofJWV4fcaJBqPZ9dJFq5K8s/7o5wlLDjJLwXYKCzDkeKWWbMMl0nM9XOuZni3EsKmH2uPb0faX39pVNMZF39YKVQ0pbFNToCd2PWgfrNueIZ2FI3hYVCOyJ0caqn6bwaGUv54wZeEf1RHg8GkXWDu24aqn54BKhzfrWpGUI58qP+eDr0EI3kjBEABV2Tn8ftPK1wfvmDWW9MDmslv0= 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)(54906003)(52116002)(83380400001)(1076003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: jvnii2wj6uvhW35gMEUH/0rWkHZIfGZIlwykx+WZiMywC8fIkpg61i0lkDTsmPVkwQRF+72XAiAAJ/+GeqTVWIUXVBhmFYvAlxbWNJTQF4OZ42h1g+0+pjZjM3kD8Jwj+N8+q0ZXpsujfmqmyutHRbd2fROrlLlzhG2r6VqtsfSbGUQhgh6aMO4N9xmFPppAC4j6raurxsmYDGnITILq3lws+fql9t/w/pqcoZxo/g4Fy/tDDzh2wLe6YgMknqHp+7luGoY2CEreh6RsgoQ3WMqUko5axeuxJk8/x8oYcFzyejzZ39LOIQ6tTt2/O1+YHHju7f79kwL/J7Ngu4B9CV10cgoh8N6NAzL5XzZUmXLWQ0696ASo6usGaatainlV4EpgMhuJnfNl7TDVgfPT30IIVaIcYOaq4NsZWIkxnXXA4aGzvADOBbsfK5Pc1Zw78FLTsEWWV2PdDt4rQ+xrJtzCKctre58PWA3ZokgUO/2zUEF5SewpyG7vjs63lZCji1P5c8vlWcy/ur8d34Sv3ua2+cZ6RVxLVvK8EUgZif4dmtuOjl4DWCOwHB+NoaFbfa/sotTwoAdXcnq0HKro3xSWDyuIwuVAIxSdUyxUvyiuSFdza1Wdr5/k+jNFrrfEU6t0Yq+swFec3ugRkPDFkwMMhqRlv11YXLemGMtTgR7zNgq7ubwFstD8jL4ImYHCQg5P9/pzjsi36bYBtZqwvyL4mxDKvHwPqcLHaYwtOd9d5Xaa9Ck19P5eE8qAPCwr6/Ogfyk3nZOTArz6qqwxznjBv1mmSq+t1BeN7+tb+/26wAUamFHfoDOrw0Qx/S0ZpgczPll6sQjfyecnbAPFIDaGP93Ya4V88lAz8R+WynfAeUoF0a2X4VePHQByKp2rCXS3RDDYDE/oUGduzTi70l8kHQl4ebDwXXDMhpuWFCJRzWQtjyFSUBOHD/QoBi1F9Vq3n1LP5MtUR0Yrdx3PrstBRYTOKpfQ7aYUr23A6qsppUr7Fol2Q68rA/KlviCGiQD4dh4CjpkkGcLvDQVw3wnQFqHM90w1ykcBrBG2DM+WzWXhtRa9No1tDKZpSroGsV0i1lKpCYFMxUdBzLG/LA7BjrR0N05FLKFE2NmYizOZ0AhUVbq82zaYGylfXgngYpHnBdGZmaGkqjFO3bygV3m4vJAXxkT8qgJrIrY1mD7KlsoV4KX0G6BTHmoOVb4UyNrzdSokOy6rxeag7YfgnTrallnKueefE4IhzsdGQaqbu6LIA8jSbjcA6lOAPJY8s276JkiXol49dqr+aaKoKSDr4YJddTGXwwcxDHOVnBh2OeoEQoWG+QBIbOls5+a4ii3tfJRc992e7salDJKduQ== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 362f3d8c-8ed7-4fca-3fdd-08d8fda7f3ac 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:46.3882 (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: CySnY58N2ShoujNn0+suAoAKQzq5lpvgPu2p/1KbL59MlN6nXU3wACnac8AfPhYZ0jy4Wh1UaWJtYKq1Exp1qg== 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 <u-boot.lists.denx.de> List-Unsubscribe: <https://lists.denx.de/options/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=unsubscribe> List-Archive: <https://lists.denx.de/pipermail/u-boot/> List-Post: <mailto:u-boot@lists.denx.de> List-Help: <mailto:u-boot-request@lists.denx.de?subject=help> List-Subscribe: <https://lists.denx.de/listinfo/u-boot>, <mailto:u-boot-request@lists.denx.de?subject=subscribe> Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" <u-boot-bounces@lists.denx.de> X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean |
Series |
imx: add i.MX8ULP support
|
expand
|
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 <tee.h> #ifdef CONFIG_IMX_SECO_DEK_ENCAP #include <asm/arch/sci/sci.h> -#include <asm/arch/image.h> +#include <asm/mach-imx/image.h> #endif #include <cpu_func.h> 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 <mmc.h> #include <spi_flash.h> #include <nand.h> -#include <asm/arch/image.h> +#include <asm/mach-imx/image.h> #include <asm/arch/sys_proto.h> #include <asm/mach-imx/boot_mode.h> 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 <asm/mach-imx/sys_proto.h> #include <asm/arch-imx/cpu.h> #include <asm/arch/sys_proto.h> -#include <asm/arch/image.h> +#include <asm/mach-imx/image.h> #include <console.h> #include <cpu_func.h> 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 <errno.h> #include <log.h> #include <spl.h> -#include <asm/arch/image.h> +#include <asm/mach-imx/image.h> #include <asm/arch/sci/sci.h> #define SEC_SECURE_RAM_BASE 0x31800000UL