From patchwork Wed Dec 28 16:43:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: York Sun X-Patchwork-Id: 709349 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 3tpdv03tgsz9sdn for ; Thu, 29 Dec 2016 03:47:24 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C5B01B39A3; Wed, 28 Dec 2016 17:46:40 +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 26p-h2dIzb53; Wed, 28 Dec 2016 17:46:40 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1782FB39A4; Wed, 28 Dec 2016 17:45:44 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4A3CAB3937 for ; Wed, 28 Dec 2016 17:44:45 +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 7L6wV3TdYknq for ; Wed, 28 Dec 2016 17:44:45 +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 NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0056.outbound.protection.outlook.com [104.47.42.56]) by theia.denx.de (Postfix) with ESMTPS id 14A1BB394C for ; Wed, 28 Dec 2016 17:44:37 +0100 (CET) Received: from BY2PR03CA047.namprd03.prod.outlook.com (10.141.249.20) 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.817.10; Wed, 28 Dec 2016 16:44:34 +0000 Received: from BL2FFO11FD008.protection.gbl (2a01:111:f400:7c09::171) by BY2PR03CA047.outlook.office365.com (2a01:111:e400:2c5d::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.817.10 via Frontend Transport; Wed, 28 Dec 2016 16:44:34 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; denx.de; dkim=none (message not signed) header.d=none;denx.de; 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 BL2FFO11FD008.mail.protection.outlook.com (10.173.161.4) 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:33 +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 uBSGhvtg026038; Wed, 28 Dec 2016 09:44:32 -0700 From: York Sun To: U-Boot Mailing List Date: Wed, 28 Dec 2016 08:43:49 -0800 Message-ID: <1482943430-10231-24-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: 131274170741943117; (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)(7916002)(336005)(39840400002)(39450400003)(39380400002)(39400400002)(39850400002)(39860400002)(39410400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(105606002)(356003)(5003940100001)(305945005)(33646002)(48376002)(6916009)(47776003)(2950100002)(6666003)(4326007)(50466002)(110136003)(5660300001)(575784001)(2906002)(85426001)(38730400001)(86362001)(69596002)(8936002)(39060400001)(626004)(81156014)(81166006)(8676002)(50226002)(50986999)(76176999)(106466001)(7416002)(97736004)(8656002)(92566002)(36756003)(77096006)(68736007)(189998001)(104016004)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB2478; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD008; 1:TaKrc+1CdQ9oY8BK1DaAcZkOZFjCzx6GHc6lIT5uXPeIKAzard359llfo2JZdI1ZevyZSD+E9EG1w0OCgogAZqtuQjYXQgItAnkcYUZGBS3EgYujm08od/QxaEtLuCNr6cvqFJMU/ULIhNUbgjDOdbvBllb1s+s2nqQeJrwvjNRneD+TnLzjvAxvWs+pSXYL48SnI4IvK003pKcAMheNRF47g5J4d1WP6zcPRsHqY8BLeMqBOetf9gCdakiLzDf/071kCdY5hxSgx72VKn3Vde463vG0myQ9NDOzPqqQ1n71bL5LI2N9XLjSAQmhx1FRTau5Ojmx2g2SzDDLJZpQZhkvbtONb1By7aHfi92qKGAwlE1CsMtHKFgHgHnwBq3pBKoW0pZaHcAYeTiL0vwDEjF3kLF2VuyQZjrNEV5zJPEsGLLjKP93jBrrvZt9DW5FBXGj5dX0u5YBdfCfStlut6SnPfghtc/a15vpX2ZxXJ5M2WkZk8AKeNFQ1rFkEXVuo95rDgsNGgBT5Ts6oAv+gN3H1LBuzzBtHoRU64zQ3my8q97u4sxzs/yxMPyp66fhJVYTw9ALwm88RTE3NLJzWeotdzleWsDDOXavgqbfCOx9lSUDtV6QdazWko4HIYqB6z7TRDIZMnLj6D1xuLAGmt/fKyuBsVOZGkt9LaqGTRE= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: a2908c86-1cf7-46b0-eb4d-08d42f40cdb8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:MWHPR03MB2478; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2478; 3:iJ0SFVD/aF/VG9vgsUTxUqZRIdwBABxfrar+pYC03+8K9I/VVHXy3wG9IExI8Cz3EXN3CM1T5LDgfHjsPmSDhFpcmuFMkynpZBS8yVS7B1W0yir5bXZWUuG+xC5ENDs8DW7lWiA7CZwjxxnwsd1qsEpuTP/5nk3gx6sF7lEeL0/MOIK0dQnJf44/VSkJoqmiRGv0WR0LuHxdMdu4EaNUwodZyDHw3HMQLoOCJ4C7/Jp35brPldK9BdP2m6gKT0miOG33aGKBeBUngh6f9bVqsb1jZU8VydoRJ5ZOSYIpJi+Zzfs6gT4Hr21ry4sksDmVoPc/VtSrSe3VAqVVWx8YhWOAZ3btHNVDEbxqqpKFrnU55e3a2ukVfl64+ss5cdu+; 25:SeZOigAn4Ek986lmBd8jrC6FUj3U8ruUWR/Q6goOfi8RT07SUrCngtYRycf78rlxIT1w9+CIypz3NMdtAxF4OxldYxsPYmdghWfy9IRkciMKWC8Yi4XehPjqUnXiZ3bCQ1nFZbtHukTfUSXi6rtrJXhGOFOr5QRC0RSI/QVNkta3X9yzgmht8DzEi9sS6PVXj4eBzYhVvPypO8mY2ijU+cjDxxGjmgoEBYLzHrNk7m6WeLLKHAreqhQI39Q4uZw3+cGTI9B+ubISvlmmwW3IWzvIWsfiX9enh/i4u/fMqfLyxgmX2/2V1eB8vQhNI6uEtPrmzDvXsg753zd4ebyfrC4epfVBBrmzmThF49yU1jFmhEUiRYEfJDeUHE7+WaT140TU5imixHo6Z9NCuJ9kaBFxS0jdbkfKJnMza9yJQHLiCfI9B82VJeMPz0yrNKGmyvsoRPrQ+mFV7qDEKy25sQ== X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2478; 31:WLDHBLLEwLWlQiy02XqNRbUQr/NLuKygKmoOACB47MHCLEpAA1PEEnUnvNf6Cywr3hBOE/qE8HO1huxAh4klkD/bXlP3/rGpGcsdNHtHNksY3j6Xg9/cbSre29B2yZXJJ8kR3gu2p03LdATWOY8oPAcOAA7gEZd0XJn8ikw2Jx+KYmE2xH7N7VT+0aOoFvjnSBbWghMee0Tzp1PdkxW8sMq1QizKDaylD/7yL8lnjX0S9en7gZZ6JuzXexKvDXGHOtNqaSkgJ4vwaZYVK6zCy1v8iBUqM51mKyfRRkqpZ85VDse0qniViJL8YxVBxkh5 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:MWHPR03MB2478; BCL:0; PCL:0; RULEID:(400006); SRVR:MWHPR03MB2478; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2478; 4:CVRDQrEuNoJ9GM4gEMc+6j1LniM6eiXEwrFrlHuzTITOsH/E7hl8IB1wnre9zAVuJhdwweRRtlaOpwKzhYHYhMPRrM91lSCNPUq7GzMIZqEQBxtdB1zujtc6YaRhR6p8hLM3QWzzrIlrGFwhVFs/Mb8hHynGDRT6euM2FTZs/+wbxrOplMs7g5kDSl8mDvn/6p52efbHkRAiyhChZ6t8vmwGxxjW/v5l2AZypA5bNN22xbzW2jXAHmfeLsORP+nKQI4jh9jBWI7WchT19/cQCr4QaXdfYZ2uzrDkH1Mdq/Lyh+QCvreuG1jOFRynk8KQcNL8ue6t5FwmkyqU1BVYin/ZUGGTAwWRxmDyASeLNycIUep6F7S1dtZSwGITDzl9oq+RSXERqLAZ5fLexMk6Zp2YAM1Wd++1bS4TkFDsRYE7qUQ33CvlevtYQ1T4R4U9TZt2UgGABJXnyz1SKMf7ChDNgOleuHv6Oap0t0y4zU/CmchG1xKkeVz6NomLbIbQpfRzHKuFIFP5UIAXSwnzQ4H5RELFT/cLZz/mblc+t69GF+Cuy8C/4WdDjUl3VUfJBHA8AdtYbFyEkVD6fNYLT4E34xPFi0EKh/Lo54FUvDowqjK/lh4+0eW8A67lhoQQH3wyHgnrn9EDFvTWncwQg9gWVHuhiTVzfAessgE/P0NtpENzCbntXniBKkCoH5y0IGyWFl2Y0sBMQ3tD2yAKZda29brC66VSaTeX3Wx22chnAPR+UuBqpmbWGNEl6pxV X-Forefront-PRVS: 0170DAF08C X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB2478; 23:6sGr8oh80OCqUiKfqXep3Jzq31jE3QmNwVCVBEn64?= =?us-ascii?Q?BxwNOkfXs4C4lE3OMh+PeCq0HaD+vlmWpdgvh+RopzOhpa4CDN+a0dw9qhhC?= =?us-ascii?Q?uS0xyhInVH7OHWJxRXGYs6hofqN9fd5YwFv3qFvvWnmzdW2NjBMmka/qJh78?= =?us-ascii?Q?rKL/qIpjfhYE321u2e7XPdNMgnq4PUwqE+3f5I8xScKIS3ABkC6uJSlZBfwa?= =?us-ascii?Q?e03MdAvvjJLjJvnvlYtM2l6brwaD9NUCoInktmBLZUuoLJUHDzj2WGVUDtJ4?= =?us-ascii?Q?1AImSveUZxQ0a09AQBcMwkiE71Wi/hW0Q2hbT/3DA14ku/2CJcfpLOv+Xk4h?= =?us-ascii?Q?qN6Dm2O4ZWlDMcdYjlnr/jecrsVTpG4s0tMr71SOJLC5Xoqx++uAzoQjMAO3?= =?us-ascii?Q?ZsYnCvuOnKo47QR9rYrSZfd/cRkYGoWmSOr8fZhN0m/xvZOb/JWmYAo4xcJH?= =?us-ascii?Q?cXuMI/LSFTrTdl9vIm9CgZjLu1p59Ef9GUONyp5fIWL7Cu0sw3fG/E+C1hT/?= =?us-ascii?Q?hOrNvFo5n0JdXnvta/etbkYIi9ADhRdc3GYGiDHwhq/PLFR6JQtTeBY86FBL?= =?us-ascii?Q?P4x+vVSZFc9ed4ERtWb6UonQT2XiaTQXdeWuM2YwAo0YTPffIotpvPrKIWyA?= =?us-ascii?Q?sKOdPAywubi9xDlS5oFLx2hfLMVMhngPGSGqpDLQFTz9e481mZfOSpfh8g80?= =?us-ascii?Q?se0J5K3T3o8szaOiqJlmZwle+wIZsfyFfMDAnHDKAThC5dIg3FLVUeAIeMhh?= =?us-ascii?Q?oPYulDDQR7/fzKQ2b8te6+c3fxH7LjhpGjkszX2TAXqXEdad+tRQlCvKc7nV?= =?us-ascii?Q?t9TXPQUBrmZQEaDgaenc380EElwrap0WRQkUdaRqebXz+j0RJhUcXbgVbbl7?= =?us-ascii?Q?9RTXQJcqt1HV/JTNdd4/OC8MnsCDexhjW+EFQzwRDAC0fWqG6mfTb9p05kBP?= =?us-ascii?Q?bEYy8l70uKj6qElEcMswMxUGv+RhyRNEcwoYhKA7JMj0VvnnTaT515FcBSSL?= =?us-ascii?Q?QiimTb1QbXmNbylUcKSyhIJjyFhL2ZKkGkBSA6mEoIHU03fPhFriAleVt76A?= =?us-ascii?Q?2M6Y2IAOYusjtpEs3as8ZzFuRGA4a2yefsLxukMFtMEwZTCnvEWWb/SfBbUS?= =?us-ascii?Q?3PkQHOUpWe2QAk9Oe0ISbQcrYlRdJH+M7bC92W6UpHQAdR7UotLdqOofmKkb?= =?us-ascii?Q?p0HY1qDeAJPOQuPEG99srfkOfyx2uwC6lvICMbtGmbzib1i5Q87bXKRMYhtz?= =?us-ascii?Q?H6brE4Ar7azF2lphHvPUgHB9BY7hPhtaE75HS//4+RdE9Hxweurbv2E0ny8m?= =?us-ascii?Q?R7pwxZhjruvYftwss/8m84sXMv9gzi0b721021y9TqbrVwgZMAHeil+vVz+5?= =?us-ascii?Q?oym1Q=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2478; 6:SCuFHjahfNv9ahAvx7Tv1GMdk5qLVAT3SgqbPJMl0+4Wy1WWRX4NTqZELhVnAfvreGfMU7B0a7rQ06R+6juQZKoPRAgCyviBRkptWrKUcY388i6EHpzXnuBmE3yovZU/L+vjMSzpAgNvhg9BlTOSgvv7G5xUOZIOoUFE+vOWis1dgDXMqWha0i6zx5BsF0+ajYrEETEnjieCf2JR1W5GJc1meeEn1VgE/wQl76lYW/oNU1ML+zp5s0OK1o8nuqyV9V2UHYqncDfSxBCRIEkBUGD9juaork8w7JdTR0CFa8/0eB7EaCbj39dRpB3d8fImligFZ1lzsK0p78TTmRwKEGLoU3kuWpjO8xVX0pSAMHOAQGBAvJGwb7+u7ex2GjcwbPFFVWKRF9FB6OGV1pGRjK+tVNKhhc8oOF8YXha5Zkkhxkj+qWXGiCQiuG1klVz2; 5:LkTDDYLgEP2esRfb8bkAgad8PA/YUGn6TqesJ9A40e+gubJhejdN9LzhQm3VgfGZgxn/xHOOQ7JgxUHZhpAFLSEmchN0CW4IMF1PMZhGeYo+axl30YNoMgWJlg6aCIpp5OAL3vriymqCjHC3XLVwvlm4n0ICGoUwxHuXfj5KEa0oPjXbSOx5LfLwf+wklLSx; 24:EOTGNhGo+qR3qZ4MkEdLN/+iyt6Hsu05XXrQvOclu8BtpvG27zvFc1BTArOYc881zs11N3u5Ietx8zJp1qJwORGg/eiXKWeHlS/J6NGgWxk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB2478; 7:hPLTBCof+qNqAJmTgKdDI2d1YGY5j4RxWftlptr6/Ze8dScj62WZP134mJFCXdGjYtNj73z+l5k3cYb4jdTOoN4Jy3rYWnDA190KhaW1BKCpMtoNpVdTJxRrpdJ2F/5Dt9k1Jpn1nu9xJFgXNt4IImkO5Yz4O/gi1plcbQk7BesK+0SsuH16Wm6TAsUQYChH2tlRkE6BPXGShPaj2w1PSM66zS9JdB8DsaxCOJtGqJJV15UKXuYHad4O0Lc+ee80dj/gmjcBvp95V66vT/lmb2ueLCIAA/BFjlAqLxS744GTxoDIAo3uh7o/rl+JtWMHwYdsd1+6jgcXYGpeHH9oTnTIgEb1MQ+cnzqa/J1ETnYQD1awxbfZINVZ7dpcjAho3WqIT2LztNg/tMV16k5H9LyekIfJ3pnjlAi6ldA68evnvR8VxLoF7lifpe5E2OYiYUyuwifrdrASmf4VVh4VvQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Dec 2016 16:44:33.7887 (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: MWHPR03MB2478 Cc: trini@konsulko.com, Kumar Gala , Jagan Teki , Stefan Roese , Andy Fleming Subject: [U-Boot] [PATCH 23/24] powerpc: mpc85xx: Move CONFIG_SYS_FSL_QORIQ_CHASSIS* 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 Kconfig option to select chassis version. Signed-off-by: York Sun --- arch/powerpc/cpu/mpc85xx/Kconfig | 21 +++++++++++++++++++++ arch/powerpc/include/asm/config_mpc85xx.h | 10 ---------- scripts/config_whitelist.txt | 2 -- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 8b905e2..ac6c197 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -341,6 +341,7 @@ config ARCH_B4420 select SYS_FSL_ERRATUM_A009942 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_SEC + select SYS_FSL_QORIQ_CHASSIS2 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 @@ -362,6 +363,7 @@ config ARCH_B4860 select SYS_FSL_ERRATUM_A009942 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_SEC + select SYS_FSL_QORIQ_CHASSIS2 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 @@ -641,6 +643,7 @@ config ARCH_P2041 select SYS_FSL_ERRATUM_USB14 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_SEC + select SYS_FSL_QORIQ_CHASSIS1 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 @@ -663,6 +666,7 @@ config ARCH_P3041 select SYS_FSL_ERRATUM_USB14 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_SEC + select SYS_FSL_QORIQ_CHASSIS1 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 @@ -696,6 +700,7 @@ config ARCH_P4080 select SYS_P4080_ERRATUM_SERDES_A005 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_SEC + select SYS_FSL_QORIQ_CHASSIS1 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 @@ -714,6 +719,7 @@ config ARCH_P5020 select SYS_FSL_ERRATUM_USB14 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_SEC + select SYS_FSL_QORIQ_CHASSIS1 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 @@ -732,6 +738,7 @@ config ARCH_P5040 select SYS_FSL_ERRATUM_USB14 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_SEC + select SYS_FSL_QORIQ_CHASSIS1 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 @@ -750,6 +757,7 @@ config ARCH_T1023 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_DDR4 select SYS_FSL_HAS_SEC + select SYS_FSL_QORIQ_CHASSIS2 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_5 @@ -765,6 +773,7 @@ config ARCH_T1024 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_DDR4 select SYS_FSL_HAS_SEC + select SYS_FSL_QORIQ_CHASSIS2 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_5 @@ -781,6 +790,7 @@ config ARCH_T1040 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_DDR4 select SYS_FSL_HAS_SEC + select SYS_FSL_QORIQ_CHASSIS2 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_5 @@ -797,6 +807,7 @@ config ARCH_T1042 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_DDR4 select SYS_FSL_HAS_SEC + select SYS_FSL_QORIQ_CHASSIS2 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_5 @@ -814,6 +825,7 @@ config ARCH_T2080 select SYS_FSL_ERRATUM_ESDHC111 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_SEC + select SYS_FSL_QORIQ_CHASSIS2 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 @@ -831,6 +843,7 @@ config ARCH_T2081 select SYS_FSL_ERRATUM_ESDHC111 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_SEC + select SYS_FSL_QORIQ_CHASSIS2 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 @@ -849,6 +862,7 @@ config ARCH_T4160 select SYS_FSL_ERRATUM_A009942 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_SEC + select SYS_FSL_QORIQ_CHASSIS2 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 @@ -868,6 +882,7 @@ config ARCH_T4240 select SYS_FSL_ERRATUM_A009942 select SYS_FSL_HAS_DDR3 select SYS_FSL_HAS_SEC + select SYS_FSL_QORIQ_CHASSIS2 select SYS_FSL_SEC_BE select SYS_FSL_SEC_COMPAT_4 @@ -1127,6 +1142,12 @@ config SYS_P4080_ERRATUM_SERDES_A001 config SYS_P4080_ERRATUM_SERDES_A005 bool +config SYS_FSL_QORIQ_CHASSIS1 + bool + +config SYS_FSL_QORIQ_CHASSIS2 + bool + config SYS_FSL_NUM_LAWS int "Number of local access windows" depends on FSL_LAW diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 92c96d7..8cde05c 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -117,7 +117,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #elif defined(CONFIG_ARCH_P2041) /* also supports P2040 */ -#define CONFIG_SYS_FSL_QORIQ_CHASSIS1 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_SYS_FSL_NUM_CC_PLLS 2 #define CONFIG_SYS_NUM_FMAN 1 @@ -136,7 +135,6 @@ #define CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000 #elif defined(CONFIG_ARCH_P3041) -#define CONFIG_SYS_FSL_QORIQ_CHASSIS1 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_SYS_FSL_NUM_CC_PLLS 2 #define CONFIG_SYS_NUM_FMAN 1 @@ -155,7 +153,6 @@ #define CONFIG_SYS_FSL_CORENET_SNOOPVEC_COREONLY 0xf0000000 #elif defined(CONFIG_ARCH_P4080) /* also supports P4040 */ -#define CONFIG_SYS_FSL_QORIQ_CHASSIS1 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_SYS_FSL_NUM_CC_PLLS 4 #define CONFIG_SYS_NUM_FMAN 2 @@ -176,7 +173,6 @@ #elif defined(CONFIG_ARCH_P5020) /* also supports P5010 */ #define CONFIG_SYS_PPC64 /* 64-bit core */ -#define CONFIG_SYS_FSL_QORIQ_CHASSIS1 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_SYS_FSL_NUM_CC_PLLS 2 #define CONFIG_SYS_NUM_FMAN 1 @@ -196,7 +192,6 @@ #elif defined(CONFIG_ARCH_P5040) #define CONFIG_SYS_PPC64 -#define CONFIG_SYS_FSL_QORIQ_CHASSIS1 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ #define CONFIG_SYS_FSL_NUM_CC_PLLS 3 #define CONFIG_SYS_NUM_FMAN 2 @@ -240,7 +235,6 @@ #elif defined(CONFIG_ARCH_T4240) || defined(CONFIG_ARCH_T4160) #define CONFIG_SYS_PPC64 /* 64-bit core */ #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ -#define CONFIG_SYS_FSL_QORIQ_CHASSIS2 /* Freescale Chassis generation 2 */ #define CONFIG_SYS_FSL_CORES_PER_CLUSTER 4 #define CONFIG_SYS_FSL_QMAN_V3 /* QMAN version 3 */ #ifdef CONFIG_ARCH_T4240 @@ -285,7 +279,6 @@ #elif defined(CONFIG_ARCH_B4860) || defined(CONFIG_ARCH_B4420) #define CONFIG_SYS_PPC64 /* 64-bit core */ #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ -#define CONFIG_SYS_FSL_QORIQ_CHASSIS2 /* Freescale Chassis generation 2 */ #define CONFIG_SYS_FSL_QMAN_V3 /* QMAN version 3 */ #define CONFIG_HETROGENOUS_CLUSTERS /* DSP/SC3900 core clusters */ #define CONFIG_PPC_CLUSTER_START 0 /*Start index of ppc clusters*/ @@ -334,7 +327,6 @@ #elif defined(CONFIG_ARCH_T1040) || defined(CONFIG_ARCH_T1042) #define CONFIG_E5500 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ -#define CONFIG_SYS_FSL_QORIQ_CHASSIS2 /* Freescale Chassis generation 2 */ #define CONFIG_SYS_FSL_CORES_PER_CLUSTER 1 #define CONFIG_SYS_FSL_QMAN_V3 /* QMAN version 3 */ #define CONFIG_SYS_FSL_NUM_CC_PLLS 2 @@ -367,7 +359,6 @@ #elif defined(CONFIG_ARCH_T1024) || defined(CONFIG_ARCH_T1023) #define CONFIG_E5500 #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ -#define CONFIG_SYS_FSL_QORIQ_CHASSIS2 /* Freescale Chassis generation 2 */ #define CONFIG_SYS_FSL_CORES_PER_CLUSTER 1 #define CONFIG_SYS_FSL_QMAN_V3 /* QMAN version 3 */ #define CONFIG_SYS_FMAN_V3 @@ -399,7 +390,6 @@ #elif defined(CONFIG_ARCH_T2080) || defined(CONFIG_ARCH_T2081) #define CONFIG_SYS_PPC64 /* 64-bit core */ #define CONFIG_FSL_CORENET /* Freescale CoreNet platform */ -#define CONFIG_SYS_FSL_QORIQ_CHASSIS2 /* Freescale Chassis generation 2 */ #define CONFIG_SYS_FSL_CORES_PER_CLUSTER 4 #define CONFIG_SYS_FSL_NUM_CC_PLLS 2 #define CONFIG_SYS_FSL_QMAN_V3 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 2cc8f0c..241d047 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -5461,8 +5461,6 @@ CONFIG_SYS_FSL_QBMAN_SIZE_1 CONFIG_SYS_FSL_QMAN_ADDR CONFIG_SYS_FSL_QMAN_OFFSET CONFIG_SYS_FSL_QMAN_V3 -CONFIG_SYS_FSL_QORIQ_CHASSIS1 -CONFIG_SYS_FSL_QORIQ_CHASSIS2 CONFIG_SYS_FSL_QSPI_AHB CONFIG_SYS_FSL_QSPI_BASE CONFIG_SYS_FSL_QSPI_BASE1