From patchwork Wed Nov 16 09:48:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Z.Q. Hou" X-Patchwork-Id: 695492 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3tJfvd51NZz9srZ for ; Wed, 16 Nov 2016 21:02:53 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DAACAB3880; Wed, 16 Nov 2016 11:02:16 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1DtxXrJ9RutF; Wed, 16 Nov 2016 11:02:16 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7A85BB3897; Wed, 16 Nov 2016 11:02:14 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BC1FDB3857 for ; Wed, 16 Nov 2016 11:02:09 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id edKlSUZuS3uT for ; Wed, 16 Nov 2016 11:02:09 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0087.outbound.protection.outlook.com [104.47.32.87]) by theia.denx.de (Postfix) with ESMTPS id 269D6B387D for ; Wed, 16 Nov 2016 11:02:04 +0100 (CET) Received: from BN3PR0301CA0009.namprd03.prod.outlook.com (10.160.180.147) by MWHPR03MB2478.namprd03.prod.outlook.com (10.169.200.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.721.10; Wed, 16 Nov 2016 10:02:01 +0000 Received: from BN1AFFO11FD007.protection.gbl (2a01:111:f400:7c10::192) by BN3PR0301CA0009.outlook.office365.com (2a01:111:e400:4000::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.721.10 via Frontend Transport; Wed, 16 Nov 2016 10:02:01 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD007.mail.protection.outlook.com (10.58.52.67) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.721.5 via Frontend Transport; Wed, 16 Nov 2016 10:02:00 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:944; Count:10 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id uAGA1FhL005091; Wed, 16 Nov 2016 03:01:56 -0700 From: Zhiqiang Hou To: , , , , , , , , , , , Date: Wed, 16 Nov 2016 17:48:12 +0800 Message-ID: <1479289697-23809-10-git-send-email-Zhiqiang.Hou@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1479289697-23809-1-git-send-email-Zhiqiang.Hou@nxp.com> References: <1479289697-23809-1-git-send-email-Zhiqiang.Hou@nxp.com> X-IncomingHeaderCount: 10 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131237641208927413; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(336004)(199003)(189002)(105606002)(76176999)(50986999)(36756003)(575784001)(4326007)(77096005)(104016004)(2201001)(106466001)(8666005)(92566002)(356003)(626004)(6636002)(2950100002)(97736004)(305945005)(5003940100001)(47776003)(5001770100001)(7416002)(86362001)(81166006)(87936001)(7846002)(6666003)(8676002)(81156014)(50226002)(8936002)(85426001)(48376002)(5660300001)(68736007)(50466002)(2906002)(189998001)(7059030)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2478; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD007; 1:cdC11RAXUCLhwoOrUKpk72Rl3oUUZ+jK6WjrQd87qghukAGPvpD9GspCe15tIrHtd5TdgmEZM7jQnX/7rT4XtAPEa/Jn5tpLjpXdXAhcCQBHniIkDx9c2Pf40Oow6ICpZuLLurVQGsC6YcBEYwneY3WekTN3kyLQgt7EM5fp2KWjX6TxJoRWCBi92Z6UyC6BIhqDpeUHRlsZpIUC0akb2hYp9xsGwqX7OfeYYMtOkec+55CLrGecDsLsFDmXkrvntcfCrYSSHrsv8EgeJslLMSzrGJwkPw6XUoky90QsTOb5+r8ExN3sw9TfVvMk0chhb2izKa6CKZm0x/mGSymey3H6SeBTFlYNHfokG68S5si+Xu77IhYMfHJwZSRvYNVLPIp48fp2qyAIzr9E/rq+kqfAV9TMbER701m6PF9qFx/DQipYt0gnYDp7dgpArrMcxaLjrqQ7Z3GsVvHbK87jh5f9aHfQIcwvgiOHKIYq8Ip5HDYNjaFsrnmXJ43YaihDXKyELrF6mr1y8HdMx38cv18buSJDPQMtzG/ZeYz2ffLhbw9G49fBrHrXjdGmZNYvN1ZUcpNNec1EMFJJa5IQOQqWfpZ5kfeX+E9im8G0LsNYJCkCxoaGlcRYk0z1KHGdIrh+8lhR8JkOhHQoYnE9TVB/iwoUQdtZ8QZPiM9Vt9R7p6CzQdOWQe7t4eUzZUMM6Mn/3Rs0/JF95Th0bBLUgtZPoy8IWizd4qtnx1YFmdts5hNB8auwqEB91rpkDbsI MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2478; 2:n/p3HRJez03KvoRgWRlog85Do5Nx1KZPGlsVrZIEpQ5fu2cb4VlFiks2MJUG/9dieQSt12a8LQjxy/OS0Uw3e8wck1NbYj82R6VqskqP88H1WYBzebqDamPDkekaOLlooiaflc4kdsIajj1LNv+I9rv/V/h1GV+8bqVdavRmxc8=; 3:cCnzqDFSSwqWUt8uxm7jFlBESmBfwZUtCM6X/6AMYRi0VZxGXdG2qrQz2ngjk714sj9RuycCHJAP7FwEDUSQrYaDLjoxIteN9FdSJ/dX8nJyUF7XVTCEyfZdOSRevB6AE8px2zsS8RGi18MxcISJhcCbCqR/6UgPKeimfUO2oJ9XKRPGlbElXox70EeSVwFmCh0Lf280GZ8Wi0lY6NKAOBvwfJ0yG6kYEhvEtbztbcUMoL14fJK+LirKDYEWV8VOftMXma5TJLILK/1PYSnpOA==; 25:FLz1iqCMoJ4SXpGPWBa1ReNCTeYGJJna27v11o98jFGVg8OSaiVOamnAC5qRHpKGb734QqVI758PtCyRCoVgJzUVu+h7tTfGqnikBl/qOCcjt8w8pSa0ajhDKsAhlZjQ67qkqXo2RZmRyHtL5ezshI9BXcl0F1GkrQdQjQon//EIEpzgJL9Ktb46nor3RU6YnbppHfBFk4eqYiFFaPoz0DTZRNplhoQW/r1v64qIgrPiE7hVPHdbcytgqaUY0nD1+76uNA+4Mv0xpUoLmrtDc82aE3mXFJ+WLhHA191By41towfzz1Wd8EC4v01+DjfeB2z7ReC+TtugrCQQTmkdYaiYJ14+QwvHK1dxWgcywfQ6FvOGAaryyRMB8XelKbw8ngzfAehIrhgB+gatRtfVQbcsuHJGJ9DVpTEE/TxkV8YtP9yO2qc6TtaC4LOcSLfhgHs5T5FJPVe9QAQgdx7UUQ== X-MS-Office365-Filtering-Correlation-Id: c52e1caf-58fc-4e20-b354-08d40e079bdf X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:MWHPR03MB2478; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2478; 31:nHsgWSiXtyUUhFaVz8FdlbvAXJSlx4HOrppQuFyleLsgayAsCOKscEAHUFqtfydF673+T2tNbbRwqMp89rKCptjshxvVb+Ez96m3ySf14QIKfrTbz4I66OmdyVVTfsB7d11FjHe5vIYvsSCPguRSuYiHb7noSWkM4Osl6FyceFdf6VnOykgi3elWP+5AgD9H81N+4pb5CZgIqtSJfGSqrx0GuoA6yfSqHvS7mCSgkUl/zggsYCVoLMDNMSjk4LS+hgP2sgLfRsi2BMB7nu3ETCJ37QJHttRtys3AtVG8JO0=; 4:s0gyjYOGnVf4ZcidU0SBIZqM5qCzLWWfWnib1iZI0mLbNnpHGzK7M5gs7IZGPEXt966KJSmx9LqEVk687uU5PcN/8y/6va9SEduzKx57FGU24iB+2k4gFAOgJ+PiZQZRjP8pS9nFXCkzsIYVjoCLG7l9kcfBJNndLEoBtJZW1VWB0wGTC/cjTQiytPEBBuGlJQrkngOUucihvsy4zu4B0boFhM0o0CR1WOaQexPZSVfhPcrpmA8zB/GQzhP2OyJmuQECt7WkNWCWvY2oHRwIx2TAuDM/XvyMsnKDxF0HY7oCvnFN7jZ8XxpazFcuvRTYzAgaw2L1yR8pj8VVEAgA1zO+xmYRvlK5pknrfRugbC23sqwsqPcad1sIMlhRuo9jZLRRqppKvmYmTtfv2scGHRdKfEa4zyeK6GJd51wMhiT3q4wGQ+5q5VmBqA6ZdwmglWUJ+Pn6KmSROI5qcMm6PZQiAOFABd3Pu5lD30RuQk+Fbltd35clubdvfAm7k6RpcW0IL2vdGg7RjZb4sEkVf8BIFgKzjkP8qjnPdNOuE8m//BCOZDXK7BumSS5JwiBuPVkddKGhm/k7H/ktUpLAJA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095035)(601004)(2401047)(13015025)(5005006)(13018025)(8121501046)(13024025)(13023025)(13017025)(10201501046)(3002001)(6055026)(6096035); SRVR:MWHPR03MB2478; BCL:0; PCL:0; RULEID:(400006); SRVR:MWHPR03MB2478; X-Forefront-PRVS: 01283822F8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2478; 23:VNAjMkWxtviATDUR9As7Gfr1jqedxRr+mb+9wuV/q?= =?us-ascii?Q?cXg+ICC8Lpp6OAYW9a8noaT9EDe2D1iDFvJfpeB8v9NXA2RrIckKicwBVhkT?= =?us-ascii?Q?vah3kuFMX/KPmBFxmy79Mmgv3KHHzfxshrXF7DwO5aXgqukFU5gsBphUkFaa?= =?us-ascii?Q?nonxSlXRo51gN4fpTLcTux1rQOj+kNmL+amwcwJpfk7wWRLNsz4+8WQQEpxl?= =?us-ascii?Q?G3+2mwWb2SeR8IYwSTy2gcUrnOwncZwJk5UXtrfP8Hd8eGyzOM7Qxi7QHd3K?= =?us-ascii?Q?PuJDWWdozvj3r5PctHLvRId+4cRyfZUPTptCy1SENYbB7eYnOcLXURyT8eXi?= =?us-ascii?Q?pfU46S+7DSNZ+re3aR31+O2mLsuJl1FccB950Z3cwpsN1B1qGEtLhyaplzhE?= =?us-ascii?Q?o1jjLXI+Fsb3s0QqoN1mbm7OXWaCHNSewNEtuhwSnvPuGun05zuolJ8aHyoK?= =?us-ascii?Q?Q7ZP6uIluDew0+jgYjeUEP8BcLr35Rji8DlPfc2h2eOiMxI5pjoj9d48tpD5?= =?us-ascii?Q?tVCOW4ocNzeZ3lTUFNOJpExeBBsA3ou7t4BjmbNexSQAtj/a7kacnzlfy9B5?= =?us-ascii?Q?GTbqlkO1Rq+LYaqilEt0leh4FKSMjsF3LshABitA41Fndcrkhrmcws711nyQ?= =?us-ascii?Q?pyU6Ctok24cJqVzvmDLB0aoQiGsfet35LNSqbhFjbkTqODNiOGRB2lJy5b9F?= =?us-ascii?Q?4FafxZUhPh9tzO7E0NCqVzag2uYV4h5PLknHXDop7W+geK90Tmfyzcj0majn?= =?us-ascii?Q?YFKxCsVQdO9Opfp7Ywet++vBDT4W6E33pPTO/npNxOU8a6BOy+4l09wGhfqO?= =?us-ascii?Q?vAq6sV/7L4YnqlEWsZBu5I6JhOK6hsiCLaqwMrCcs4tP0RSZv2ytgNRmf4KW?= =?us-ascii?Q?hAcpspSistzqIyQsPrLuUZJdsyF604qvlrJzPPK+ndh9xXQxsNb7tg8pUQDF?= =?us-ascii?Q?m+NvlTD40Ocu8YLFwMvJnMu7y1x/HSmEAVmKbgP5VP6xDA5tQ26ZpBqOY8JU?= =?us-ascii?Q?2WBrcOPiBhjPhRKelHwr5a86NxS3HCrTlY94U+EdK/sD56WwFHngK4DpWPHZ?= =?us-ascii?Q?HRaHTMm+D4+MsKUmVenm7fDBadUEsppZbLkk6ikErKgV0b0HjdGhG7sH8OVf?= =?us-ascii?Q?ye276kfeQ83769vtKAzeUatbjpQNZC1jzi+2z0sMCJMQ/HLQk9Z//ibCLcmJ?= =?us-ascii?Q?ptZcRg+emGYzPI=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2478; 6:3uAY0iRkadYkHtpe2MAORu+t0IrBu5cN6Ia97Q10I8nc46e2SAWP4d9f2tQChWPwiaOPvovypxyY/lXy7b9C2AFk1u+wyEo0k43p7hIIQzGHpThTMy01JpxvHFsHc2YCi+7I1B4y4CPoonJxuF66Ufc+xDCUBdAPjtXLWS4s6qFDPd2jeJa9P7aEI8gdEV8hJYLNymrruUNgivSZtJp0lHKgHRS19aMbBnRq+TojXOMQMsOL4A48S7u1Ayi/RkNBhqOwhC6NjOOXqnE+YalGPgjwSu5zmmUb4KLW66X3RnvnSkRinI80UXBhuLghkSh/uCMSE3aypKOSMKSesvOssA==; 5:k9rnukaKeKr2FXmt4V9GfdtGMwglfonF1ZNIQAmueAZxxx0ySLF/XaxBJOe0EnPnzAhiTLMZ6el+mFM19xPQoUobxpM/849cvRKawZHCr+CxLcRX7M8rqL5BPJSFGoMlsaVCvlqqIdnyHgiN5/naWav+Rgik03XyezDqPPgCXu14d3kqXcBRB8IOvxGZPw1t; 24:8F8tbqWXlqu+P5c9kpLlsGBpKXz/b2rqHODDpG6Os2c8QncPqMWtx33V/za1n2YhCxt7fMe9QD26w5btA8B8Ld+R1oXnEoefwRKhCUj8DYg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2478; 7:j6VIu7dQX+3SPumIZgMiOBXCOqSFt7Of3iErTZiihIp2ZVolYDxl0Od4EP+ZHX57PRn7/weiHaHIWBJo/9QOE0ARDl3v1+FIVzk8QNRiNxgbuNFTtkrEdIdy4QnOPYVbLg4l+1atvSPm47ED3j5SKIqeVb0SagqzKkpgFJ0pLcyv1WdLpLE423D1SB/CLJIiDderZNKa+kOY2dVNlmcrIA4o+mrLP59Df7/15a5i8X3HPj71O1pH5jLGYcQYJ2A5AzEBUUz93jmkELDPL+B/owK71Dcahop8dKgs8wH5w4kEoMV4perXuI3FXBT6qIoMvcZ76ZhVGHst543VWsMAaosxJXyhXHFOVjdTsSg2ZNY= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2016 10:02:00.6899 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR03MB2478 Cc: Hou Zhiqiang Subject: [U-Boot] [PATCHv3 10/15] arm: ls1021a: Enable PCIe in defconfigs X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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: Minghuan Lian The patch enables PCIe in ls1021a defconfigs and removes unused PCIe related macro defines. Signed-off-by: Minghuan Lian Signed-off-by: Hou Zhiqiang --- V3: - No change configs/ls1021aqds_ddr4_nor_defconfig | 5 ++++- configs/ls1021aqds_ddr4_nor_lpuart_defconfig | 5 ++++- configs/ls1021aqds_nand_defconfig | 5 ++++- configs/ls1021aqds_nor_SECURE_BOOT_defconfig | 5 ++++- configs/ls1021aqds_nor_defconfig | 5 ++++- configs/ls1021aqds_nor_lpuart_defconfig | 5 ++++- configs/ls1021aqds_qspi_defconfig | 5 ++++- configs/ls1021aqds_sdcard_ifc_defconfig | 5 ++++- configs/ls1021aqds_sdcard_qspi_defconfig | 5 ++++- configs/ls1021atwr_nor_SECURE_BOOT_defconfig | 5 ++++- configs/ls1021atwr_nor_defconfig | 5 ++++- configs/ls1021atwr_nor_lpuart_defconfig | 5 ++++- configs/ls1021atwr_qspi_defconfig | 5 ++++- configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig | 5 ++++- configs/ls1021atwr_sdcard_ifc_defconfig | 5 ++++- configs/ls1021atwr_sdcard_qspi_defconfig | 5 ++++- include/configs/ls1021aqds.h | 16 ---------------- include/configs/ls1021atwr.h | 16 ---------------- 18 files changed, 64 insertions(+), 48 deletions(-) diff --git a/configs/ls1021aqds_ddr4_nor_defconfig b/configs/ls1021aqds_ddr4_nor_defconfig index 95930f3..64ca746 100644 --- a/configs/ls1021aqds_ddr4_nor_defconfig +++ b/configs/ls1021aqds_ddr4_nor_defconfig @@ -29,7 +29,6 @@ CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_USB=y @@ -38,3 +37,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig index 27ef79d..4f1b0d1 100644 --- a/configs/ls1021aqds_ddr4_nor_lpuart_defconfig +++ b/configs/ls1021aqds_ddr4_nor_lpuart_defconfig @@ -30,7 +30,6 @@ CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y CONFIG_USB=y @@ -39,3 +38,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls1021aqds_nand_defconfig b/configs/ls1021aqds_nand_defconfig index 63f455c..cd0c12d 100644 --- a/configs/ls1021aqds_nand_defconfig +++ b/configs/ls1021aqds_nand_defconfig @@ -41,7 +41,6 @@ CONFIG_CMD_FAT=y CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y @@ -49,3 +48,7 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig index d9f3503..38b727f 100644 --- a/configs/ls1021aqds_nor_SECURE_BOOT_defconfig +++ b/configs/ls1021aqds_nor_SECURE_BOOT_defconfig @@ -31,7 +31,6 @@ CONFIG_CMD_FAT=y CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y @@ -41,3 +40,7 @@ CONFIG_USB_STORAGE=y CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_OF_LIBFDT=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls1021aqds_nor_defconfig b/configs/ls1021aqds_nor_defconfig index 12205ea..a4534f3 100644 --- a/configs/ls1021aqds_nor_defconfig +++ b/configs/ls1021aqds_nor_defconfig @@ -29,7 +29,6 @@ CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_USB=y @@ -38,3 +37,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls1021aqds_nor_lpuart_defconfig b/configs/ls1021aqds_nor_lpuart_defconfig index 4d910cd..6cecc04 100644 --- a/configs/ls1021aqds_nor_lpuart_defconfig +++ b/configs/ls1021aqds_nor_lpuart_defconfig @@ -30,7 +30,6 @@ CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y CONFIG_USB=y @@ -39,3 +38,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls1021aqds_qspi_defconfig b/configs/ls1021aqds_qspi_defconfig index 79eb9fe..8a7f145 100644 --- a/configs/ls1021aqds_qspi_defconfig +++ b/configs/ls1021aqds_qspi_defconfig @@ -35,7 +35,6 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y @@ -45,3 +44,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls1021aqds_sdcard_ifc_defconfig b/configs/ls1021aqds_sdcard_ifc_defconfig index 402cce7..b5027d0 100644 --- a/configs/ls1021aqds_sdcard_ifc_defconfig +++ b/configs/ls1021aqds_sdcard_ifc_defconfig @@ -39,10 +39,13 @@ CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls1021aqds_sdcard_qspi_defconfig b/configs/ls1021aqds_sdcard_qspi_defconfig index 6f3588e..374352f 100644 --- a/configs/ls1021aqds_sdcard_qspi_defconfig +++ b/configs/ls1021aqds_sdcard_qspi_defconfig @@ -43,7 +43,6 @@ CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y @@ -53,3 +52,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig index 5899dee..0c8c4aa 100644 --- a/configs/ls1021atwr_nor_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_nor_SECURE_BOOT_defconfig @@ -30,7 +30,6 @@ CONFIG_CMD_FAT=y CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y @@ -40,3 +39,7 @@ CONFIG_USB_STORAGE=y CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_OF_LIBFDT=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls1021atwr_nor_defconfig b/configs/ls1021atwr_nor_defconfig index 2b351aa..98d7a5d 100644 --- a/configs/ls1021atwr_nor_defconfig +++ b/configs/ls1021atwr_nor_defconfig @@ -28,7 +28,6 @@ CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_USB=y @@ -36,3 +35,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls1021atwr_nor_lpuart_defconfig b/configs/ls1021atwr_nor_lpuart_defconfig index daede61..9443598 100644 --- a/configs/ls1021atwr_nor_lpuart_defconfig +++ b/configs/ls1021atwr_nor_lpuart_defconfig @@ -29,7 +29,6 @@ CONFIG_OF_CONTROL=y CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y CONFIG_USB=y @@ -37,3 +36,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls1021atwr_qspi_defconfig b/configs/ls1021atwr_qspi_defconfig index 05793e9..ec35138 100644 --- a/configs/ls1021atwr_qspi_defconfig +++ b/configs/ls1021atwr_qspi_defconfig @@ -35,7 +35,6 @@ CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y @@ -45,3 +44,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig index 29f0c8e..099c125 100644 --- a/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig @@ -41,7 +41,6 @@ CONFIG_DM=y CONFIG_SPL_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y @@ -51,3 +50,7 @@ CONFIG_USB_STORAGE=y CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_OF_LIBFDT=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls1021atwr_sdcard_ifc_defconfig b/configs/ls1021atwr_sdcard_ifc_defconfig index fd5c6e5..7fa3345 100644 --- a/configs/ls1021atwr_sdcard_ifc_defconfig +++ b/configs/ls1021atwr_sdcard_ifc_defconfig @@ -38,7 +38,6 @@ CONFIG_CMD_FAT=y CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y @@ -46,3 +45,7 @@ CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y # CONFIG_VIDEO_SW_CURSOR is not set CONFIG_OF_LIBFDT=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig b/configs/ls1021atwr_sdcard_qspi_defconfig index 3f6fb17..19fd1e2 100644 --- a/configs/ls1021atwr_sdcard_qspi_defconfig +++ b/configs/ls1021atwr_sdcard_qspi_defconfig @@ -43,7 +43,6 @@ CONFIG_SPI_FLASH_ATMEL=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y @@ -53,3 +52,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 53f0368..e26e751 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -503,24 +503,8 @@ unsigned long get_board_ddr_clk(void); /* PCIe */ #define CONFIG_PCIE1 /* PCIE controller 1 */ #define CONFIG_PCIE2 /* PCIE controller 2 */ -#define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */ #define FSL_PCIE_COMPAT "fsl,ls1021a-pcie" -#define CONFIG_SYS_PCI_64BIT - -#define CONFIG_SYS_PCIE_CFG0_PHYS_OFF 0x00000000 -#define CONFIG_SYS_PCIE_CFG0_SIZE 0x00001000 /* 4k */ -#define CONFIG_SYS_PCIE_CFG1_PHYS_OFF 0x00001000 -#define CONFIG_SYS_PCIE_CFG1_SIZE 0x00001000 /* 4k */ - -#define CONFIG_SYS_PCIE_IO_BUS 0x00000000 -#define CONFIG_SYS_PCIE_IO_PHYS_OFF 0x00010000 -#define CONFIG_SYS_PCIE_IO_SIZE 0x00010000 /* 64k */ - -#define CONFIG_SYS_PCIE_MEM_BUS 0x08000000 -#define CONFIG_SYS_PCIE_MEM_PHYS_OFF 0x04000000 -#define CONFIG_SYS_PCIE_MEM_SIZE 0x08000000 /* 128M */ - #ifdef CONFIG_PCI #define CONFIG_PCI_SCAN_SHOW #define CONFIG_CMD_PCI diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 4a579b1..32e18ef 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -376,24 +376,8 @@ /* PCIe */ #define CONFIG_PCIE1 /* PCIE controller 1 */ #define CONFIG_PCIE2 /* PCIE controller 2 */ -#define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */ #define FSL_PCIE_COMPAT "fsl,ls1021a-pcie" -#define CONFIG_SYS_PCI_64BIT - -#define CONFIG_SYS_PCIE_CFG0_PHYS_OFF 0x00000000 -#define CONFIG_SYS_PCIE_CFG0_SIZE 0x00001000 /* 4k */ -#define CONFIG_SYS_PCIE_CFG1_PHYS_OFF 0x00001000 -#define CONFIG_SYS_PCIE_CFG1_SIZE 0x00001000 /* 4k */ - -#define CONFIG_SYS_PCIE_IO_BUS 0x00000000 -#define CONFIG_SYS_PCIE_IO_PHYS_OFF 0x00010000 -#define CONFIG_SYS_PCIE_IO_SIZE 0x00010000 /* 64k */ - -#define CONFIG_SYS_PCIE_MEM_BUS 0x08000000 -#define CONFIG_SYS_PCIE_MEM_PHYS_OFF 0x04000000 -#define CONFIG_SYS_PCIE_MEM_SIZE 0x08000000 /* 128M */ - #ifdef CONFIG_PCI #define CONFIG_PCI_SCAN_SHOW #define CONFIG_CMD_PCI