From patchwork Wed Mar 2 10:31:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Yuan X-Patchwork-Id: 590949 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 A322B140326 for ; Wed, 2 Mar 2016 22:15:57 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 44ED1A7651; Wed, 2 Mar 2016 12:15:52 +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 JXAfGKg5Kkml; Wed, 2 Mar 2016 12:15:51 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 921F9A763B; Wed, 2 Mar 2016 12:15:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4896FA7644 for ; Wed, 2 Mar 2016 12:15:47 +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 9SO75_73KSnW for ; Wed, 2 Mar 2016 12:15:47 +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 na01-by2-obe.outbound.protection.outlook.com (mail-by2on0118.outbound.protection.outlook.com [207.46.100.118]) by theia.denx.de (Postfix) with ESMTPS id 5A939A7635 for ; Wed, 2 Mar 2016 12:15:43 +0100 (CET) Received: from BY2PR03CA003.namprd03.prod.outlook.com (10.255.93.20) by CY1PR0301MB1212.namprd03.prod.outlook.com (10.161.212.146) with Microsoft SMTP Server (TLS) id 15.1.427.16; Wed, 2 Mar 2016 10:41:02 +0000 Received: from BL2FFO11FD019.protection.gbl (10.255.93.4) by BY2PR03CA003.outlook.office365.com (10.255.93.20) with Microsoft SMTP Server (TLS) id 15.1.409.15 via Frontend Transport; Wed, 2 Mar 2016 10:41:02 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=none action=none header.from=freescale.com; Received-SPF: Fail (protection.outlook.com: domain of freescale.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 BL2FFO11FD019.mail.protection.outlook.com (10.173.161.37) with Microsoft SMTP Server (TLS) id 15.1.427.7 via Frontend Transport; Wed, 2 Mar 2016 10:41:01 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u22AepsZ009828; Wed, 2 Mar 2016 03:40:59 -0700 From: Yuan Yao To: Date: Wed, 2 Mar 2016 18:31:53 +0800 Message-ID: <1456914723-33160-3-git-send-email-yao.yuan@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1456914723-33160-1-git-send-email-yao.yuan@freescale.com> References: <1456914723-33160-1-git-send-email-yao.yuan@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CPI:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1110001)(339900001)(199003)(189002)(87936001)(2906002)(86362001)(19580405001)(19580395003)(50466002)(36756003)(5008740100001)(586003)(106466001)(229853001)(2351001)(11100500001)(6806005)(1096002)(1220700001)(104016004)(33646002)(105606002)(48376002)(189998001)(5003940100001)(85426001)(77096005)(47776003)(2950100001)(92566002)(50986999)(110136002)(76176999)(5001960100004)(50226001)(81156009)(7059030); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1212; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD019; 1:2o/vHU/IdYILpNeviydYiVxqnvjaFUEv2Z2KJswCCSwoKENIt+IWJvRUcwUz9BCuJ7GbM+Be0kwFKDKeTGWLROR8TgDcByFI5rvLQrSbQ5TgVc7rsffq/WFfzrqomuWONuGM2HypOBrKXFWfhsKZRmxxXEvvkUGa6cOOPh8SiEy3jfIdqhOL7RXSDKSH9LluNznLMbhRtjf9n26siidRFT4H2c2Z6GVGZeFJ0AGXmfGD4F6HuosTuNZPzz64m4RUZGTMUzsaUj5COJP0qfk6Svepc54V/mOaVpu3N8/9oXm0MrenMQS+U9us+cMBZW7W4aTj7LKnPUoP7FGBKJzFwWxUG6Dl8fHLLUu7PByb7TrESajzmro951Osrb6W6dRgi2JT2lUnQlpE9L4ISE3Ey+CVUA1bgOZhzv1KW6JAmjqYbeiCEMIp1vH1wOyCOvthgpq/HWA8I84NS9TRVWpDEw== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 03a1c60d-e492-4348-f959-08d34287264c X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1212; 2:OEVgVkzWjJkGb7/PTaYZSqJELm6wU5U3ujqtBzpF5NxkMlqRyVfb/QN9DCYGGD1+slO+8hsrQdWHCna1HhNDklDBp74wIybV7dlQZMfQms2FTI5PSsjvIeSbwYaP/+0jl5GYiA+gqLAobdEbAud7RzdVy9M9fCbUlYQ3tISpTCOiCaQiTafCn687ifzzKDNo; 3:cQT7HIXNU8r0Z6dZXbDp9L4BZc9on4KxjI0zIelh1DRxZeu/XakyhuWYhNAt5QElNCuDHXBTaSrnpQDr/mAjSYQ194NxDE2maFtMA1/EFhi9S8yARl0KBXB5B4oj/hG9P3l5ecKaZSqSkT0b6d0XrJP4/JDRXqol4HFVrOhY20Pb2luAzlu7DqWfSfmJr7G0; 25:aBtKFUBtamttza9gGXukgkdJHSFBuwMI2oi/3ba04sPajeJtgbbHvZbHSB4W04/jj5LY+kZU3s5HfPhYOKFhSY+0YRxUgN6vyB4qvcEwHSvJpvgKmS1qzCKh3qMTZvAc3Fl45j462bX1KB2NG45IduFz3ZdP8lX4vd1O25HDCAbOvMo3N+U6/3A/WRG7wfb69SObcduBKjFScRUB+hF5ZLmEL+RLQ1KWGrwwcS9/vw7rRjb81T3ekGoXmcu28JpZ9hirKpKhkXZAZhrOrz3LEChN3envbLT/2M14FB0GJK8j7wCKeVHcK1AOvJrJEF56F/ckNdAaGiPc0rg1BeNIhQ== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1212; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1212; 20:vYMx3yfJOcPkjuOPLkGhCF5cEED5NzqMIj2/wCAe5+YSnkt66jckqomhqoNQD9N6s/P5DPC5eXE3RlnuCiEUkzyRVXmcvYRv64aY5l5AsGLsJ8Feaj7m1HVr15FmzS1pGvOp2JohnwPdiU7PUyr9/q6NrAGhTrCNgqxK6bbl84O61LiX+Jad0qBnwCQDhw7W7OTK3J29fzhBM0DMGm5YYsYwYWU8u+rpxklZjJcZ8NkpIqfqP1J8mrKsavJTKO28ZrwcUVW8ioFYQp+r5eIWni3hvBoWCG/fx8US4YY4jqHAgBLuvOFkuuxidopvfHQ/idoLJkxVU1JNYVwqFcePMzfKVtE1bkzOCOgsz7V9tQhbhT4N7/Zo5z1Asn8bPZ6eQG+tLPBtkNoI7Rzhz2g4X1TFqejzH07I9nASEmm/YuZKJcoNDgiQtiHjMel3Z75W; 4:q1FDVtgoi12xZ8HfzqCLiAbTlib0HGIkC+wzhDoPn4xtAikBRYLL1Bb6jFJmsNyUYqgqpVXYnfwDPWLcXZKANLsKkY4/o301utPVRLNWtc/dwQScgsb9FkHYogYJigAQaiVHrDV6TQgsIITUk9lqagTGiXhA7nP738C/EAsQABKxgqLCCaZ39KgEVftFr/mmoYE2/mH5j3yBArmzG1l3Xdm7a5Tk2FTa9EM8Kk3rbHVJqvjraobKsF0R7e9iUIQuoD5PcZt26AaQqBmX2/1tZylpXtw41KRhLhxJ+C0ZNOKNLxyhPLP047wK6nnjflB90g3oS7fTDXQwFPaW4oPbhP6D2q0sXe27s+sfhB7H6vB8ZQngMlzYGZJkYhVQUE0SvZcW+mc16ZSAnXMIexu7+ORRAGZWoh2wLvyrPx4AGQo7ndjEQ6I4v/ZiWy8iPcTHbBtzxE4V5g+SWiyLTnE0xA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13015025)(13017025)(13023025)(13024025)(5005006)(8121501046)(13018025)(3002001)(10201501046); SRVR:CY1PR0301MB1212; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1212; X-Forefront-PRVS: 086943A159 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1212; 23:4wDoHkqQi2gSCB+M4qLSrUGyYcs5K9A8E3TYCFj?= =?us-ascii?Q?Jmh9xJ0GNQy0XLSu0YCoQzfNN726Pc76eOnFFlUX0SkFBQlCkmA1J0h6itFj?= =?us-ascii?Q?uv3csyWfUIG0auULCHOSrM5Lg6A6quitl+eXC3p0fPMVT9YKf2zCSk1b6LzK?= =?us-ascii?Q?CKYSV1jBgpveOHkEUHZMypw3qYN3Lz+Tg1RyqYHE6S7NNyb63H7gSYWKFCKd?= =?us-ascii?Q?jl+P/U58CAWjHOLsIjVi70mYBpL9uJxlkJFht4Ol+vU+dOA4qSB1xoQ4eDWl?= =?us-ascii?Q?slzgrCJlxvgW67UJyvCAlww4N9B0nai9r3dihJex0Wju2RNzhSidacqxFw6f?= =?us-ascii?Q?OZitEoKOx1fbPxQ5fwG7CbO8pQDf9VWnvYEMZvhF9Bz9Rsszl/nnihpfBHo1?= =?us-ascii?Q?k+kYef259/AKyrSX8Rxkdf8nZh4qgU+t+fU7/v+8MDEt+Yf/z9w+xWPujAG6?= =?us-ascii?Q?R3Po6oio2QCuq0u0pp3OB/ImmMibBxvhUMq9LIuLkHhkhQ0eDiGNX6ZeZiB5?= =?us-ascii?Q?Aqb8+dHPmmz6giefYPI8GcmgEXYvuGt+tHUdTmfp+Pw356nftWYKz8c/Op9V?= =?us-ascii?Q?IYBwPszNR/h60If0Jos4gT1Xmz6VR3vck4bSswdBWAjaH1q3eQD0Dv0ZQKDU?= =?us-ascii?Q?9w+0yu0RLmfoTIQ/t9C/Fu/x+yalT3D89F/kUfmfGyJDLNzn5XulhYlPYnxc?= =?us-ascii?Q?85YB67GncWHlBcOPWT0OAONZX+Ew1E0xWRZT80sUWdyG17m/Nyq6n6+rOeOw?= =?us-ascii?Q?cgBq3dpgq02XClEfHECDMTFaN5bQ/2yEjuij/QXARgJ4mh5cmpd2LVeJDaRz?= =?us-ascii?Q?6MWx/AWZGawogeKh7eU5usjZksLe+SmvQk5qHalKDmZk5eAFaCEDFgxdeFML?= =?us-ascii?Q?VLAlFdZti2/H/XBZR/CqrDAWqTwhd6ABuWYxfC41Wq3m7iitCXv0Jevy8s3S?= =?us-ascii?Q?pkVa4fXUVetdqPOBu8QZx6BC3/KOSahft2LkW+faKWZh0kzSY+N3iV8ip/yN?= =?us-ascii?Q?k8pdoDCDXim0g5Wn8Q7Zhdn+I92wuli6DOuAgDYq5OsBHyTfkssRbBi/KjxG?= =?us-ascii?Q?cEjHicho=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1212; 5:rMrx+wJ+MT0eOxLVwCLjlLQ/9jeMxhqzRyPrlfO9HNi83OKZNFqHcOQhCQ5Zyxb3YP1LrnSBykROsSkDDcdEzxchMZ9t5UAVPQ4dtS2JsXf9dtcUnvFzsOrNHJ4GOiQox1Y2IsoAtjJWcStfzTGDrg==; 24:Mx22XdTttuFAtMLthlMZ0Gl71Up9NdxMTBhq+x1LNW9Qnu9du95HJSTWxmzp9FfGs5i08sd84FXTREcosdd/PsDq80eFcP1BjQEM5NoAimo= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Mar 2016 10:41:01.8252 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0301MB1212 Cc: yunhui.cui@nxp.com, u-boot@lists.denx.de Subject: [U-Boot] [PATCH 02/12] configs: ls2080a_common: Remove duplicate NOR configs 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: Yuan Yao The NOR flash related configure options also appear in ls2080aqds.h and ls2080ardb.h, and the two files all have included ls2080a_common.h. This patch remove the duplicated options in ls2080a_common.h. Signed-off-by: Yuan Yao --- include/configs/ls2080a_common.h | 7 ------- include/configs/ls2080a_simu.h | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 64b82e8..82af464 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -148,13 +148,6 @@ #define CONFIG_SYS_FLASH1_BASE_PHYS 0xC0000000 #define CONFIG_SYS_FLASH1_BASE_PHYS_EARLY 0x8000000 -#ifndef CONFIG_SYS_NO_FLASH -#define CONFIG_FLASH_CFI_DRIVER -#define CONFIG_SYS_FLASH_CFI -#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE -#define CONFIG_SYS_FLASH_QUIET_TEST -#endif - #ifndef __ASSEMBLY__ unsigned long long get_qixis_addr(void); #endif diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h index 2c2ce7b..6a59afe 100644 --- a/include/configs/ls2080a_simu.h +++ b/include/configs/ls2080a_simu.h @@ -38,6 +38,13 @@ #define CONFIG_SYS_NOR0_CSPR_EXT (0x0) #define CONFIG_SYS_NOR_AMASK IFC_AMASK(128*1024*1024) +#ifndef CONFIG_SYS_NO_FLASH +#define CONFIG_FLASH_CFI_DRIVER +#define CONFIG_SYS_FLASH_CFI +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE +#define CONFIG_SYS_FLASH_QUIET_TEST +#endif + /* * NOR Flash Timing Params */