From patchwork Wed Jun 8 10:24: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: 632142 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 3rPlLY3Kxtz9snm for ; Wed, 8 Jun 2016 20:39:49 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=freescale.onmicrosoft.com header.i=@freescale.onmicrosoft.com header.b=1gqCrlhw; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 08C5AA75E6; Wed, 8 Jun 2016 12:39:48 +0200 (CEST) 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 K9mVwPXoQWFb; Wed, 8 Jun 2016 12:39:47 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D8715A75C5; Wed, 8 Jun 2016 12:38:36 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C9037A7527 for ; Wed, 8 Jun 2016 12:35:54 +0200 (CEST) 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 HcHXFE8s5g3h for ; Wed, 8 Jun 2016 12:35:54 +0200 (CEST) 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-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0118.outbound.protection.outlook.com [157.56.111.118]) by theia.denx.de (Postfix) with ESMTPS id 30788A7528 for ; Wed, 8 Jun 2016 12:35:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freescale.onmicrosoft.com; s=selector1-freescale-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=zpnsTGYAIpYUeUzYwKe0A2YQbcmhUstC1URBqoF2Z4M=; b=1gqCrlhwIUUGBuTFVkHG/Oj6JANvbeK/3+odAJtsooELDk3w7ouoDpn1lfaBqTDCN6guJlzmSWs+b70V1iwdeV6mWaiPoLqoXZjZ+A//G1qCec6NQ5vkAvTuJfwctZO5NKPx9/ZlAVR/2vGsB7+EuXYhvzGGpHaMVGW2uNGewHg= Received: from BN3PR0301CA0079.namprd03.prod.outlook.com (10.160.152.175) by CY1PR0301MB1211.namprd03.prod.outlook.com (10.161.212.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.506.9; Wed, 8 Jun 2016 10:35:26 +0000 Received: from BN1AFFO11FD030.protection.gbl (2a01:111:f400:7c10::120) by BN3PR0301CA0079.outlook.office365.com (2a01:111:e400:401e::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.511.8 via Frontend Transport; Wed, 8 Jun 2016 10:35:26 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=freescale.com; lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; 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 BN1AFFO11FD030.mail.protection.outlook.com (10.58.52.168) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Wed, 8 Jun 2016 10:35:26 +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 u58AZA5H031424; Wed, 8 Jun 2016 03:35:22 -0700 From: Yuan Yao To: Date: Wed, 8 Jun 2016 18:24:53 +0800 Message-ID: <1465381500-34476-4-git-send-email-yao.yuan@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1465381500-34476-1-git-send-email-yao.yuan@freescale.com> References: <1465381500-34476-1-git-send-email-yao.yuan@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(36756003)(6806005)(2351001)(47776003)(189998001)(50466002)(105606002)(85426001)(229853001)(50986999)(110136002)(76176999)(5003940100001)(104016004)(87936001)(8666004)(50226002)(48376002)(5008740100001)(33646002)(86362001)(106466001)(11100500001)(586003)(97736004)(68736007)(8936002)(2950100001)(8676002)(2906002)(81156014)(19580405001)(81166006)(77096005)(4326007)(19580395003)(92566002)(7059030); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1211; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD030; 1:jf6nQh6OmKjvgui1+W+DXxkgJ8Yp5v4vBgNRYx5Tuv5Y8WsqnlGHGUHr5ZeuKzXxzimi05iyjlBsjves1uQ+kyg52dWJhKEivb7IPZMeNvxxhg/wEe+aKzEmj7ltbmaZfcahUAxKByk1ZdcwZj2Owi6iCOOD+I+D7dyhlHnJbfhWXYyKyC7mzP+FsFXKZTuDIbyRBu6DVZuelIfxa5tkAHBNjbBFLRDUZizMMLB6Zc2Kd4kCxO2UUkHoE2iJ68MEfLZuyFPTLoiqPBdFGl4kChfVfDzPaI+G7kPLnuTZJWs5RvDpDdS8+fa1n/O0HQI5EG4ql5ZWoR+v4jbHdfN8c2swqBvT7oF3mPzYCph2pwvepO33SzPEQwyqq18m0kW/A6wwqLv8z70SGh7KfMYzJINN9UBPQvn3eZCVVvpS9K0gXF7EpLo5sWOzBWEourbTMoiGqO1HJf969nI2yrqeZyWLFAj5S1HM7DJONhZn/CElR/UopBL8roOvH0n18oEEn6wFW7q6WDGKjNQ3SqIz3gKSPWpAFnBBLHAW6apMJZfsQIuMYb08kEWOIOWAku6b MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 57c74002-7c4b-42ae-e3f6-08d38f889aba X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1211; 2:Uj7Uuxev1lerSmsg+zUU8TS9bQoRXfFqY6JDCVF4XwYMPOBs5YXpDN5dxSBxvlZdnte0rbD3uX6RibqZE3JKbbZ0pzROIMT5dq3QV2YnjfxxBR7Ayuf2LNao4egLJlJAEtGpfeROxa7z6RTKyZ+zSKtO+mZ1uMIzgJMbEXaSMfLNax00YHDEjHe0/m5lL7VV; 3:a729db03A48EPyyLtGL45Y2l4LDu2D8Aa/RAHc/ZCZUgWMlOQCUCUHUEDeyZkdEa9Bq9sWXWJ/9l7InFd+kvR1gIGj+f0RBi4GYvrDneXaJDnXwZuTS+KZAjLWDoN/kImWF8yQeDH3npv3mRTZMoi78ksS0xExBQoJ2+rmcOFrRbC531YvF03XXaENDhoHgWeKmJVb1rWmd9/GCvsUOLBYZdvFIVb6LCTIzr93OqVpg=; 25:tS2kcnZL8eto8Gp6PhENOYkvBghNZqJtOO883rHNY2kzhReCI/jWME4UJnAdpXtjzwMGKOGQ1fMBOtR1LYe1L4/ipHxtt7GMNfg4QJ/2Ez+aVZCtaShf8mPXF/9UTVm49MByucIIx0RFEtuovLMezNh5peoQI66jl7CvSq62WcyxCeCjwCLjB0nnoQaaTaHOjmAU1ILV3KwkiU63adyKZU6VzsVunaazlKJIzYmDj21fWm9OQu3Whcy71XMluYRwZv2+0J2SnQNfgBqiXcy7mPEPttw0GU/zVwHVvRZ1B6Sr865sgLUUWMeFSSqzcQr4TT99bfNzfA/AMorNbA699UrW70B2mK1k1rqOMg+mg+q8OTrS4oE9SJ28p9Gom4PZn7PuKWsuQAzvTDMHHBUz8/cFamBNRGW9nAv2EZ1PiJ8= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1211; X-LD-Processed: 710a03f5-10f6-4d38-9ff4-a80b81da590d,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1211; 20:4scCKEFVIgmcDO8QFCuqKHfAcLqQ2Y+G8+bzxXMcrPKad9OwSF9mfX752zg9CmSB++4a+w5S69kZZ3oB6rXrbYpPRXzPI6PHWOtQQr2sDMxIpwm1+1eYInn05RXVCtuaSQs3pCE0pmL7U00xZ1AHxKL/ti5wyg6Z5gc0gm/o6Jbw0sPujXgUHlSQBJse46C3Dj5CXZcgliPQygzLWf/dIaYlT+KkqH3b4QJ1yq09MVDRe/driUNWi0gIv/ykdiIS094vhpRdlgm+OxB2U5K+ANqDQsBMhH3KMpM98Xq7EBMiHlrkQ/tc4WZCj8tu5McFuAediXcp+OqsB/u5TeY+x3d7hADjetHzd2gKFkQFkz0iqJ8+SU0YS0CJaglDY0vhL6AKL/ls3b/jCUB86tCjqdEpMLRYiQ8+yYootbI2RgjpJrrOpo+V1AEu4xgZYenqUkPmlrMlNHzey/UTHxTP3pULEoPhh8+HbVzNuKffbB/eKzENmgjC9WbKkHCmr1o46FWe/cM3RU8pbLSBf7+70Zc8fsXvHYRu8ArHd1IXa3g3GVHn4BaJ0ZhfQo4sjPjDV2WToKzSBH+UH6BIscu0pdnjWn0yp2y3hdgzp6WFVgM= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13024025)(8121501046)(13015025)(5005006)(13017025)(13018025)(13023025)(3002001)(10201501046)(6055026); SRVR:CY1PR0301MB1211; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1211; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1211; 4:6pYEFSn6B9B05a/ybriPxMP14/PhHIi/CvA0AySwBGaAjSQIxqMPGREHLq912FhL+OHEyH1PnGsARTBgh97vp6CuwFWljft9lNk4DSG1BmaVO3ARhOZdnr4mrhFEi90oyCs0lfaTF4nvTNPQBV6cWNukADVaf0dIK70BpzLZCaK7HsNs8QY6pmI/HcB+g0wGV5L+mUzEqHTtdj/W8Wq4NA9xMerFIasxRAaSQ84Vc+XEq1t0shwJ2dsb0A0VipbFeDyllfuyaKdWSZBrPpBXJyYYja2kq/sUZOjsubyt5T8vliZ1JdzdhYfkdmAawCfJyQSwDIL5KVKIviIN2cEjJ62CnFsQBo2vMhSDgLL36JbEmw78FXK9garBoICk0TSrHFTqLzGdguT96e80NNxJGJzonPFdSzmxGGRJZO9YppgbyIDZS0Q+DScXFaBKENy6YFvG2G6oAfvU6bFyvPZnks+vlyoI6hGacIPe+pMaetsVsLoCnepkcGkxbYGwZiRLUO8DzTSwLmGlT7ZZ9Mx2SA== X-Forefront-PRVS: 0967749BC1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1211; 23:YQqayKMa6UbGrAfZbrvYfcBv0Ua5gYW3IOm9isY?= =?us-ascii?Q?zZ/HfSD6DfbtTUhtwnW8DFOA3l1OPQSU9EzgknJkBNOr5rMKyWrBUj5Nzh2w?= =?us-ascii?Q?yVTcUy/EwH8lxpXXcAnS+J0ATjgAxJxUAUov3O+ogEVpiufxJ36d3xwgmDw/?= =?us-ascii?Q?eZU2+dakZHmywSLjvO4/DazCOsKk5mvkj/h/ISUuQOK3nKVdV/U59zTKQbOO?= =?us-ascii?Q?NBtvKhuZVP4P6NKkgh9yb/3iP52I+rMcNpTnASAnBN98SLjzA1zuqHJdgnhv?= =?us-ascii?Q?T3wsxhRk2B6fgy5qhuJxahvGebT/mXvzLQW50TvkSjYjL5zMe3Lg+6qz1w0X?= =?us-ascii?Q?7TkqP/bZg+DU5eoPF1X4FiL1UNw8fbPBz5QyaQ0MFIaoxilAxXYytaZMt/uV?= =?us-ascii?Q?D4FPsvLAMy4515851kBDHprtUQgSh713L9f++ehiMoCNeCdyDVNetXvC2GjM?= =?us-ascii?Q?bX12o8jtDWmGL6eBkIlyQtaszl4lGoJ5xflgul/46Syc5X9MH4LYb0hE/4dX?= =?us-ascii?Q?GIGLFkMUfTdMA04MD6FcUMiCEa06c21J5T5gJALfTN9U1ryT0rnwlCe/Paf5?= =?us-ascii?Q?XwJKB4T7nqIxiNScHHiDzgteKyklsF2bCY9YO4xvwwaQOZSa95CaNGzDlcqy?= =?us-ascii?Q?/w3nGs3rDEYVqSQM25ctNFHUUNX37oxhTg/ShIPyAGXwKSkyFfBNB21HTC/H?= =?us-ascii?Q?XVWnpb3ZlumWwgp6QqkAJbE+HK6yhzTAltXuHJGqrjbDHT9Txm+o0zYMc83S?= =?us-ascii?Q?1sewsQSMdWYWewy16iGyzpl7QqHSwwXN45Ie8aHSaSlwEvuz15FSeVOkD0Kv?= =?us-ascii?Q?HoyQGfeBjaYcZ2lxnbzSUDpdtjGc9Gq4+A5ORzOAsn1HLIpj5WXDxpvLTNV7?= =?us-ascii?Q?XhSh2qKqJHGzyljXVa/iNDdX3vRqV3ApLQU+7gXTUMWAW96rSIZb2naYFmVn?= =?us-ascii?Q?5XFKCtLOsKkVC3D6qFz2iKNE6/9trJX35Hn0+y5AP7IC9EQYFwGp2RH1wkz6?= =?us-ascii?Q?QTISKH3tUHKxPthKnkEZYnYeiL29GnnfIXZ1IvZaskcHpZnmxf0muS1THdg+?= =?us-ascii?Q?X4diItV0U8pTrNv/U0DZvNByXniiZ4MXAWei0hh0IWKwzG0mn/3jvRdECy6v?= =?us-ascii?Q?JQigICkvdORcDPK+3C2qtkMuZ6XECJBf7?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1211; 5:oRN9LR4wFtqk2roe86a1Z794Lr7ToQAD+2HrLN5PedJfOzkb12BPO/l5cdxyCBzEIJu14cTSv1Hc/H1DZG0/qgUN8GlflOiyfoiqvicL7dMaXwgeROh/nGm/fibDF0cs2QTFMi3UpOgZkT0WiLc/hg==; 24:RJ6DhE+KPMEPYDAng8zOd+OUCYSbrQK48gpIPDSg9qQy6B+AplOpfSyGB4vn8/5EhlJTA0pmbjgHyiI+J509DCH1G3XcemPNm6tuiy4mC3k=; 7:PxBOCqnUBssyYtmpuiy0ctIrJMpPJbOXQ6Mj4kdc+SQYLPW4QRyUdchEPZWP4cQYABJxoBNC0j5HafRqmtgejWQ6fRV65A+3mSIhoGngt853cSsi2KPF1HTYrq2qaEumvvNjOxhP6qLrjqUuuw/U/cNE2Rr8oz+f6wWQCJF4V9cS7NeTJaF3e1k9Q9b1LoH8hH8hrnoRpR4YivvHm9LIfWB1HJ8hdtq1V41ymawFM2Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2016 10:35:26.1763 (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: CY1PR0301MB1211 Cc: yunhui.cui@nxp.com, leoyang.li@nxp.com, u-boot@lists.denx.de Subject: [U-Boot] [PATCH v6 03/10] 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 c78aeb5..48b1e15 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -138,13 +138,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 7563aaf..7f245b5 100644 --- a/include/configs/ls2080a_simu.h +++ b/include/configs/ls2080a_simu.h @@ -30,6 +30,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 */