From patchwork Wed Jul 20 13:17:19 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: 1658556 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=ZLjWbydO; dkim-atps=neutral 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=) 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 (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4LnwCk5j79z9s2R for ; Wed, 20 Jul 2022 22:35:46 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 876A384137; Wed, 20 Jul 2022 14:35:15 +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="ZLjWbydO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DE84084131; Wed, 20 Jul 2022 14:35:11 +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 EUR02-VE1-obe.outbound.protection.outlook.com (mail-eopbgr20084.outbound.protection.outlook.com [40.107.2.84]) (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 76C1084118 for ; Wed, 20 Jul 2022 14:35:06 +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=Sj/XxvDrSccbggmAGXBKcRNKMV7+T6gEEMQyUb6tcxHh80xLWnAqWm/Xd6OcWtFYaUrGNYF1eqN7q0ZsWAytegyxajbywZxU2VDp/QNLluXqM9vYnHmCzQNfohl0bXkAxqsazAt0I6dO0K3PKTH8sb7RClSt4QhBU3aEPDgPOYVHFZg+mm1IdtKxuh8I+JEgls4dYh0F1HyvbBSH7nrKbp3vsqA80TPMwAeAU+zzdH8tTFjHFuBwZgj40uWZCJ7BaWRal/iS4iaaX/Iwwlk4WP0OFWaDDGqrPq7IeQThBJzpTZnHcnhIbsh6WmEH2wCCtOCvSpIh7FKZm05kdwJW0w== 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=R6+22FhtRlSXSiTVUy1nrbcsfOvxHey+5ULuGmT3TWM=; b=A8DUJxZuCm8B9UtLif4KpMMhKnxOpCA0w2o3PR5qbVSczugf1uzTVZZRfZIZuc+fPBpWGjimY+kUIYrXhliUnQpHtsM2EOsXoBnHhaQGzIiwNKKOI3w2NfwYKO6Pej4F3mx6zGNN5mW89fyHId+OZyP5MjxiF1T7QNizIO96I9/aZd6qHkEZ7JLwrssAYpcUouyi2zaeywuNiee45dYk3EYQKGfgsogr+G8kfp4U6fzdLIRfKgg8t/5+BPhW3G4BE52vDVBfzbpVLothYvw/aA0LTl37gmAN2ueVUfIF2yN8yGLUfRiqjrtfRGsn1FLwDLx7zLN9bRAMZo8cEdk5qw== 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=R6+22FhtRlSXSiTVUy1nrbcsfOvxHey+5ULuGmT3TWM=; b=ZLjWbydOQjlcA/yd3UPp6mpdA98+CpK+0bonJH4S+COsFeSAgiHeqfSSi9cpELt3q+hp4Y1SdLGPuYvCWTQW2Yhmn96IH/XDR9BRs0daxgxv6RJfuwT8jdFMuYGJvX7cW6Kx3ISg2iYIstH4AuJgx3hbOoECf8DQAuPpaZMPplM= 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 AM6PR04MB4693.eurprd04.prod.outlook.com (2603:10a6:20b:7::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.23; Wed, 20 Jul 2022 12:34:58 +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.5438.023; Wed, 20 Jul 2022 12:34:58 +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 05/53] imx: simplify dependency with SPL_BOOTROM_SUPPORT Date: Wed, 20 Jul 2022 21:17:19 +0800 Message-Id: <20220720131807.14114-6-peng.fan@oss.nxp.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220720131807.14114-1-peng.fan@oss.nxp.com> References: <20220720131807.14114-1-peng.fan@oss.nxp.com> X-ClientProxiedBy: SG2P153CA0002.APCP153.PROD.OUTLOOK.COM (2603:1096::12) 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: 317a1581-da43-4bc4-e73f-08da6a4c3d42 X-MS-TrafficTypeDiagnostic: AM6PR04MB4693: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: 7xqEVBM9YtqymDuV4XcLqtBBQ9/4H7KHjkZh9HU3OxvBQELNMaej6wxZpV5TMaM6WJHkhu1jbML88hqOZ8XIOaQIAjJnBsFF17DCNB08M4lD6ix1hb82YDvJd1aroNct9niUBNEUkX9Ky47UC7aVlp0DAtO9QzoyntRbfR8ffzqTLEM66HtnpfVbmxUycVaIflcZyQFzBAQdIuwr10dvvcd02s4nkXEwHSiJmJIbeFhGZU5N1CERFNBDheec6mahJyJ+BW/SbPdvAUnhc/zxzidXZWLOL38oGpb0LjLdCYsqkKVxJMrw2iuJBVdZsA0q85RPzhja/QDXU7DmFmxJhssFzVj53G5bazO83xLoZl7xH6MObwnH4d7j/l7Bc2dHiRK52RtjAOA9yD7WlaTUchRfYzguwz5o7Pi3tjLDj9GPLfbJ5UJPUZvVJ5z+UHzs35KDk2jMCCE/21/2eLWvZ0MLC0h1LZSmNwH7S4dDXcJldBXC+SQtEqRKRDVLUNxTgB1dy3CKOYB5IKBRzJxJgwCqk/vAJcS1X+kISTwg023djA8ZjmtDwVLUSaGpJuyVV+6H0Anu+folh3x9Bw61vT4y/auLGDpbNBHs5DZFFccOdD35pZx+e13ZjNJ27SQwQEghk2yzeIhUaMyQnVdxxz0HGTcspz+z+ptSbmbx7saV9mjotLhaxqSNj2OSP12HRZpukIUOIRtixJRBwgW+PV6pKXPLwMKQH69AilQQDTQO4/nD+FfEss5si8NaA4QqZPBHdVP9L2wcNrH8zQW32P8gL+KyVLgG9DQAhZuWlvqGVP9FU7Dv1B5Fp/QpFwA2 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)(366004)(39860400002)(346002)(376002)(396003)(6512007)(6666004)(316002)(41300700001)(6486002)(26005)(6506007)(8936002)(2906002)(86362001)(38100700002)(6862004)(66946007)(8676002)(4326008)(478600001)(2616005)(66476007)(52116002)(1076003)(83380400001)(66556008)(186003)(38350700002)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XQ+wnqmshPmIxsbyEoOK7svroHNAwRwcbdPGrZIlmeQCCoTTfmUziJWRbFwKbAKAguxiDB9yZDEc8F+mSS1KTwbN3dgvFgqllOkIaZ8pxkd+yAHOxpyAtIgbHAqj6fGX06AL+qFfVnEKtos5Otc8/hrhXpAKcADKPEHTUAxWmnJ770K9c1kI7czL/ES9PjHnwQwoPdp5vRlJ1IuArzfZCPB7yZGrNq2exxLrQACFYcwhpeY+7LTzKSLpYCNyKAu5dNOtGgrIWyKfE6NVvLaO6eMGycAjpvlNeQi9tV2AArZi46lfw8v9IcvZUCYA4I2+yY7Gqq0OqgfM2NnEM608E/b/OHKmBfnrNBfW2Oa3EtWDQC/V23Nt/lkx50pc4mF/HoDhuhWvP+As6iyaUwqOF2JntKGLl5Fca5nDEXLkL+/N0UU9EpNAYrX+PKh0dVvXNr+VS9ajptewTrZeGHMbwlTNa0aYMxC57ng/O4Ohqnsd0jA/fPmRBH9TOrLrCI7PTLS4STkmoJkucZhguEvVZp2307QSqmdwPfPFXY8OMwZoDEQEoZBb3QikX6U5/kzmDC3kslduJFh7YqirQbLUVAhOXysCUvMH8/vBgg19WQrefycVguV1KDPtrwKVqY6hULEx6NvgQf6CAu0P3ticOBUM9g/uhJRO3LRGNwzNw+sKaz3RdTQNFliDituFhhVfS8uwaYXI2dTREwrGgkCSY/SY9yT5TOJnd5oxxZtNVFPQowFwNJSGWh9ocHIBk3M87VK8DfVztxQHW3DSjSeJ7KcyOd+a1mq2YM9Av5io97WOT40urs5c+9Z5srLYy6FJyw1WmWKZW8OhfqG0asueuUrykdYBskg2Ui9/gppqHNvzgGO9NmGShLSzZfFkK/8LJBaBSRlNjnzguAqhW0cLEWByDupwfHNQHNpwD9G6P+rQCpsuJzKJe/s7UX6H9OjbKDdgUfdHV69K8BLTT0gQ5WB+SPcvhz06gvkBkNuqMhCDTPYTv7dnAW1jwsafwuSOmvBOYxtj5MfTngMJAxPdgiNVZp1g6AT7rd5q7Mn8MyiKis48CwAn5pAhsxBB73Thz0bN4Ai/+oVJ9GrrpkNZqoypMvqk/qNhTruINh4EVG7+n0tIaNxFv9H2cABOx+S4kY6KeNxcUIp8VANWXcVxzHUVXAkdpdelzpWipVEEoLFmNO7h+SyrhXTHb2V6DhW+rCjo/Wql3P7nILZ7xea26SQSWIPE5uTb4VB4UHxDgEEQjdfLNwvq4OFYsKxYMWvlITo/bayyc+UOYV7Lo4hhOO7Q6LE1J7m+iGPHEZuV5i0iqmbI4SipYKXxD7fwdsvrnpybFrcHcFQ/y9v+seyLVf8l63J+Dk7gkKYlovhyX0/5G/+n5o7YkouX6BIPZ+gFuBuYgzb78L9bV9/aSZimBffqmeHKmIomKangRzm12yXndEHD9n8yroZ6tXgk/pNvN1S9edYtrOtWmQjYjbE7U1b3qmn7DwSQ2wClQ3pfoGEezcoIDQJlW6MM2iFKA0CMhs0RT3D2/WyO8MonK91z69eRx0n/aY1JnysFUAumaGxDnAYLOlbMDsquyWXQsAhg X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 317a1581-da43-4bc4-e73f-08da6a4c3d42 X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 12:34:50.6699 (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: flHKWyMYhv+yOdUo0t8XxQDtaX6WdsUuyxq2dzkXws9JldkWTexiFsTiE11WqOFQO0I37fZmpXnBz61+QLI23A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB4693 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.6 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 | 3 ++- 2 files changed, 2 insertions(+), 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..5e9c4d9b355 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -166,7 +166,8 @@ 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 + default 0 config IMX_DCD_ADDR hex "DCD Blocks location on the image"