From patchwork Wed Dec 28 16:43:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 709377 X-Patchwork-Delegate: trini@ti.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 3tpf3b733Hz9sCN for ; Thu, 29 Dec 2016 03:54:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 648B6B3973; Wed, 28 Dec 2016 17:54:10 +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 iaNHI4eiSzFx; Wed, 28 Dec 2016 17:54:10 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 388C7B397D; Wed, 28 Dec 2016 17:53:50 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 71F2BB3901 for ; Wed, 28 Dec 2016 17:44:53 +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 PbSqJS_svMiT for ; Wed, 28 Dec 2016 17:44:53 +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 NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0070.outbound.protection.outlook.com [104.47.37.70]) by theia.denx.de (Postfix) with ESMTPS id 4FE67B3940 for ; Wed, 28 Dec 2016 17:44:42 +0100 (CET) Received: from DM2PR03CA0052.namprd03.prod.outlook.com (10.141.96.51) by CY1PR0301MB0748.namprd03.prod.outlook.com (10.160.159.154) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.803.11; Wed, 28 Dec 2016 16:44:38 +0000 Received: from BY2FFO11FD046.protection.gbl (2a01:111:f400:7c0c::169) by DM2PR03CA0052.outlook.office365.com (2a01:111:e400:2428::51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.803.11 via Frontend Transport; Wed, 28 Dec 2016 16:44:37 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; spaceflight.com; dkim=none (message not signed) header.d=none; spaceflight.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD046.mail.protection.outlook.com (10.1.15.170) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.789.10 via Frontend Transport; Wed, 28 Dec 2016 16:44:29 +0000 Received: from oslab-l16.am.freescale.net ([10.213.172.100]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uBSGhvtb026038; Wed, 28 Dec 2016 09:44:26 -0700 From: York Sun To: U-Boot Mailing List Date: Wed, 28 Dec 2016 08:43:44 -0800 Message-ID: <1482943430-10231-19-git-send-email-york.sun@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482943430-10231-1-git-send-email-york.sun@nxp.com> References: <1482943430-10231-1-git-send-email-york.sun@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131274170775543365; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(7916002)(39400400002)(39850400002)(39380400002)(39840400002)(39860400002)(39410400002)(39450400003)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(48376002)(97736004)(50466002)(5660300001)(106466001)(86362001)(105606002)(575784001)(305945005)(7406005)(77096006)(7416002)(50226002)(36756003)(81166006)(81156014)(38730400001)(39060400001)(356003)(69596002)(8676002)(85426001)(33646002)(4326007)(2906002)(50986999)(5003940100001)(8656002)(8936002)(68736007)(104016004)(189998001)(76176999)(47776003)(92566002)(110136003)(626004)(6916009)(6666003)(2950100002)(7059030)(19627235001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0748; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD046; 1:6Qq4mwngtc6s/fAdsjLJ/ZgUsvGxIkRiCDET0hqRMO47+iiu19Ho8EB5BPEMUOdRfXIzB7t10szf7jTbgvLsWps1GD/7T61cfgHKp5HcZm7DQceTfQFeN6NAFbw4MelIcnvxA7XIJlCBscUMggoVxRkrqSYXJnHqdydk9UrMc4mwE1JwG7gyPAn9vfY2CniZ1OtsV8f3oOfOXnL7tZonHSdNxL4BsnHPKSVBFF+ouyWM9ghgnnJIh2RFLcjqMsFLS9WMoUXbyiC//unX06DQTb6aSEN5RoF8v4eRVWe4J0uFNJV1QEnqk0u8lTfKVTA1/WsP6bhIwh7w78bLe32uspMUhPK4+Hyx2urnTTOwjRTkaO9vNtEY2aKVn6zCTS4zU6xqMgLfRoLAmxMhogistHUpTZHT0IAbiAhyiEKGd1X3jnL4UOYb8ziGvYlbyaHUzFeMvjdgkV/a3buXpy3vXFAfWzgM/U2g43OfDT5cC4e3w8gKm988864mlAD5J9zbF3Qvj9EbUndVx7NWniQ6kHaAucTGeFcPJNgG6QTe4v2VizenldEtiNVHwQ0hLiASIhzcGNljnLM1JaLsCpbseENwoOV0Jjw9D7uBxLHbqatzciXchhomXCybwzIOG3BzMYtjNsstzK/STOjYC+hODtpo3MM4taEOiMXN5wSNFqk= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 7b21c314-e8cb-4fd1-3ce6-08d42f40cfb7 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0301MB0748; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0748; 3:fvrQP9nEEMJe9MNO/qCv8iSQjiKArAgvx4qRzY9KTjjH+6S3EPv9IUueTWcoxGpdNj+PTFPd2YwPRklJicFZmApsuuxH/wnKMtQvlCuKPhLkHbs+9gVU/GuIZ7bsC9keoOH/y02fIlUj2AvlMGzseeST64ZJjIWN00pe9+BEqHBvELkSJlTb+/Jc0eXUBHuGlDTvcd44OzBRBPQZI5rizZ+R6B1S0gybI0FVXeGsRCTz7MFd8sls5h4FUAyO775rk3wkw7RepJqIEJrJDpr7rwQKZYnctu4uy/dcP0SzzDjUyI39/gSWBcL3B//xwJNO6A6RmJGCTutO+LQpyT63bD8lQlb4SJIyQiFvRSmpWHGXjqxK/SuzjT8ZQ1DvL25i; 25:xgxQhQp6YYcqOaWvdx6UXpyNc5hZrtVAwFbxu9a+NoXaNAlOzCE7WUxtyAdnfALeZE/beQbszMm4K2ze5FakX210cIiRd13WmyXV4jpz1EzzdpFEQ/9ZEgJqxOhkNI3gwji3JlcMgrRhesk51rHhS4jnbBH63mRyOuM/sLv9IUs5mdPbVOvRxgWzxduWAtBSlE60wiSKiL+rM/PU0KD4sz8PXktGmyxNiQ/Zb2OIzpJG6Ya5szPewPtlpMMzeEJ29wBOA3H8Z+7Fk44IaUUpTzrZyWvzXgu1vZACWNmpJB+lFTP0L1tywObMdpaW5XOXwzjizG7B9iIhJHgdGrDGnx9MfXtA+iZwpo8/HanQDiW680cMnE84DP8lHLtAlPB7WF/PnpNG/2FB8HQ4QNv1jrls9AbfHrs+eElqrMhGJl62DJUCVmqzXdeShkazOu8GV8/g/Q00QL0OQ8P2B8kPxA== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0748; 31:+4+uteJ/iSap0dembZ8KnKwM5f/yOT0+7v2EKX9nhf4LcQTnELsBIbguwooDJL8ANBG0YfnCLe3WTMwrXZWI09TLWcDNTE4HODvxHMbvNXdB/9eIWag4z97dExlAF8uKhQnuvsiJ/NDX4Jx3Qb+TONJ0HDZ9Rli6aBljsVroR1Saf8+b6vE/jUoWIcMqvv9LcwgRBgsH99OFf6sRL+eOC6d9mvtHkg/pW/5e/Er7HVw/TZ5C+8Lk2yZimFtY7B6xTTEkWzcs0DeWeHI90xaSwQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(13024025)(13023025)(13015025)(13017025)(13018025)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6096035)(20161123561025)(20161123559025)(20161123556025)(20161123565025)(20161123563025); SRVR:CY1PR0301MB0748; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0748; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0748; 4:D0Roge9QAIJw2e/DUl1lUdpbVhdeylmrESMkRPdAvmxdhSXVENfMqsksIIWZudnY/woX8zcYyw5aPOCZU9XcXf1gWjgGm68m1ymEXgbxKL0S91DbKF5PIObBXnlYt4dtRpxoVrgM6matp+oRPXgQ2MrSI08nJeezhjaEmLC0TrtTgqhsT0JKTya8F0JDM8mvZpXcsGTb/gZY/oxH/ady2dd2cPqrNbgm4YC2akvmoJCACQY13Oer30Rkga7mo4FT5fBAY0bpjIYoP+B6d7kKd+MMKezxkvWskDC8Xg3KOkdkuqr0KeD95EknjoROsEZW7k3kaDoYSACyZ7UzCT9k6AdKoSoHtuup102ZqSFmlDfTDfTwj71/AIHGQGhBNd/CIFu0ksuRxEsNlv/McvjnYtUpvyIak6R3RvW6b2UY3SzMT2wU0FKuwiK/kGujjWwHlDSDD+HaYbO5RiL3QQeztz3YMI7Te507WkVcDYiiYkvZLidA0VPan/xADcGNLlf83suX+fQTtUZPEvvOFkk19wKd3+FsEfuBvhHYR+QkYelZTb8Nm+ca3e2kT0hmEGQPYpLDbGWTvS9amiNwd/538W+JS5gDC0b5aZgKONffF8Lw0pUYMfaKq48Rwotu3/xeEUNy+mObYwE/5rR2gej087LnW2Km7zK+o6GkeuWXzQr91r3lkXARCkWiCX5dN3v0+AP14xzh4RBp6RQbs9Zs3ktKI80D9XTAwZowilPQlxCy+fPIECcd2kjvMVWjvEip X-Forefront-PRVS: 0170DAF08C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0748; 23:1dLWHYeTVfWXRpDltTW+S2lGZ7JxNK8eKb4n3bH?= =?us-ascii?Q?8+6x19zVGXk7qayZd9g9rO3WK68LbskE4cNW2QhrHckivHAdVDMsT/tTjLFd?= =?us-ascii?Q?Drb+rMMhQrB1HzBJA4aUuj7os46Etk/Hg+a5HQeY4SPVb29/DKU1SeNzdPbf?= =?us-ascii?Q?nhb62jDZWkFBeKccuIZgbCdixnwy5Ol6eaTXAf6Etni3e2N//zoYS6IyXeez?= =?us-ascii?Q?H3BgG0UMOzn1RCLXh6MC0adzYli6gqAIZq9pGnjgVkHGEBVzlMD59HUQRd5O?= =?us-ascii?Q?6mrzmtM/LePtkrltpJepvSwFs9eYYQL85Mwyj9gURMKbfuVPAWDEt8KvI9qa?= =?us-ascii?Q?GtAr/5YGDOQfOT7n/LpqFX38FyvhBhqGWC5n9sj8FYyt7YZfWuSmCFxyreyN?= =?us-ascii?Q?y3NGf6KJ1x4efQBkuHGb149C3s8QuLIAhcXvdm0K4ZfEJ6ZCw/TSWQOdq0YS?= =?us-ascii?Q?0DNnrafcIk04IMTayGTlF8khrBA9KjwvxFqBcqW89SuLYFD9yvK2TFsNKLoS?= =?us-ascii?Q?BzS2BZw/SBTR5ZUwHETvg3WlHPbmvH6L4DqtoNGCsZOpx7Y8xhi6/A5ZPqhp?= =?us-ascii?Q?CKPXbrqhf0ZyZeQEoNoN9JoI3lwYiV+wVQKAQV/w9cfS3kSduXuMzDYv0pEV?= =?us-ascii?Q?eGCspp5jsxIdm+nhxqQ2kbQHJrn1B1UiHFS2PP04r7AS1jwl6RT7xqS5DFIM?= =?us-ascii?Q?ziXgY93hFwgskjNH6+113ZOfNkVTjW+lsAmKZA2HYrbq37BUZnXYzqP5ekh9?= =?us-ascii?Q?+ObMm5mnvcUQIHqVDkoaB6Y38ptADQOwpfv0X3gP0XgCAT3Wt8x5OJ5KkcIq?= =?us-ascii?Q?d8uZJErkgU5xX2s12HDHAoBF7MpKbloRFEino+O2Yx6ittK4YYmfBw03rpQD?= =?us-ascii?Q?P8z8AChuziIA28ZcyqwSiEGsvVqd/0GOQ+h+Ar7c5nyXLQyh1yo4fZWg1HAd?= =?us-ascii?Q?4cGXdi6F3T3Pm/rhsTkOYNpLpxyBIcF9UHMbL9rpZFTi9MFc1ViwgQNNLt6D?= =?us-ascii?Q?x/VaShZEEsPOUNUaOGrUc5Qk5U53a+eq1oazP8NdsaD3+fs5YA6aPrVX/piB?= =?us-ascii?Q?60MLRJAJhSrVbW/dcVitV2BRQDxffwgWYy/9PYKveHIsGrFLKqxT3QW8T3rl?= =?us-ascii?Q?ZCgZdu3kI/xczCG5qXbuocIxlEIFlpLA0dIArjtNs+V3YgGf6W2EU7+j9zKN?= =?us-ascii?Q?dutkHzLgcn5qZ9Cd/3BATcNXhLxQjxbSojKzfU7LgCSs5fW1gwa00ZPsuSL8?= =?us-ascii?Q?GEN+FxYQp2XWV0NZv+9dNKGRZPFH8kHiMc/FYCLDPd6zXvjXnopI8SaDcMIQ?= =?us-ascii?Q?vfphshAhOt/sWPUN4+wsx++7DcKZqSllFxa2YhvaCeiv174+ZlzCPjxx70vi?= =?us-ascii?Q?MNHGau9KlQRz+7YMxEs5s23DjU80FLivtbfWx82DA2qNJxDF8?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0748; 6:nApc1TFW0TI9/PGv2wyNLe/S28NomsNNMPUtSKC3OSevBjyIXt9X6HI6Jxo/kNLK+ra5ot9oOlwOr7j28LS1Imno49U7VuTgBoao49Dnyt09Vak5Hs8J7M3LSmk3xQtFBb03oldOqjYBuUXzS+4OHQKFQeJiM78xluivPeWx1hsyt5UGu/cQfH5NK0yFuClrATqe6u7daoJixO8Y5WAuGxw4ioy30/Al0LY4qsyAOaFyIVHX7DpdZOgEbMzKvTKqOhfqIlEASBfXMltTdfKKNOSKyQl474JwoK4r9r8jLNsuYlY1+Jb/w4SMGidO8XwsBGXMfs9St6N0CoFZtUEMZzkyaaFVrZRX4bExPU7UvGFiLVe1LV2HoeHzf59wx6T3TGCR8/KJVAUfOppu6sgYF0jxaGgdkHEx2tCJomstPr1vivP/d1ZdIpxGvB+OeFEy; 5:24ojB93cC2fIj7ugyBBo+MTrKEGH6VbAVWp/sb3zDCAHJVcaH2fBTRdUE1YumtJwRBWDm67rZJXs2H8drIQWaMj3h0oHuHqsVrLTUKRGWvz2Ry9z16susot1oCS6lH9XaM0vy0eXenKZ6w981PR6IBm8Frnc+EhN+3+a+S148rfeQHTQFtj6QH530gowuQ7J; 24:omsDcIxK0MPMpPnVr1lYNbVSihpCQMgsudl35YQlJA13ue+MWHvmrR4Q3yHn9qnM9VknL9qk2Tzwtznm3ZAEmqb9cZKl2sVMNfJNXv36rbw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0748; 7:Ae1Z33LQS/ZwS+y5KVxgN1pyOT59XJUPNUpc2bRuBe6832rPNkNzEI6tvHgmw6ofeTZSIthyDGKiUAenPK4iXiwR1CjODKwKVAXjve5LfYQAlFRogmM8v4Wgm+seH6mjawjDVsMQ9P8XFMAxccLb9ydPBVYMbe65hCXvGDS3nZaMMxrJfUCtNmqHLX0x4llEFfV7YXWI47t1Lay+sdVie7wZ8rbBg4oDpkDLlQahhlwslt04x4XqdJsUVmxMtZV/borcJvVhfMnP0seu75R7/o5q4F6ZkgBsGVBazo9DP+mw4uBOebTtFz5iflyxGq6+I05CV7wZutlGuskpi+A3EQPVeHX0kwfnXlEnF6hTZBPPPEiUqUL73lR9xKx7dT50RYDJj0R8w5EcsQH2fYe5OIYBo1RvbDiaJdF2FU86s0+bG34KXOZtIQEghrwcw/OZedR8yfR1HF7vklvTq9Ja5Q== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Dec 2016 16:44:29.1459 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB0748 X-Mailman-Approved-At: Wed, 28 Dec 2016 17:53:27 +0100 Cc: Dirk Eibach , Viresh Kumar , Peter Tyser , Jagan Teki , Benjamin Kamath , trini@konsulko.com, Stephen Warren , Hou Zhiqiang , Scott Wood , Oleksandr Zhadan and Michael Durrant , Albert Aribaud , Joe Hershberger , Aneesh Bansal Subject: [U-Boot] [PATCH 18/24] ddr: fsl: Move macro CONFIG_NUM_DDR_CONTROLLERS to Kconfig 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" Use option NUM_DDR_CONTROLLERS in ddr Kconfig and clean up existing usage in ls102xa and fsl-layerscape. Remove all powerpc macros in config header and board header files. Signed-off-by: York Sun --- arch/arm/cpu/armv7/ls102xa/Kconfig | 4 ---- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 5 ----- arch/powerpc/include/asm/config_mpc85xx.h | 17 ----------------- drivers/ddr/fsl/Kconfig | 14 ++++++++++++++ include/configs/B4860QDS.h | 1 - include/configs/BSC9131RDB.h | 1 - include/configs/MPC8349EMDS.h | 1 - include/configs/MPC8536DS.h | 1 - include/configs/MPC8540ADS.h | 1 - include/configs/MPC8541CDS.h | 1 - include/configs/MPC8544DS.h | 1 - include/configs/MPC8548CDS.h | 1 - include/configs/MPC8555CDS.h | 1 - include/configs/MPC8560ADS.h | 1 - include/configs/MPC8568MDS.h | 1 - include/configs/MPC8569MDS.h | 1 - include/configs/MPC8572DS.h | 1 - include/configs/MPC8610HPCD.h | 1 - include/configs/MPC8641HPCN.h | 1 - include/configs/P1022DS.h | 1 - include/configs/T1040QDS.h | 1 - include/configs/T104xRDB.h | 1 - include/configs/T4240RDB.h | 1 - include/configs/UCP1020.h | 1 - include/configs/controlcenterd.h | 1 - include/configs/p1_p2_rdb_pc.h | 1 - include/configs/p1_twr.h | 1 - include/configs/sbc8548.h | 1 - include/configs/sbc8641d.h | 2 -- include/configs/socrates.h | 1 - include/configs/t4qds.h | 1 - include/configs/xpedite517x.h | 1 - include/configs/xpedite520x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - scripts/config_whitelist.txt | 1 - 36 files changed, 14 insertions(+), 59 deletions(-) diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig index 4b904f3..9ffb90e 100644 --- a/arch/arm/cpu/armv7/ls102xa/Kconfig +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig @@ -33,10 +33,6 @@ config MAX_CPUS cores, count the reserved ports. This will allocate enough memory in spin table to properly handle all cores. -config NUM_DDR_CONTROLLERS - int "Maximum DDR controllers" - default 1 - config SECURE_BOOT bool "Secure Boot" help diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index af84e40..de0b580 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -115,11 +115,6 @@ config MAX_CPUS cores, count the reserved ports. This will allocate enough memory in spin table to properly handle all cores. -config NUM_DDR_CONTROLLERS - int "Maximum DDR controllers" - default 3 if ARCH_LS2080A - default 1 - config SECURE_BOOT bool help diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 0eaa944..dbc8d7a 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -66,7 +66,6 @@ #elif defined(CONFIG_ARCH_P1010) #define CONFIG_FSL_SDHC_V2_3 #define CONFIG_TSECV2 -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 4 #define CONFIG_SYS_FSL_PCIE_COMPAT "fsl,qoriq-pcie-v2.2" @@ -102,7 +101,6 @@ #elif defined(CONFIG_ARCH_P1023) #define CONFIG_SYS_NUM_FMAN 1 #define CONFIG_SYS_NUM_FM1_DTSEC 2 -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_SYS_QMAN_NUM_PORTALS 3 #define CONFIG_SYS_BMAN_NUM_PORTALS 3 @@ -139,7 +137,6 @@ #define CONFIG_SYS_NUM_FMAN 1 #define CONFIG_SYS_NUM_FM1_DTSEC 5 #define CONFIG_SYS_NUM_FM1_10GEC 1 -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_SYS_FM_MURAM_SIZE 0x28000 #define CONFIG_SYS_FSL_TBCLK_DIV 32 @@ -159,7 +156,6 @@ #define CONFIG_SYS_NUM_FMAN 1 #define CONFIG_SYS_NUM_FM1_DTSEC 5 #define CONFIG_SYS_NUM_FM1_10GEC 1 -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_5 #define CONFIG_SYS_FM_MURAM_SIZE 0x28000 #define CONFIG_SYS_FSL_TBCLK_DIV 32 @@ -182,7 +178,6 @@ #define CONFIG_SYS_NUM_FM2_DTSEC 4 #define CONFIG_SYS_NUM_FM1_10GEC 1 #define CONFIG_SYS_NUM_FM2_10GEC 1 -#define CONFIG_NUM_DDR_CONTROLLERS 2 #define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_4 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_SYS_FM_MURAM_SIZE 0x28000 @@ -203,7 +198,6 @@ #define CONFIG_SYS_NUM_FMAN 1 #define CONFIG_SYS_NUM_FM1_DTSEC 5 #define CONFIG_SYS_NUM_FM1_10GEC 1 -#define CONFIG_NUM_DDR_CONTROLLERS 2 #define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_4 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_SYS_FM_MURAM_SIZE 0x28000 @@ -227,7 +221,6 @@ #define CONFIG_SYS_NUM_FM1_10GEC 1 #define CONFIG_SYS_NUM_FM2_DTSEC 5 #define CONFIG_SYS_NUM_FM2_10GEC 1 -#define CONFIG_NUM_DDR_CONTROLLERS 2 #define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_4 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_SYS_FM_MURAM_SIZE 0x28000 @@ -241,7 +234,6 @@ #elif defined(CONFIG_ARCH_BSC9131) #define CONFIG_FSL_SDHC_V2_3 #define CONFIG_TSECV2 -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_4 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_SYS_FSL_DSP_M2_RAM_ADDR 0xb0000000 @@ -253,7 +245,6 @@ #elif defined(CONFIG_ARCH_BSC9132) #define CONFIG_FSL_SDHC_V2_3 #define CONFIG_TSECV2 -#define CONFIG_NUM_DDR_CONTROLLERS 2 #define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_6 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_SYS_FSL_DSP_DDR_ADDR 0x40000000 @@ -279,13 +270,11 @@ #define CONFIG_SYS_NUM_FM1_10GEC 2 #define CONFIG_SYS_NUM_FM2_DTSEC 8 #define CONFIG_SYS_NUM_FM2_10GEC 2 -#define CONFIG_NUM_DDR_CONTROLLERS 3 #else #define CONFIG_SYS_NUM_FM1_DTSEC 6 #define CONFIG_SYS_NUM_FM1_10GEC 1 #define CONFIG_SYS_NUM_FM2_DTSEC 8 #define CONFIG_SYS_NUM_FM2_10GEC 1 -#define CONFIG_NUM_DDR_CONTROLLERS 2 #if defined(CONFIG_ARCH_T4160) #define CONFIG_SYS_FSL_CLUSTER_CLOCKS { 1, 1 } #endif @@ -352,7 +341,6 @@ #define CONFIG_SYS_FSL_CLUSTER_CLOCKS { 1, 4, 4, 4 } #define CONFIG_SYS_NUM_FM1_DTSEC 6 #define CONFIG_SYS_NUM_FM1_10GEC 2 -#define CONFIG_NUM_DDR_CONTROLLERS 2 #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #define CONFIG_SYS_FSL_SRIO_MAX_PORTS 2 #define CONFIG_SYS_FSL_SRIO_OB_WIN_NUM 9 @@ -365,7 +353,6 @@ #define CONFIG_SYS_FSL_CLUSTER_CLOCKS { 1, 4 } #define CONFIG_SYS_NUM_FM1_DTSEC 4 #define CONFIG_SYS_NUM_FM1_10GEC 0 -#define CONFIG_NUM_DDR_CONTROLLERS 1 #endif #elif defined(CONFIG_ARCH_T1040) || defined(CONFIG_ARCH_T1042) @@ -379,7 +366,6 @@ #define CONFIG_SYS_FSL_SRDS_1 #define CONFIG_SYS_NUM_FMAN 1 #define CONFIG_SYS_NUM_FM1_DTSEC 5 -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_PME_PLAT_CLK_DIV 2 #define CONFIG_SYS_PME_CLK CONFIG_PME_PLAT_CLK_DIV @@ -417,7 +403,6 @@ #define CONFIG_SYS_NUM_FM1_DTSEC 4 #define CONFIG_SYS_NUM_FM1_10GEC 1 #define CONFIG_FSL_FM_10GEC_REGULAR_NOTATION -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_5_0 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 8 @@ -462,7 +447,6 @@ #define CONFIG_SYS_NUM_FM1_10GEC 2 #endif #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_PME_PLAT_CLK_DIV 1 #define CONFIG_SYS_PME_CLK CONFIG_PME_PLAT_CLK_DIV #define CONFIG_SYS_FM1_CLK 0 @@ -486,7 +470,6 @@ #elif defined(CONFIG_ARCH_C29X) #define CONFIG_FSL_SDHC_V2_3 #define CONFIG_TSECV2_1 -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_SYS_FSL_DDR_VER FSL_DDR_VER_4_6 #define CONFIG_SYS_FSL_IFC_BANK_COUNT 8 #define CONFIG_SYS_FSL_MAX_NUM_OF_SEC 3 diff --git a/drivers/ddr/fsl/Kconfig b/drivers/ddr/fsl/Kconfig index 7b7e4f2..b035502 100644 --- a/drivers/ddr/fsl/Kconfig +++ b/drivers/ddr/fsl/Kconfig @@ -23,6 +23,20 @@ config SYS_FSL_DDR_LE menu "Freescale DDR controllers" depends on SYS_FSL_DDR +config NUM_DDR_CONTROLLERS + int "Maximum DDR controllers" + default 3 if ARCH_LS2080A || \ + ARCH_T4240 + default 2 if ARCH_B4860 || \ + ARCH_BSC9132 || \ + ARCH_MPC8572 || \ + ARCH_MPC8641 || \ + ARCH_P4080 || \ + ARCH_P5020 || \ + ARCH_P5040 || \ + ARCH_T4160 + default 1 + config SYS_FSL_DDR_VER int default 50 if SYS_FSL_DDR_VER_50 diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 101a398..e5c220e 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -222,7 +222,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -/* CONFIG_NUM_DDR_CONTROLLERS is defined in include/asm/config_mpc85xx.h */ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (4 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index 7864936..a6f73f2 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -84,7 +84,6 @@ extern unsigned long get_sdram_size(void); #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index d289bf4..3d3eeb5 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -66,7 +66,6 @@ #define CONFIG_SYS_SPD_BUS_NUM 0 #define SPD_EEPROM_ADDRESS1 0x52 #define SPD_EEPROM_ADDRESS2 0x51 -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 2 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) #define CONFIG_ECC_INIT_VIA_DDRCONTROLLER diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 8075085..a64f0de 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -105,7 +105,6 @@ #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 2 diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index c0d74fa..3389a77 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -77,7 +77,6 @@ #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 /* DDR is system memory*/ #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index f2618a0..00a18b5 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -52,7 +52,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 /* DDR is system memory*/ #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index 406ac5a..b9c62e1 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -63,7 +63,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE #define CONFIG_VERY_BIG_RAM -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 2 diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h index 84292b4..c241b51 100644 --- a/include/configs/MPC8548CDS.h +++ b/include/configs/MPC8548CDS.h @@ -73,7 +73,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 /* DDR is system memory*/ #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 7058b85..6faa230 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -52,7 +52,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 /* DDR is system memory*/ #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 218d77d..e0d010a 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -76,7 +76,6 @@ #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 /* DDR is system memory*/ #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 3573ef4..0d3707f 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -60,7 +60,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 /* DDR is system memory*/ #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index 1b61197..ce389ad 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -88,7 +88,6 @@ extern unsigned long get_clock_freq(void); /* DDR is system memory*/ #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index c91e032..5ca01e8 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -93,7 +93,6 @@ #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_NUM_DDR_CONTROLLERS 2 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 2 diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 48eada5..c5f3634 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -91,7 +91,6 @@ #define CONFIG_SYS_MAX_DDR_BAT_SIZE 0x80000000 /* BAT mapping size */ #define CONFIG_VERY_BIG_RAM -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index d413f21..fb66bb6 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -113,7 +113,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_MAX_DDR_BAT_SIZE 0x80000000 /* BAT mapping size */ #define CONFIG_VERY_BIG_RAM -#define CONFIG_NUM_DDR_CONTROLLERS 2 #define CONFIG_DIMM_SLOTS_PER_CTLR 2 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 949bdef..7a83c56 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -145,7 +145,6 @@ #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 00539ee..8393619 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -163,7 +163,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -/* CONFIG_NUM_DDR_CONTROLLERS is defined in include/asm/config_mpc85xx.h */ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 8debccb..4ee17f9 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -268,7 +268,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -/* CONFIG_NUM_DDR_CONTROLLERS is defined in include/asm/config_mpc85xx.h */ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index c3c187f..f68ab2e 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -127,7 +127,6 @@ #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -/* CONFIG_NUM_DDR_CONTROLLERS is defined in include/asm/config_mpc85xx.h */ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 4 #define CONFIG_FSL_DDR_FIRST_SLOT_QUAD_CAPABLE diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index 3fc326b..8233978 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -191,7 +191,6 @@ #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 /* Default settings for DDR3 */ diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 988b96d..d2172e9 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -122,7 +122,6 @@ #define CONFIG_SYS_SDRAM_SIZE 1024 #define CONFIG_VERY_BIG_RAM -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index a167bae..13effde 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -331,7 +331,6 @@ #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 /* Default settings for DDR3 */ diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index 94556a7..2d61c19 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -89,7 +89,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 /* Default settings for DDR3 */ diff --git a/include/configs/sbc8548.h b/include/configs/sbc8548.h index 7c5961a..281a993 100644 --- a/include/configs/sbc8548.h +++ b/include/configs/sbc8548.h @@ -116,7 +116,6 @@ #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE #define CONFIG_VERY_BIG_RAM -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 2 diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 87056db..f02634b 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -57,7 +57,6 @@ #undef CONFIG_DDR_ECC /* only for ECC DDR module */ #define CONFIG_ECC_INIT_VIA_DDRCONTROLLER /* DDR controller or DMA? */ #define CONFIG_MEM_INIT_VALUE 0xDeadBeef -#define CONFIG_NUM_DDR_CONTROLLERS 2 #define CACHE_LINE_INTERLEAVING 0x20000000 #define PAGE_INTERLEAVING 0x21000000 #define BANK_INTERLEAVING 0x22000000 @@ -103,7 +102,6 @@ #define CONFIG_SYS_MAX_DDR_BAT_SIZE 0x80000000 /* BAT mapping size */ #define CONFIG_VERY_BIG_RAM -#define CONFIG_NUM_DDR_CONTROLLERS 2 #define CONFIG_DIMM_SLOTS_PER_CTLR 2 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 806fc27..6480116 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -79,7 +79,6 @@ #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE #define CONFIG_VERY_BIG_RAM -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 2 diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index 4fd6f4d..e82df33 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -83,7 +83,6 @@ #define CONFIG_SYS_DDR_SDRAM_BASE 0x00000000 #define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE -/* CONFIG_NUM_DDR_CONTROLLERS is defined in include/asm/config_mpc85xx.h */ #define CONFIG_DIMM_SLOTS_PER_CTLR 2 #define CONFIG_CHIP_SELECTS_PER_CTRL 4 #define CONFIG_FSL_DDR_FIRST_SLOT_QUAD_CAPABLE diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 49c485e..0d5b1ff 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -41,7 +41,6 @@ #define SPD_EEPROM_ADDRESS1 0x54 /* Both channels use the */ #define SPD_EEPROM_ADDRESS2 0x54 /* same SPD data */ #define SPD_EEPROM_OFFSET 0x200 /* OFFSET of SPD in EEPROM */ -#define CONFIG_NUM_DDR_CONTROLLERS 2 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 #define CONFIG_DDR_ECC diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index cc8b794..b88aeb4 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -37,7 +37,6 @@ #define CONFIG_DDR_SPD #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS 0x54 -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 2 #define CONFIG_DDR_ECC diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index f37cf88..5d78560 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -48,7 +48,6 @@ #define SPD_EEPROM_ADDRESS1 0x54 /* Both channels use the */ #define SPD_EEPROM_ADDRESS2 0x54 /* same SPD data */ #define SPD_EEPROM_OFFSET 0x200 /* OFFSET of SPD in EEPROM */ -#define CONFIG_NUM_DDR_CONTROLLERS 2 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 1 #define CONFIG_DDR_ECC diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 6203142..35e6350 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -47,7 +47,6 @@ #define CONFIG_MEM_INIT_VALUE 0xdeadbeef #define SPD_EEPROM_ADDRESS 0x54 #define SPD_EEPROM_OFFSET 0x200 /* OFFSET of SPD in EEPROM */ -#define CONFIG_NUM_DDR_CONTROLLERS 1 #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL 2 #define CONFIG_DDR_ECC diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2d5d30d..37d692e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3320,7 +3320,6 @@ CONFIG_NR_DRAM_POPULATED CONFIG_NS16550_MIN_FUNCTIONS CONFIG_NS8382X CONFIG_NS87308 -CONFIG_NUM_DDR_CONTROLLERS CONFIG_NUM_DSP_CPUS CONFIG_NUM_PAMU CONFIG_OCLK_DIV