From patchwork Mon Jun 6 11:23:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Peng Fan (OSS)" X-Patchwork-Id: 1639199 X-Patchwork-Delegate: sbabic@denx.de Return-Path: 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=Nx93k4At; 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=) 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 4LGqnW3KKPz9sGC for ; Mon, 6 Jun 2022 20:42:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A8D20842D9; Mon, 6 Jun 2022 12:41:56 +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="Nx93k4At"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 668B1842E0; Mon, 6 Jun 2022 12:41:50 +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,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE,T_SPF_PERMERROR autolearn=ham autolearn_force=no version=3.4.2 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2061f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe1a::61f]) (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 7CF5D841A5 for ; Mon, 6 Jun 2022 12: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=Q+gK7+3MATs3Bl+/HDwKe+yEvag7sXdD87cvQWPAoaaWKea/CtqN64BuEdBMvRmuP16tov3fSFWP8qjxsheC+Lb7Q+GjyLeFBGJtU2aXGSfM7XsOrALomjgP8zsfM8eNihGRn8Q0jl/eZUGdlR+w2TYzNbweABaWR1qTJ+K59FXnHBUjdkPmt6jQMWtBejteiodha/Q4ngy9ypJg8BcbJqMCtqTxbLCfwFywrHW3vGYKJbCTMX+S8itioKvmRdnxuC9vggOcnoPVR2bNfLPiq2hVowaghVlMFH2x1nUqD+88QjhV3iEZsbrZR/cEOYvWOvPcvMiBVAu6OiApYzPD1w== 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=U4Qy/EBNfOxa+aH36pioXCB3XGeCiM/5ut0mbBVk2Rk=; b=E9TnwwVN/hFWCBuN6btvdGoPwp4iGkXHh2a8FZ+xN1lHNCbUjTZWF9BvdOJGkFIdbmnu84xCZ1uosASKja0Taz8wXU03muDee+hGQ5TJMhjaSAcofpYOcxHv4iXuPIAOZc2dmda6wDpOSo2GUVJTkoYGOGSIo3Mm30VKp/ipeHq7Qvp7WHQAers9j/LfJ63l4KnwaYk0ofRF5I8eboTYsVo2fJcRWtSD1PvMtpb163HOpqJRqyidNz039WE5xkx9mcM7z/MDrIcxxNDiKr0keMND8wNe2RldaEj0tc4D6eScFL3tqxE1AlSS6+m9YOKIYBt1FUNtq1fZ4zGukIFY9g== 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=U4Qy/EBNfOxa+aH36pioXCB3XGeCiM/5ut0mbBVk2Rk=; b=Nx93k4Ato6UqcgS36SVd9MmFzDEdw3iT8RwIhfllje1fh0R0MTGxA6u0k0qfR5R0/dXlSm9M3Yh0ZxZPhiT3DjmpYfxbYhdplZ2SFiSg9GVM8RlGVURjMN4Riaper5QcSEA950LIBPHjmw8bwN58EBTMOIeJ1AmDuu9Gmpttl58= 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 DBAPR04MB7320.eurprd04.prod.outlook.com (2603:10a6:10:1a8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5314.19; Mon, 6 Jun 2022 10:41:45 +0000 Received: from DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5]) by DU0PR04MB9417.eurprd04.prod.outlook.com ([fe80::a892:e4a9:4769:13a5%9]) with mapi id 15.20.5314.019; Mon, 6 Jun 2022 10:41:45 +0000 From: "Peng Fan (OSS)" To: sbabic@denx.de, festevam@gmail.com, "NXP i.MX U-Boot Team" Cc: u-boot@lists.denx.de, Peng Fan Subject: [PATCH 04/49] imx: simplify dependency with SPL_BOOTROM_SUPPORT Date: Mon, 6 Jun 2022 19:23:36 +0800 Message-Id: <20220606112421.31711-5-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220606112421.31711-1-peng.fan@oss.nxp.com> References: <20220606112421.31711-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SI2PR01CA0025.apcprd01.prod.exchangelabs.com (2603:1096:4:192::10) 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: 8b1bc906-a5bb-49a0-fac9-08da47a926ef X-MS-TrafficTypeDiagnostic: DBAPR04MB7320:EE_ X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Z66f44AJNGpEwZwyAyZ66F5gG7ZpeDY0Qjji3+JCu9C9O3+H7EyTywrSrYOUvibnlYkSC54Sy/j6tLOTvieiidiKrv5fIC3yvqnFjkIMQQXxbAsCjjnpV6F7PFdQ68lEti2RjLYXYEaZ30u+39ku6W0j5dKCeBYfRkmSSmMotfneZ1xu0Mgz+pPUPrYOrwoY4n8MDW0Ld5LaTgWPbnl0c5oJWWkUNhS7zHFQqoGhRdiOdcYrODdLRdrHDWOnyD0Qx69DRu9JNXrV2ckX9nnwuPkPSzZLh18fcz7frVmoEe+Mez6qTWgn0rfo5BBzpLYCcZMKctlaXUyhXM1Zmliz7ZUL1IDCi2PVomBeNnz/gAjMl4lsYfSx11EQ7Hp8estXJkmUchxDlhipb/FF+DbWFG4nOwwTt0bYPH+yjim8NUtjmVRCZIP6Q4YcKv3Ns1FYtEThmni+qDFjLk9mMZQYOPgJCe+Cz5ZLDUmAtxqbW24sRuKkZ28VbkHISmtAScb7no3cu8KzPNzwPjk1+CKhQ+meH3dQzV+nx1DuDCtzahh6xD8eaUX/dLxT2XKLl4w/lx/wmfbuv++eTWF4NKHPzD2ornE5rJyCvvb3/V3QuJOGfAovK7D3wotAKmkyM3tOj7ke1g9DCLUkXQWJatFMwf1CQZMpeUiN6RQL3RewUZ7n9l8Ec7Ny/N7Er+okgY0Ul3BGIBvoSXC/kd27aMjnJw== 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:(13230001)(4636009)(366004)(8676002)(38350700002)(66556008)(66476007)(38100700002)(4326008)(66946007)(2906002)(6666004)(6862004)(508600001)(5660300002)(8936002)(26005)(316002)(1076003)(2616005)(6486002)(83380400001)(6506007)(52116002)(6512007)(86362001)(186003); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4r6YOrPmVCt786VlRBpxDfwRJQokN/BTTVNktGuQOBZkW3p8xA8WsAYSFcZpCKxqtcwbpUuCCkGi9I6ltRtrxPNtIJUYTUXtptHj9CHy5nmMg6pbT1Nk+AN63wce4EMAjQmHuq1uAj1ne+b7A8mvOBuvVgY2udVGj0t+844I4Tyd8xKi8tjZ6ijlrxgOHdcIM6L6nWXBxIZobRi4lwNBI3kACc67iqMZRK1wvaVzSbwGGZBUTwhTQKWPk1zXR8E77P0O51WK5MDPPds/utXoiCkj94i0yxOwH9cUQ+b5BxOIAICmx82rPtmNSI1SBI9M1spBWE0AOBX7tpAnXb5LeApWuDswUEInAj5BzMZ3kZr6Y6T3Z0VgbGOnlws3v6DtZtsGRkmHVTCNm4ospW42OScNOMCVgpJUkXEE1kY/6zGVJGzQ1KkbPj+u3v17Hi6d13jPgDm05DFk0lwZ3uyM4a5e4H9LMwvO0iRGFcBlDUQl2llrZUn+ieZspuQZolWoO6dCOLws/Li7Nst80G1ohSl7Wz1vPVLuOLeYiAcgI7Scg/DLoHu+8Lp1wFOoo8YhfJwVkxKBtgDkzgKLKAaGFq4gIPaamPXjsk87b8ySE+WaPkFowIEKT3PqnQS+J34HAVGAVtFOie3+Ggjf2CGVsUgdPt2ipILXdK+jrLcD+nxEoJ31viP7OzivIm2TEKBQp2dB/KZ7WwusE7FHnMXK2CW7H+RvhnQOkDVfzPkNTJDNZizFrrRCQpFkQUuUeW0yTiX5nbNn3QScSi+x0s+10ZY2w5g5dEuAtfaPbKlz85YWFa5rcLlAvLKAS4xKp0/Q7XZXrT9s7Ow9T9HoOwTfZIVv4JPQ1UwSAdsmL3uy29pji83uIL36IllLrZIkEkHa47y9NmRjZ6LLAff53fgi0OqMj7pMSVxiQ5SATh2+aUhhqJVGRJlnrosDUN2kunftEQkLtZ5RRb9v2+UI2rfszIIyo6+iNm2rzkgHMpzI2tTpb566VjSKgp9hnKrw+RLzs/g2PzBRwtlv2CViKL/48sy2hytSeauJkYfuLp3hRfUM2FKHbHEp7mpixxZ8cVdTtluTIVWziQ5TMCG9B25kddDubsosPL1zrLiaYUcpNhWWOknY/JCiUhaOPmnlKv0kCVru2zp2OCq+QGubcgscymCV8FmouX6w2S+veZ06RDCbeouEZa0YRF0rwY9uL4i6AgnpQYud23qK3LkFrBriVFc4NEZTEXwEaV+ka3EMAbyxzqJFWWxBSlRvp2xyd+Ye1RJ2+BuDVfz/625z1JeJWu/WsAcRucl42OKb8Zh845UuJXeHtZUV1p5nHc9myxCqVH+N63tHtX0+JhHm1/Ms4EdxTQnA/iDLxoS9nNrMrrT7TXTwQl/DLO0dJRnkEwZIIQkQIf/hSeSTVbhpH7DgNnxDJ0V3Is7JjcA0Xccu2HjO4/sKK5oduj8of58H5H4QgvEDdcCkT2ItElKzpdXLenqb/uhpX4GEPQg+08YrswPgTHhMBjue7CNMQa2c8AVYJLaTCCjbK8W3DwhP3uLx7AnLPuSa5tIWtn0AzsDQFG5jpqc6fuzlVtJDbj39ltL/W2LHJBeiwT7SYXooweFoxWxbMWqbLzrnJE5SC/O3nOjBGKoqp8G4BX8jsIZ517063YmqEm09pPNqnwR/7nYkyaitvHRTQjvZxQKK2Vl0lA4ngWHlnxwBDOxofUCTvdAgWDCVWssZkLVD12JD22pwfw== X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b1bc906-a5bb-49a0-fac9-08da47a926ef X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2022 10:41:45.6840 (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: PFINpaFEaG72hINmFG6QnOoPwZDJcTkwHYtPvJLu1hdbzX4fVyA2TQxBZWpzwRj/6oHPdKCbP/B9Z5RmzisTSA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7320 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.5 at phobos.denx.de X-Virus-Status: Clean From: Peng Fan 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 --- arch/arm/include/asm/mach-imx/sys_proto.h | 2 -- arch/arm/mach-imx/Kconfig | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/include/asm/mach-imx/sys_proto.h b/arch/arm/include/asm/mach-imx/sys_proto.h index fdbbfb169cb..fc5e5c66aad 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_IMX8M) || defined(CONFIG_IMX8ULP) struct rom_api { u16 ver; u16 tag; @@ -178,7 +177,6 @@ enum boot_dev_type_e { #define ROM_API_OKAY 0xF0 extern struct rom_api *g_rom_api; -#endif /* For i.MX ULP */ #define BT0CFG_LPBOOT_MASK 0x1 diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index ad0fb365023..b621269d648 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -166,7 +166,7 @@ config DDRMC_VF610_CALIBRATION config SPL_IMX_ROMAPI_LOADADDR hex "Default load address to load image through ROM API" - depends on IMX8MN || IMX8MP || IMX8ULP + depends on SPL_BOOTROM_SUPPORT config IMX_DCD_ADDR hex "DCD Blocks location on the image"