From patchwork Tue Aug 27 11:05:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 1153801 X-Patchwork-Delegate: prabhakar@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="b0NGqQ/u"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46HmnZ0ybJz9sDB for ; Tue, 27 Aug 2019 21:27:46 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id D4A41C222D6; Tue, 27 Aug 2019 11:20:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=SPF_HELO_PASS, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 05330C221D3; Tue, 27 Aug 2019 11:20:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6182AC22265; Tue, 27 Aug 2019 11:05:17 +0000 (UTC) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70080.outbound.protection.outlook.com [40.107.7.80]) by lists.denx.de (Postfix) with ESMTPS id 7FBFCC2203E for ; Tue, 27 Aug 2019 11:05:14 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UrSEM8V3ITeTtkr5ZHPJFmMqgUZATQD6ctlVb+PtH/FU0EiEMxWsO44N6kEKvIzzJm4yn3niXA6PpebUPMLiiwKd/LSiOWc+/zzd9L0RsBfTpSY+C1HGNkvOhYgKvQ08h2Gd9lGy/rXBU3W9J5/HL9PkeLXqBQcEL8dgw4eblMYWBdb4s3Y+nM/iUbyUFLmsFYtGwYccd6UoktWiRhIDtiWGZxMQI7K180ReadDT/w9Z96QaRdmmifMDz6iDsj+tL//LKhIJ90OsQiGzeP/iIRFmKNFczKcGrOqUokpZc/7wHO+KHrASUcIxZ1P4/147jPRf18wc38syPNmuGeVfYQ== 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=wBiE+dTvz1RkKrflpDK9/tWynm9GTf1lxmDrd2f9a7w=; b=EYHfRO7y0RghvkmAQcgx9lQW2NLDFKGRm0WEX7l4FHuxTWRn2L7sPT3hJZGGUD6yg3vN7dMmiXPUI7UHsH3M3G8+katMEqTkDMIqjE5GEBXqhDOeja97ACT0PV0VywP06tQNrBTWJjZRem0/mhSx/VxB1ZMI1H7W1/OQy//5jjmqN2f0hYlHzs7DaR5/+FTOUxTOmlgPUvYGJ4+FfZ5x59/zg+qsEWrLAKiHtF6wUyQQrRCeNsupWBM2ByjQ2EJx1vKRppXEFRiBb+FdCWgZhCP75DsQpIkx9FH9HY+25XZfiAbJaWzNzMnjYYMFNO/0P38Yj1RN99YAnaQh2XuuNA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=wBiE+dTvz1RkKrflpDK9/tWynm9GTf1lxmDrd2f9a7w=; b=b0NGqQ/u2zl0qvPNWAQreyKCpplPXfdbfoBuea4U+kOL1COhq5PT2/H4eESEZhpEJF+HaqxBXRT4MwNEcXfIJowHfQ2uSDCv0MYGW+Jgj3bCaALThj5cgNdBYPCYIM3PXKeo9aRybqCSdy6o2kXskKXe9Cny8eiA0Fio3dZYSqw= Received: from DB8PR04MB6747.eurprd04.prod.outlook.com (20.179.250.159) by DB8PR04MB5849.eurprd04.prod.outlook.com (20.179.11.223) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2199.20; Tue, 27 Aug 2019 11:05:12 +0000 Received: from DB8PR04MB6747.eurprd04.prod.outlook.com ([fe80::7c8a:ab5d:dc27:be5f]) by DB8PR04MB6747.eurprd04.prod.outlook.com ([fe80::7c8a:ab5d:dc27:be5f%6]) with mapi id 15.20.2199.021; Tue, 27 Aug 2019 11:05:12 +0000 From: "Z.q. Hou" To: "u-boot@lists.denx.de" , Prabhakar Kushwaha , "wd@denx.de" , Priyanka Jain , Shengzhou Liu , "bmeng.cn@gmail.com" Thread-Topic: [PATCHv2 42/47] powerpc: MPC8548CDS: Compile legacy PCIe routines conditionally Thread-Index: AQHVXMdMCJmNGq1reEOSSvGbC9bdGA== Date: Tue, 27 Aug 2019 11:05:12 +0000 Message-ID: <20190827110440.11523-43-Zhiqiang.Hou@nxp.com> References: <20190827110440.11523-1-Zhiqiang.Hou@nxp.com> In-Reply-To: <20190827110440.11523-1-Zhiqiang.Hou@nxp.com> Accept-Language: zh-CN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HK0P153CA0039.APCP153.PROD.OUTLOOK.COM (2603:1096:203:17::27) To DB8PR04MB6747.eurprd04.prod.outlook.com (2603:10a6:10:10b::31) authentication-results: spf=none (sender IP is ) smtp.mailfrom=zhiqiang.hou@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [119.31.174.73] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 74f287ef-5950-4d66-d11a-08d72ade6ed3 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020); SRVR:DB8PR04MB5849; x-ms-traffictypediagnostic: DB8PR04MB5849: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1079; x-forefront-prvs: 0142F22657 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(366004)(376002)(396003)(346002)(39860400002)(136003)(189003)(199004)(102836004)(6436002)(2616005)(476003)(486006)(186003)(26005)(71200400001)(386003)(478600001)(305945005)(2906002)(8676002)(1076003)(66066001)(8936002)(446003)(81156014)(256004)(81166006)(2501003)(11346002)(7736002)(6486002)(5660300002)(14454004)(36756003)(52116002)(86362001)(53936002)(110136005)(76176011)(99286004)(3846002)(6116002)(66556008)(66476007)(66446008)(71190400001)(64756008)(66946007)(4326008)(25786009)(50226002)(316002)(6512007)(6506007); DIR:OUT; SFP:1101; SCL:1; SRVR:DB8PR04MB5849; H:DB8PR04MB6747.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: +MUstAkxZj0BoR8qjxTNKbA8sncdPh7uewt0ug4E+8OW5nfaY1wns1oa4SlBYbB7/z2nyJo6hcyYZqRDvOvt1n1JRmibwNsEiZ/SdL2WzrtK7Y3/dTtlS0qCehBonj7tMtVnYjj6BDZ+PH07iosjf0QiFXz9N42u5XGP2jBIDmTn6d9+umLsziyw1G4nmdGoF16afgNg0p/4b5r8wZ1jPEwyvvJiStvoSnb16AWIWKmJBQJsj3b4K4rpb/qRqpvGmdJnoxXnxb3ojoN7NzWeG2cXnG5LkIowDEPa6PzwomHBmIel+6fO2q/Qwnwj/eEMBuAaRb5fODolv4g2DQfj6fmTl4NpLix6wbjUnle7oWqrEJeQidNQOVptIv1TxxxXl0wxVd5e46YcYyEKQM5eweG6ScxgAPaNio8tCPR0mV8= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 74f287ef-5950-4d66-d11a-08d72ade6ed3 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Aug 2019 11:05:12.8265 (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: wVZEgSu85P7al6HdCT9Xx+Xl+GrwWAAT3xMXLFeVtc9bo4+LOtxUp8Sf/iW0tjMKn1uzcyZIAwbvU3x2G0vkRQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR04MB5849 Cc: "Z.q. Hou" Subject: [U-Boot] [PATCHv2 42/47] powerpc: MPC8548CDS: Compile legacy PCIe routines conditionally X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" From: Hou Zhiqiang Compile the legacy PCIe initialization reoutines only when DM_PCI is not enabled. Signed-off-by: Hou Zhiqiang Reviewed-by: Bin Meng --- V2: - Rebased the patch. board/freescale/mpc8548cds/mpc8548cds.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index 7d819d8df5..2799b5b5a4 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -164,7 +164,7 @@ void lbc_sdram_init(void) #endif /* enable SDRAM init */ } -#if defined(CONFIG_PCI) || defined(CONFIG_PCI1) +#if (defined(CONFIG_PCI) || defined(CONFIG_PCI1)) && !defined(CONFIG_DM_PCI) /* For some reason the Tundra PCI bridge shows up on itself as a * different device. Work around that by refusing to configure it. */ @@ -189,6 +189,7 @@ static struct pci_config_table pci_mpc85xxcds_config_table[] = { static struct pci_controller pci1_hose; #endif /* CONFIG_PCI */ +#if !defined(CONFIG_DM_PCI) void pci_init_board(void) { volatile ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); @@ -268,6 +269,7 @@ void pci_init_board(void) fsl_pcie_init_board(first_free_busno); } +#endif void configure_rgmii(void) { @@ -349,7 +351,7 @@ int board_eth_init(bd_t *bis) return pci_eth_init(bis); } -#if defined(CONFIG_OF_BOARD_SETUP) +#if defined(CONFIG_OF_BOARD_SETUP) && !defined(CONFIG_DM_PCI) void ft_pci_setup(void *blob, bd_t *bd) { FT_FSL_PCI_SETUP;