| Message ID | 20220726084123.2508-6-peng.fan@oss.nxp.com |
|---|---|
| State | Accepted |
| Commit | 793b760fb0462c0b576862f6a0401f22ccd1dd36 |
| 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: bilbo.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=LJ0mWOzw; dkim-atps=neutral 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>) 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LsTn80YcYz9sB4 for <incoming@patchwork.ozlabs.org>; Tue, 26 Jul 2022 17:58:36 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 473538419B; Tue, 26 Jul 2022 09:58:22 +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="LJ0mWOzw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 817E08419B; Tue, 26 Jul 2022 09:58:20 +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.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-eopbgr60057.outbound.protection.outlook.com [40.107.6.57]) (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 0389A84168 for <u-boot@lists.denx.de>; Tue, 26 Jul 2022 09:58:18 +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=gwNaHcwg6V1pXdN780lTXId+djFV77j/c4dK0ar5TY5fk+2tn0grE1GkelFU8lwlFVP7hU3YYrInPjq/EtwB+JV8JfGo8yJNE5UDs2Rt7XiNe9lRkDMuJd99TWFyyyoxx2NGricYyx2M6MPN93UB+6p4t0jV0RcG2uopMmnQHierRFuLU6pRZkRSYfFtUTpx9zWMxE8ILHQPEK/lZydIIP34VHejSaTZ8Tq7gCnvAlPod32xnoRH2qd/BgNUwnyLiNj0h+voL96wldDk0v1G6PkFTd6kCLM5hfesaUCRCPjL24oKGbUp3tsvJvZrxo5Z3NBUE379blrSLupuz7WxQQ== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cXNAZmAGZLyUeJrDp9G1rinxp2m17M3TkXBQZxH8tzE=; b=XLdyRJh1BHALZlsybYvNI1hb9LvdBvHbrjBixbOwj6RmwquOPcszsVRb2n/H/cYtukDBt0I28r321IXyQscF+mauBE/iWm55csR+lH5JlOKlrl30JGP/rr/7eFCED83UI4YWAQhj+hsEuZMj72Zt6g8hd9iN9h2eTlPdt7r82LbtYWMc1i/OZCZPfizttWc+8mSS4c5HHUu/PuYRkhNA4jj3LC8RHQ4x/tk7BIjkiEDAbkDcj9T7V0LAYT67sEG6uCvH+NKBf+pQLoh+7ZVxsGPhV4T3FSvDMnm1Ui4/dQcp81U62lO4XPu6DbcLKKwFWsF5wd2KP1UfduBcDxtiAw== 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=cXNAZmAGZLyUeJrDp9G1rinxp2m17M3TkXBQZxH8tzE=; b=LJ0mWOzwd7jQ7AiOedd5YJE38dM4ZuaIlQyiG2DaKKJjOoysR+dSWKCaZVJnPF75rL+IHp/CkFIoPYO5GevAw8RVvXKNq0ZZn1HzQoUmqnzCulCmif6APa5wJUiaLUMhwehgBLyvThhI4VtsUBcEFUcEsx9hhAHYWSbZfS9IpZw= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=oss.nxp.com; Received: from DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) by DB8PR04MB5659.eurprd04.prod.outlook.com (2603:10a6:10:aa::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18; Tue, 26 Jul 2022 07:58:09 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::c0c2:ede7:3b85:1597]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::c0c2:ede7:3b85:1597%3]) with mapi id 15.20.5458.024; Tue, 26 Jul 2022 07:58:09 +0000 From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> To: sbabic@denx.de, festevam@gmail.com, "NXP i.MX U-Boot Team" <uboot-imx@nxp.com> Cc: u-boot@lists.denx.de, Peng Fan <peng.fan@nxp.com> Subject: [PATCH V2 05/53] imx: simplify dependency with SPL_BOOTROM_SUPPORT Date: Tue, 26 Jul 2022 16:40:35 +0800 Message-Id: <20220726084123.2508-6-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220726084123.2508-1-peng.fan@oss.nxp.com> References: <20220726084123.2508-1-peng.fan@oss.nxp.com> Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: SG2PR06CA0221.apcprd06.prod.outlook.com (2603:1096:4:68::29) To DU0PR04MB9417.eurprd04.prod.outlook.com (2603:10a6:10:358::11) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bd2c7f75-5bd5-4e92-9249-08da6edc94e0 X-MS-TrafficTypeDiagnostic: DB8PR04MB5659:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: TgcL8mlVgdoAbZ14K1dEE/UBAPyYxyw7Mr0jorZWAJNbhfomth5Sk7oCrBUiHF8fXyaCdAbCdWdJvpF0HEduiZpGmS3MYqQsW3q5tK9G2EwBeD7wNU5nYtNufxlF7qhOeHgeYtsoK2VOBPovhsm7tvEpyvHQ79zjSPYa9AwmO3VHSmiozFFamiXRnWq8QZbcUoZaLTFmwpQXbxo1qjvhfDVi8xrl7TH0OKGpiXD1vlgtX3SiKnqOJHcrcDm1Wf0bVb7JvsIJYwKUMyU/zM2xBzrD67f0I2dnOpj0lb2SWxUeRsVJ/5NywExjJOKAFqj7yaN1gT9CJQUUwzL0HVvtgcpV45zbbpjzDvFAFVrNrt2vf+xSto/cfgLptAKDpW3RjkJqBdkUwaefVcOQsRO5jHAMvTtZ3MTv6jQwo04oo5VVVaRVWl9qoQTqjosFi7RfSdCxzDUwP0LVr/sjIuYQ14ptohfCYENnfx4cBB7Bp+GIiZcALDifn2VtApf4epFGKGbALlIi/a5rSvym3TzVF0B2v7w8pRRzd95TzV0ZLPEjhFNLgUlaFiS73w0nCtkaG4GOZ3e7nAkaPDtexgdkpdQQ+hLG4F9MN9r1cNjDfVsHjL904bRb3wkSM7yhUj3kNytXGP6F/1xtCCXn15z9XvI7FzXlx4Ee3gavcxwKBIGPJ0vtE9uG4HVnHiv9GWh3TvsBlAtxMDCTFYB6uFl2jvbfdyKOszIMcf0fo06t1goNBf2UdGEgFvmTH0hOhIv96QXrlE2WcbsLA5IWVsRgUYklqUECpRn/6IqXQJOgywc0Clx2uc5TvNAje2eHnzKo X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DU0PR04MB9417.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230016)(4636009)(136003)(396003)(39860400002)(376002)(346002)(366004)(52116002)(2616005)(6512007)(6506007)(26005)(186003)(8936002)(5660300002)(38100700002)(6862004)(478600001)(6486002)(41300700001)(1076003)(6666004)(66476007)(86362001)(83380400001)(8676002)(66946007)(316002)(2906002)(38350700002)(66556008)(4326008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: flgdR+5JKJXiYL550FyD7VmGQq6VNuZFtOKYBtl+yxJ6xNvRQOw+OSq+fdsRO8vhUxM4dmCRd9QtgKBlY959nC5qW4IHyYjriuN90dt/bOJvREML/w8XZBb2If2z+SQbunPzglNjfH+vGyl03b4krC5U6JDt0dzb1ns/tXbeATPNuGfP6cyo08xvUpUiGnMtWSUIsJNGTLeXkcqJnz2p5D2WI6BegprLyUo2Qq2dqugasHHdorKN5klbfJM8n6iunu/H92159HwZlyu9Y3YJStDJu6dOk2yEME3EETy3njzkmeN63zaobZ6THC63qn1FBZ05YeQOXev42Le87ppLDsBQeUihGyvCd3pyrFVb5/nW8eaxBsjOWoRqGs2cts1zUYViK/y2qQNv2/+OSJ7mAisybwYtdIn2c/Vey/UJ295QDGbfO7aw/E5UqpMyxmN5jFeI8fK1KnA96Isu5H9eiobHRJ2KbwVTzCqGwX2gJSBsE3gmN0vr9nT/FG5GSjxD+mYlxYIgtf5O7bTEgBE05fZOp/jcNBj05RZsN9tSYZUDJqQIQSO0p5oISJutJqip9Lhw9K3bgZ4oKssGimQBZ8yO7kL6hvXPLmuXEZj7UhmJKHmP5RfUnGOvKpkiQkTdCdAYNSsBB7kNM6X2OrMsQOGsp8WRd3Yq7g+PzRRTL46V7nkuUsXhdUQm1+QCiI+VvNBd1IKn3o/vQHUEAVC0sB7nQjB2rOyuin3vE+blswDdRsK9crN/DR1kt2llsIbyXcHqmFQs9yg+TyS5HcgbE3NN/HPaGoyg1/e1L3mimCDdBxE53BST5surGHrCzv2Jr7BoKmvm1TjGNkEJb+IgBlBEEpEGQYalNhqHjeZObfcGW4SiU/cM7ZpmjpPn1zZLL1fzZs9hxJXkkRBvufzg1MLQv5fo5xYO36HeXqiArqQO5ifFgOpbXCydIJipClRlHlWHsPxz/tLXPE/5iS/am/38CR0G0aaYzffmKY9aPuZOcxJcVExXRJQsEtZuSWig4YqjAFVOSHiUGigri3tUp3mWox2kWevcHDqD4jGYUlj/5z0Tl1/gwm6WGvQD+7hkNzOudlWSIstKL6bG8NGtFYiUhRVBLW18TERNORkD17x2HeBx0G9pjDMDnfBnlU6iSD/H4JWF/4PcYksTzc286js2kuRUqSWIYNBX+CxUmcgS2rhQ2vBA1M0TuotYKPpCngPYjy7o0jK1uTAy2RjMUOOhf+2Hj2YeID/SSX7e7jWrGXM21zUkm050QXDjXgWo6+6QDlYHSAOQKXv2dOfDEbLdaC+4ZEbT+SK3iLB4HqXF8htafNtjTzxcPsh9RaSMwWHMqOnPMafcVf9toz5jcnOq6x1zPTjM2P2CJ2H7y6rZMRg8IJjgsr+Ai4r2wyG/2U7bdJ/mFoRpoX9HMkidkfX1oe2R+M05Mz4T4p5VSdQubd7GIwYp52WVLd+63QtQ5L3BfA6RsUz3g2Z4y5yc9Tun36Vo1w99KqbUSgJdtWCkCWUFvTGtSul7THLz9y0g968lKVNPNC6gPAwGn7C25umDbzkncxj5uABJk8WeV4xO3xIZMm73hl4Wvj0HI2Z8 X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd2c7f75-5bd5-4e92-9249-08da6edc94e0 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jul 2022 07:58:09.8154 (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: C2QqiuvAty2cBw14/WAJyqUYTFilu4L5MihQQ61NI2pUWW2fOtqMp8xqp4DgfLJduM8rj/aYNPyFy9Dx307eGA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB5659 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.6 at phobos.denx.de X-Virus-Status: Clean |
| Series |
NXP-IMX pending patches
|
expand
|
> From: Peng Fan <peng.fan@nxp.com> > For SoCs support ROM API, CONFIG_SPL_BOOTROM_SUPPORT is needed, > so use this macro to guard the code to avoid extend the list. > And drop the guard with structure definition, there is no need. > Signed-off-by: Peng Fan <peng.fan@nxp.com> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index fadb67d04a2..3095214f116 100644 --- a/arch/arm/include/asm/mach-imx/sys_proto.h +++ b/arch/arm/include/asm/mach-imx/sys_proto.h @@ -146,7 +146,6 @@ struct rproc_att { u32 size; /* size of reg range */ }; -#if defined(CONFIG_IMX8_ROMAPI) struct rom_api { u16 ver; u16 tag; @@ -182,8 +181,6 @@ extern struct rom_api *g_rom_api; u32 rom_api_download_image(u8 *dest, u32 offset, u32 size); u32 rom_api_query_boot_infor(u32 info_type, u32 *info); -#endif - /* For i.MX ULP */ #define BT0CFG_LPBOOT_MASK 0x1 #define BT0CFG_DUALBOOT_MASK 0x2 diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 50f4c08ea31..6b597520a24 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -170,7 +170,8 @@ config IMX8_ROMAPI config SPL_IMX_ROMAPI_LOADADDR hex "Default load address to load image through ROM API" - depends on IMX8_ROMAPI + depends on IMX8_ROMAPI || SPL_BOOTROM_SUPPORT + default 0 config IMX_DCD_ADDR hex "DCD Blocks location on the image"