From patchwork Wed Nov 16 09:48:16 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: 695499 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 3tJfwz2mjFz9t5m for ; Wed, 16 Nov 2016 21:04:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 12F22B38F4; Wed, 16 Nov 2016 11:02:51 +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 D6DI1GvIbbxv; Wed, 16 Nov 2016 11:02:50 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8825EB38E3; Wed, 16 Nov 2016 11:02:41 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 16573B38B6 for ; Wed, 16 Nov 2016 11:02:36 +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 9iAvmOKHpVYX for ; Wed, 16 Nov 2016 11:02:36 +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-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0084.outbound.protection.outlook.com [104.47.34.84]) by theia.denx.de (Postfix) with ESMTPS id 073CFB386C for ; Wed, 16 Nov 2016 11:02:21 +0100 (CET) Received: from BY2PR03CA049.namprd03.prod.outlook.com (10.141.249.22) by CY4PR03MB2472.namprd03.prod.outlook.com (10.168.165.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.707.6; Wed, 16 Nov 2016 10:02:18 +0000 Received: from BN1AFFO11FD039.protection.gbl (2a01:111:f400:7c10::183) by BY2PR03CA049.outlook.office365.com (2a01:111:e400:2c5d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.734.8 via Frontend Transport; Wed, 16 Nov 2016 10:02:18 +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 BN1AFFO11FD039.mail.protection.outlook.com (10.58.52.243) 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:18 +0000 X-IncomingTopHeaderMarker: OriginalChecksum:; UpperCasedChecksum:; SizeAsReceived:946; 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 uAGA1FhP005091; Wed, 16 Nov 2016 03:02:14 -0700 From: Zhiqiang Hou To: , , , , , , , , , , , Date: Wed, 16 Nov 2016 17:48:16 +0800 Message-ID: <1479289697-23809-14-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: 131237641386647116; (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)(1110001)(1109001)(339900001)(336004)(189002)(199003)(92566002)(2906002)(305945005)(2950100002)(48376002)(7846002)(4326007)(81156014)(8666005)(626004)(356003)(36756003)(2201001)(50466002)(104016004)(575784001)(86362001)(7416002)(47776003)(77096005)(50226002)(87936001)(85426001)(8936002)(189998001)(50986999)(106466001)(105606002)(68736007)(5660300001)(5003940100001)(76176999)(6636002)(5001770100001)(8676002)(97736004)(81166006)(7059030)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2472; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD039; 1:s+InwyPi3ns8A6KtePYrqqzFMVEuRCu1s2fcBIoOZdgQaSq3JlOvIdR7h1t2YsDSbWTl+I39OQ+R6QKX7K4giCRF9BeOzKBMe5wAGKHVWPlanQQpge6Bm/iu5Vlp1Fj7y9tgvvseBKNxakTL0+k1wQfRbqzJ6c/dLfTDKaly4Q+VhTZBHcLF41x2bMAhjRwpPBFbWDRvTB4oINRlfqglfghc91z1WRls6muzFYuQnWQ6v72SKMpVWiRcZIwBm+TvYFaAuq8rJUaLqCHzDQ82LK4V0KtmeBpHam2mGND1lgj2SKLOLI5j5UJyN9DQkClV2LIkh5FNaV4CXSUDyDRHzwzBSvbxm732mzPbK/fQ1yCU0VrRWwlG71Q8kscKNTtBsNii6sgSJ/uB8O3f1qoiCBV+LqMmfAh7/nG88fRd07o0jWnkcqRPqQvNRsxSkl/cgPtdGHazYJYIkyxRClgZRlUnYOxz8mRs9Xb4y8mcbAD7ya8CoZuvS3u75vOqJK0I8CGE/JQuQ1PSmfcivn6oTLPk//pLkOF5WAKV4OTkYz0TUgKSLexzpaqgsfG0aeTkLkDDDo1mvAVmLcM30zjFIg/Rs4gCjEzrjlel4uq77XXzn/vc8RSnRrhlyn6PqtQ4h3mH2Wf6hPn55h1AFLF8Vahlsdj9v487DzUUY8Qp+L9v2wDLnm6VBiVnYHHqfMlhFs8WlmsVD48ravXB8BmKhB2dDne/J5DtzHlh8GW5s37as2d1IPVlyr7v52i7Pvmt MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2472; 2:kjXN0D9U1PGdUsv7/pdp/pgTCzHlxzi1mbYWGmmqTkCrFb2PQ6lufIU9W/To0RBJXw7PgiYfW2amk+sg9Qofi/3h5UA/Kf/q3fbE649aAo/rZFenttqaELoiqaHurLBcNBrknM797gS/2uV1yKb8dcAp1Fjk0Dw94eDBO8AOWsc=; 3:SZRLp3CbjqMICVaWmIvuD8cSpxy7JLw11CT2e1wjdmfhQCKMwGhjgzHKFgk0W4TH5Yj5Cv3QwYAxy+buJZm9S1dmouOq8zIRHmEcwjg8bWsJbFDStOCaez9+ox7O+3d2E05+33MkCvzImWbIf4MtqnVU7QMRHyytFE3hOXTuwKmPqcFJt60ApqB6QOp0gCoKR+iuL37qXoaG1lIq8V2r6ogBPlpWMr5H9V57Y+ycuRyafl/mLpIOgi0Dzbeik12AWFLGIGVStXuNmGsxgLJlAw== X-MS-Office365-Filtering-Correlation-Id: 6b1bbeed-8b3e-452f-7cea-08d40e07a677 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY4PR03MB2472; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2472; 25:KkXXEWs0rNhTptGB+0NWadVtQJV1OunuNuFPGobwSFe40Dxt4okejwI6ag4VqfzDqQGXs4pgs9WIg6Axj1O0X25uSjThHbbWNu1t+OcUvQyTfxKcFZt/arCOKtb8K5qWNbI/VxWgzSm5aO75IMXEo6InfwtZA9Wd4RCLolvT98MYrJ7BDfjddyP9NN8JQr3HGtJ9JijkigHlGxEhKNX/A714wqwvRSVDiXiz0IZyEKo0ZabtFV3iW2Hz+wOXO4gLWbrtneSrbrQ0Y4ZHwOp3fLWH5eoGDEVgSd0DhsyKOserECABIJQQMi7mOoI1ZaIMOAiMh4JBWCJj9Z0JgzAZ1gJ01BhggsGTIsbFZ4El81k5GKUKI4PsdkjpAKQdCeuZCPYa2Jpie6Fb4ociavyG4utazcRHzm1SzGgWxjCY40kO1UBpK1lqSJXXLwqL9V3Tjb6D8vEmfLBziD7vXakk6U/rUKYBL5NU2TGAUZJqQnS6MaPpLRCkuHvQ3c6uA3xMLpOUJkCMUFDaEf3fLk9cmyqGQxBqRTGjqds5xbuizA/HxlFC5mF0YRxoAAsHoLlUsM8PrC2t+IX2lTzHl1AF6ED2O74lCB3j7A8al501nC/QiLPeFgVLXMguTDPhYETHglQq8bx7qvb08P0+N0l2vDH8bQeLJ3UwtyE0UjlG8m19v9HRz569Rn90S9hrwBFIXHhaTzsNQcCVPGEiwW+peRmKS0LOn972+VdI3jlgUfchZKgZ2agDTbr0xG6PWpwTQEqHqPmM1TDN9VmmLOPyBMrPx+l6vVPkJR6qLYgaMeiwJ96QNSCalpSABh4ia5tY X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2472; 31:53qTLmDPlyh30vDsnrR0groyPG1CZY/xzkzjhwpX8fCpDvB4wDQfT+dG+AKM2O9Dc6RyMp/0AkmT70w6iJlIYfXSFBYsjz/Um8Kw0QzZuQ0OARFRUG6u6sPZUImPpWc+nnW1HJlXOYBbGysMeBz5QneZ6oNaPSiGe9GmWplYdBS2fjMoV4nhu3FVUGtb1Z28rt212mAq/dyMlPLgmSs0ErhBpQxKBqr3TXz9AgGZZeyhcJ2V8YDE2CXDFmMmYbwmbM4jCqmkQeceYznZO5R681K61Uf+nOZFg8CKQ3YE8u8=; 4:HSabX/mumrxNaoYVqYnUvYnd7OnUqDxFMLXX+LgvZcGWJ8S33TznLYAlN7nLrVI6X4jMVPLhbJvhXs3ABJvWR6qOVAe5/dWlRQpC8gxHl3lszIJEuw5JdvM+VM21OWHeGCgVyXZyFUhjosxuuL4UwyVLBXt2RJCXDBw/Yv58a0PaekvBGlXyu6JrSDI8z75nauSjG6vI6yc6oQMhTEexisFF/wvi9Y0qRxbtD1g6y3GjOmmHdv6pmw5TgEzkT2opFUElKSip5u5PI9mm3EO/CI1VXrQ5GPT4fxLw+U5mwpBtWWowrgmLv1CNBd0NhOst5xvFUC98pva3nW0KEOraHPB8Px4ctGx3JaWNekxx0cfIl5XNua91T/2ezyfu/EaDDqd4D6dh1MWdJvS9eUjeuz0I6jkRIdVRKfOmwqh1go6fDEj3nS5pgYtzjgYWNk3y38JDYc39oq22Y3vT7/KjMcQNQCsYH/nBCf41be4bme2LFCs+QoZ3gE2tJcx1JZbMl1s8JoBkkD+Ff6DgQniPK7Ui1QDAK6cuMmKiZ+CV0uJUcv3iPp9fc/Zv7AvG5uL3+Sap2U2s4mU4H5GFaivNkw== 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)(13023025)(5005006)(8121501046)(13017025)(13018025)(13024025)(10201501046)(3002001)(6055026)(6096035); SRVR:CY4PR03MB2472; BCL:0; PCL:0; RULEID:(400006); SRVR:CY4PR03MB2472; X-Forefront-PRVS: 01283822F8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2472; 23:7oVLm2QOcftmzsJ8lQPJ7HeSODlNVsmrqW3hbodVJ?= =?us-ascii?Q?LgC+NQD8DTcPcl6k+7Z14iebxHM/Bxn73Sl4WkrMax7thvi3IPkd0O2bAzNH?= =?us-ascii?Q?F6GbTnKzWA807meHLJJTS26ToyKl/4uWARzMxvmsI/PFzAjaqUIvGfzriuRu?= =?us-ascii?Q?NrcNLlKlkFOo0gs5dEuU5AcJOyg9G6THPWpFrmSK8yYPgcdy4QgRu74qybI1?= =?us-ascii?Q?5MGT4GnZmfQugQsbkVh7gb9gy7lF7rs269d8MryVdKTXNSr9PE5Fd3Mkf7Of?= =?us-ascii?Q?nX78gDj8zQkhbBo/zloe7icMk9Ql8Zkymrk0rWcltY8XNE1BaT0t5ma2fx5b?= =?us-ascii?Q?bNEnMKobOyiH5i/LwCgSpLgdAJGyMMjMo/uDPtT559SklJ2UIkTVZzTkYkxI?= =?us-ascii?Q?WdewdFKMFDVZBVzQ7BZf0qN8HCRPSHpdhZ1BPS8HXvdrSN+dgD9dFoiJTMIE?= =?us-ascii?Q?rc9xZqBbu6oScV9fCQ9Zg5FLTB3ddrRgMXfoDAdpVhyVImdv4e0oAb6b/ui4?= =?us-ascii?Q?eC9nfBB2+9Wl8StUl21RyyjSyRh2EvbuwQkiUVJCd9808IOQSuy8IMQ/gLPt?= =?us-ascii?Q?SEtQRS3ysAriRZOBKJmXXsMlh1Cx/owJETPcjZUsOrxvf55CyL23jpTtIK42?= =?us-ascii?Q?zdMRlHyxLc+RLoTiRczjQ4YLINQh9gEk02rki20HFWJfY41jwCM1aY9qkCbE?= =?us-ascii?Q?lUtFqLKBmnx8eKUEsD2RonKQb0Kvyd5h3Y+/rUioF+gGkC8tnKk11KasupAN?= =?us-ascii?Q?AhyaVKmYnKO0GxVfzQhGbZ01lcLrNFKnUDGQJWTQ6BsdrtgItgPsdQDu3NXh?= =?us-ascii?Q?14Ceza/YQcBF9WHx6zWvkSSZZ06HCrWCeh/QVhwTRhXBv0QoQcYWUMdH7nNT?= =?us-ascii?Q?Dw3BhMSIq/4A8N/0M+Bi4XKn9LvzylsVk3rEH797RV3tMjuzbxccLAnPJZBg?= =?us-ascii?Q?xyoeywzmCV8KiclxbluOne7suZ8L9QFxp2IPq0+yevSdfMeODWl5EEtpsayY?= =?us-ascii?Q?pyU8OmHlYoGeb28wX3R8Vn9jQgiBR6aPQ4pFzdwlLHRba6Zn9EeS4ZAbr/IZ?= =?us-ascii?Q?lCBSM4ROQbeMnxQamqtQ0brVfYzKrE/qHnoPYuybgYOGLax9B1ryKQa0ne5x?= =?us-ascii?Q?cDdxlv0hamP4Oq0TTYhqyH/OD074oWQNChXiMEj5HkK2OOnfbFNpQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2472; 6:CinEbv1oRF3R+pNMHElrdMiTBNpVQ3g3xY1nRH7CGnxK8N8c60c7e/HZkQkvdfFCz1iK//2+0zjGYDJodShq82j6Rx7ORLrDHY2e37cb2i8FTtiWQZKriqA6ZmzfLbf/uT3GYilZ9YWZmls6IHABtMzJvY5JooTr+M+p8fxk+CZPd9w2hvXhvK3Wdc2eSt7AlIQEftmh3BfdUDHa3odoo1joZsGn6aAAyFnKTGgGo5tl9IvSVcBj9jfSCquxYUEiacgr2kMb9BhV4c3uc7GZRwcMdxRGjACRg4NST6Gd9GHhU1tVrU/Lks3zpMW3gnTem6PW1dba/xhBClQyMNmzeA==; 5:YGrXHUzRXxlB+Cjx1v1lvYN1Hx+UFuwnp/87lwZY74rkhiyQcSjfB0tSwrAMDgYZhXZSwfSdBSK3eylIioanpR33D05kqMPgaPYc6ZY6UR7P86gEdHfkQd98PQM6yRrSM69acDPY+ZALS2UIJkkyV3+HHELD/v5Fi1nwLblhMv2BYD4ASHrSW3hHqPx9NDCO; 24:GUSWuQyKjG9/ilOe1T8RoML3RhZvj9LnxCLcAj3TMUK06MFZFqXkw9IG2C5aEeXDXrLkIw8jAlcKxMT2VSCW7vtay2HJSo9Iq6GNPy58L1Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2472; 7:2Hq0Q/v2ulU2KxJX0NWoFDyvb6duFMT5AcMylbAY6pnZ8NVot+JHjNCHr2w654sIBsJmiyTCKeK2/WqmTcUqKuctNmxOz2KKREgzdeJMPhucId6C+Q2q6SFzqepbx9wJIkXxCTF0Sd/ZH52FZDaoj4Vb7kar1r5IRNdvDqXRf/3TbgkRxX36gkCUwrQoDo9ZbiI3gBiRG6IuWr54Z3fGqBlzsWXQ3q6uxgFLUyfmoHpE1q1O1jVMO5sUppgAjGVJxS2y3K+1tkWBWXmo1sGQTIo1p20fCCjJyigVZ8ZE1fcncLZsuLZwLcZSRbl71ogMLkJsIAjdKpOoWS0zOXXxe+7vlS0FCJ490f7JuJWXkO8= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2016 10:02:18.4619 (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: CY4PR03MB2472 Cc: Hou Zhiqiang Subject: [U-Boot] [PATCHv3 14/15] armv8: ls2080a: 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 ls2080a defconfigs and removes unused PCIe related macro defines. Signed-off-by: Minghuan Lian Signed-off-by: Hou Zhiqiang --- V3: - No change .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 8 -------- configs/ls2080aqds_SECURE_BOOT_defconfig | 5 ++++- configs/ls2080aqds_defconfig | 5 ++++- configs/ls2080aqds_nand_defconfig | 5 ++++- configs/ls2080aqds_qspi_defconfig | 5 ++++- configs/ls2080ardb_SECURE_BOOT_defconfig | 5 ++++- configs/ls2080ardb_defconfig | 5 ++++- configs/ls2080ardb_nand_defconfig | 5 ++++- include/configs/ls2080a_common.h | 22 ---------------------- include/configs/ls2080aqds.h | 1 - include/configs/ls2080ardb.h | 1 - 11 files changed, 28 insertions(+), 39 deletions(-) diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h index 7acba27..bd07808 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h @@ -104,14 +104,6 @@ #define CONFIG_SYS_PCIE2_PHYS_ADDR 0x1200000000ULL #define CONFIG_SYS_PCIE3_PHYS_ADDR 0x1400000000ULL #define CONFIG_SYS_PCIE4_PHYS_ADDR 0x1600000000ULL -/* LUT registers */ -#define PCIE_LUT_BASE 0x80000 -#define PCIE_LUT_LCTRL0 0x7F8 -#define PCIE_LUT_DBG 0x7FC -#define PCIE_LUT_UDR(n) (0x800 + (n) * 8) -#define PCIE_LUT_LDR(n) (0x804 + (n) * 8) -#define PCIE_LUT_ENABLE (1 << 31) -#define PCIE_LUT_ENTRY_COUNT 32 /* Device Configuration */ #define DCFG_BASE 0x01e00000 diff --git a/configs/ls2080aqds_SECURE_BOOT_defconfig b/configs/ls2080aqds_SECURE_BOOT_defconfig index e5ad80d..3147cb2 100644 --- a/configs/ls2080aqds_SECURE_BOOT_defconfig +++ b/configs/ls2080aqds_SECURE_BOOT_defconfig @@ -27,7 +27,6 @@ CONFIG_DM=y CONFIG_DM_SPI_FLASH=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y @@ -39,3 +38,7 @@ CONFIG_USB_STORAGE=y CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls2080aqds_defconfig b/configs/ls2080aqds_defconfig index e8fa1bd..5361503 100644 --- a/configs/ls2080aqds_defconfig +++ b/configs/ls2080aqds_defconfig @@ -27,7 +27,6 @@ CONFIG_DM=y CONFIG_DM_SPI_FLASH=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y @@ -37,3 +36,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls2080aqds_nand_defconfig b/configs/ls2080aqds_nand_defconfig index 2161815..db8b8ef 100644 --- a/configs/ls2080aqds_nand_defconfig +++ b/configs/ls2080aqds_nand_defconfig @@ -36,7 +36,6 @@ CONFIG_DM=y CONFIG_DM_SPI_FLASH=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_QSPI=y @@ -46,3 +45,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls2080aqds_qspi_defconfig b/configs/ls2080aqds_qspi_defconfig index 7c84eba..cbde0e9 100644 --- a/configs/ls2080aqds_qspi_defconfig +++ b/configs/ls2080aqds_qspi_defconfig @@ -28,7 +28,6 @@ CONFIG_DM=y CONFIG_DM_SPI_FLASH=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_QSPI=y @@ -38,3 +37,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls2080ardb_SECURE_BOOT_defconfig b/configs/ls2080ardb_SECURE_BOOT_defconfig index c2e613e..b7bde56 100644 --- a/configs/ls2080ardb_SECURE_BOOT_defconfig +++ b/configs/ls2080ardb_SECURE_BOOT_defconfig @@ -27,7 +27,6 @@ CONFIG_DM=y CONFIG_DM_SPI_FLASH=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y @@ -39,3 +38,7 @@ CONFIG_USB_STORAGE=y CONFIG_RSA=y CONFIG_SPL_RSA=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls2080ardb_defconfig b/configs/ls2080ardb_defconfig index 1a5d83a..3c09b23 100644 --- a/configs/ls2080ardb_defconfig +++ b/configs/ls2080ardb_defconfig @@ -27,7 +27,6 @@ CONFIG_DM=y CONFIG_DM_SPI_FLASH=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_DM_SPI=y CONFIG_FSL_DSPI=y @@ -37,3 +36,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig index e40152e..551d7ed 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -33,7 +33,6 @@ CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y CONFIG_NETDEVICES=y CONFIG_E1000=y -CONFIG_PCI=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_DM_USB=y @@ -41,3 +40,7 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y CONFIG_EFI_LOADER_BOUNCE_BUFFER=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_DM_PCI_COMPAT=y +CONFIG_PCIE_LAYERSCAPE=y diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 2cae966..805457d 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -171,29 +171,7 @@ unsigned long long get_qixis_addr(void); #endif /* PCIe */ -#define CONFIG_PCIE1 /* PCIE controller 1 */ -#define CONFIG_PCIE2 /* PCIE controller 2 */ -#define CONFIG_PCIE3 /* PCIE controller 3 */ -#define CONFIG_PCIE4 /* PCIE controller 4 */ -#define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */ -#ifdef CONFIG_LS2080A #define FSL_PCIE_COMPAT "fsl,ls2080a-pcie" -#endif - -#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 0x40000000 -#define CONFIG_SYS_PCIE_MEM_PHYS_OFF 0x40000000 -#define CONFIG_SYS_PCIE_MEM_SIZE 0x40000000 /* 1G */ /* Command line configuration */ #define CONFIG_CMD_ENV diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 838568f..e96994e 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -347,7 +347,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_FSL_MEMAC -#define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */ #ifdef CONFIG_PCI #define CONFIG_PCI_SCAN_SHOW diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index b9cb6d3..f207a86 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -290,7 +290,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 #define CONFIG_FSL_MEMAC -#define CONFIG_PCIE_LAYERSCAPE /* Use common FSL Layerscape PCIe code */ #ifdef CONFIG_PCI #define CONFIG_PCI_SCAN_SHOW