From patchwork Wed Jun 8 09:39:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yao Yuan X-Patchwork-Id: 632108 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 3rPkFD0pX0z9sCj for ; Wed, 8 Jun 2016 19:50:08 +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=MDNYmbSf; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 90D2FA7553; Wed, 8 Jun 2016 11:50:02 +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 8iX7yKcGfBlq; Wed, 8 Jun 2016 11:50:02 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 54CDAA7578; Wed, 8 Jun 2016 11:49:56 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 326BCA7597 for ; Wed, 8 Jun 2016 11:49:51 +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 70rU4jRs-Yei for ; Wed, 8 Jun 2016 11:49:51 +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-bn1bon0119.outbound.protection.outlook.com [157.56.111.119]) by theia.denx.de (Postfix) with ESMTPS id 3CD27A75C2 for ; Wed, 8 Jun 2016 11:49:44 +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=MDNYmbSfhM/j5hwI1w2pX++18N35k5WpXN/FvshYGwZSEcz/Uzxw944SJPrb1WzrhtBUokG27qlYkIlnwEeukExdB5mUc3ARf/xT/yu6Cv/NosrYBUc2tMpMb3uwTVgmf/yAM21vZ850vl9kP6BhXBniDLcW8Em19I1jFdR4HDY= Received: from BY2PR03CA048.namprd03.prod.outlook.com (10.141.249.21) 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 09:49:42 +0000 Received: from BN1BFFO11FD014.protection.gbl (2a01:111:f400:7c10::1:171) by BY2PR03CA048.outlook.office365.com (2a01:111:e400:2c5d::21) 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 09:49:42 +0000 Authentication-Results: spf=neutral (sender IP is 192.88.158.2) 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: Neutral (protection.outlook.com: 192.88.158.2 is neither permitted nor denied by domain of freescale.com) Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD014.mail.protection.outlook.com (10.58.144.77) with Microsoft SMTP Server (TLS) id 15.1.497.8 via Frontend Transport; Wed, 8 Jun 2016 09:49:40 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u589nSIa027988; Wed, 8 Jun 2016 02:49:37 -0700 From: Yuan Yao To: Date: Wed, 8 Jun 2016 17:39:11 +0800 Message-ID: <1465378758-41653-4-git-send-email-yao.yuan@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1465378758-41653-1-git-send-email-yao.yuan@freescale.com> References: <1465378758-41653-1-git-send-email-yao.yuan@freescale.com> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(199003)(189002)(68736007)(97736004)(2950100001)(8936002)(586003)(69596002)(81166006)(77096005)(4326007)(92566002)(19580395003)(8676002)(19580405001)(2906002)(81156014)(47776003)(105606002)(189998001)(229853001)(50466002)(36756003)(6806005)(2351001)(5008740100001)(48376002)(33646002)(8666004)(50226002)(106466001)(11100500001)(86362001)(110136002)(50986999)(104016004)(87936001)(76176999)(5003940100001)(7059030); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1211; H:az84smr01.freescale.net; FPR:; SPF:Neutral; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD014; 1:8z05vrj6BviOf/7G7rFSkn13JU5KUEROCGuPuwncGqUOXKbrAqueWwLoeQrXJnIMspWlxdVEnnMwVJgWwlxGx48OZFk11l37jYO399wJsvu6KIp6BsszS9UcfFH/SfuSsKFx5TCRP2SksBqlJYw4hlpEvZqq8JIPiJw/TL7iWZadBxT5Rb3dWNqlsoigILtQfhm+p/drhb+1sllTmsyVs5L7752ie34mZNf8WN5zXZ5UJA5eJ6XcV2y7lpVnYqvAF1lk+i1DqHQOHZHHgQULdLvE9pnVxwNRCrmSl2uhzxVUPKd1kmtMcrqIUrMFplSBWmc9KKoSWZHL2bxuQWryz9cj3HTPdxwszms9aBo8evYYaYNe9b7uzkJuDOF21lwzJ5dZ6A7Gks4g/nr1CcQXxHnJ4m7JzrZH61+Z9iQMQZzJ3xwrJRyPYvoDXTaIJcxYEYoSMF1cAnYs6e5twL2KAFRjuM6LRS2ui5W1/4E/kjgUdo7gHmtS4s707jcRvhBhP9hSs3v40NX4hw2ZacpcKD7b2B61syOxnbSwrwZZzwz0CbSATp+IiB8xrhFUBSdI MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 0431668f-979f-4a57-018f-08d38f82364e X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1211; 2:Zk6qbwpRWCv7mnC0zzcpBQYX0E6dB9UDD4aVdfJT2Ojpfx6PPb6KnMFg9CxIp/xNQCwW+/DMsevGldfUK+zdZhCYVX7ukuvBrFK+vMhnPLTMltzEL1l32w013fz29Z8cwFQP0BWqGdcVFO2YsNA5a7b99bMBGMBXS4E+jMcmYqLzkA0EQrqLLP7J2qyBzUls; 3:x135KtBI62H6nbtxDkWpLRQ6z195Y4xEOt18zr9rDgINKi4ojBWi1zQB/jWJE+6MMox2ljib0Uz/JJxmtQ2lpICIf23QkU0yLxtedzD9KQ43juIpv52bxu36cQP4hQ8CbvstN7D+iC86VmbwmXnAMIwts+GxLJ+1eWosDyHF7mPlQgwIWte88wtqzZ0sCaC9KA3kKoU8urbhHws5sQD5e8yq8HaKBL9z7vxtThrOWTU=; 25:ezA3WoLOqKas2QRq6wPiRp782VoWlBd9RlQdq2ufI+Tohr8sHXXwQ309wBEyXCyTxPBBMsPdWXCYANd4tvL7f2qegdwTdK8GvTBVztI6ItHZ6cTat5lmO/4ApfcFPTSui3DvhtNgZkp6imwERUUQjc3dbgiJrptSKqI6rg6JYcuhM1fUnYH60cELy8/LieFPigE8dW3rW+ZJL61SZRjwWs6oBFUlIwkzNKUlWvWVI299v1d13HD9dOdm/RZpmcAPWs1hn7Jg9nTMiexnb78pQiN1Fp4XMvCurkrlu8+n1n3ZY9JeTTAxvn3bEVJNFXqTbQQDjSvoYEute+TBjXerA9s/W4OaJVgD9QKWfHNY8GN4yV6mhS9THJXv1KOtwVKwiWAW4arg14IZOTb3hSV0DM4Uij66W4WfP7F7TynJ4BI= 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:UzaFY30Q6iQDLvVeYQkVOB9EZh4PfWsize6scwTg/GnSihrnxMJCP2IO9fhPpiGiA72j/Ils3SPRQlTSRDDg74YCEJj4YOELh7sKfoP8aF2DkRz8upOzCIo9WF+vH3XdBgpP0VIF3HZ7HrwO5c1bbPWvVdpcidlHLxGMPPsMgp2I/u2lRhIE6Q6RkBhLWQqqKWcZUOftFp0nIwvmsE4H3I868PvM2lJOWYRtT5iKhdDavK4m+UTw331liMOXGmmxlYcVPaGA/JRRF8t2GRE/xtkHpqm3f/eKb90QGPs36e0z6498/nj4v6LLNPt82UR1GQcp65IVB9NnTjiBrKNMe+yVuuXZAfCmUxRiqRJho7JEdb7RZIsSgOFUQ+G79t6VghxqQ/WDuJSJZKUnaAjADDScX11l5tasia/qn/DOEQMleNlbdRECWZtZBWX6kfr8abUGX3Lc68KxQ+8McT+og/OU7SYuK7gz8cTLxIzKzG5IwSsJWKK9kAzyC5DHKQevxKHe/eSlMMSA/2TrmFACS1WwsTuE9fej/i87UxyTMuYZNSwosDzyLJtoCfBcYdKQnGNgSlHzfYI2GcS+HeuwexrW1v2MCLU4rjM1qeMgC9g= 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:egCL3IUdSwheF9loPUTwQOXUDkeu/kQMB1F7SkNZBZRyZqWPtJE8t8ps3LoJTCJ0aqpCFklUqjYm2kA6sEA6z75n2cjm1J3d3djhPyhp5Wx5Uj7YVJrpMcB9+s5DKvj08hrfyn8lK2tp/yOrxC4KzMIqLu5WCJxb6h2a9BCyZnaI2yQXgleVqD9Jdx+TliP7lDBXJ7hCgZav72MO/sFHIRwMG1gpD6duxe2rtxAyC+QEvCeNJx1bS/gYAnKN7ZWLutlI4IGdHKBhUrMcrhFpUNaYQCY3ex5d2dwfVy89CVWY257KXAL6uwiIckzursHVsR77klM8U4V+dSLwD+MgbvmVOUl0GLEzb9ybKDH4U0RjZVgRCiCdyeQTOBiprw5714w8m8BTuYVMb64A2cjy5DqHTI2d9xeoTR7a6KHXmtddhkmYQ/7LP9azzN8jxOA6pkZ20xShEYliiTg6KRzwjG0VoCdGK89Mi7LX8siGmFporPfT0AWigvSzesjA4qMdiKBrnaSS71JIvLrwNZsiNA== X-Forefront-PRVS: 0967749BC1 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1211; 23:f9e6EXgzdGxbSYPKwl3Rm8UR1vYRcWjbcztW+3N?= =?us-ascii?Q?ryYXtMXgD4do7woVtf6+UdEQFC0sjc9i/624UnBfN0gAxcKR7YSIcpy2mOGD?= =?us-ascii?Q?2ynPG8IRLfcljZx6n2LcPLrNJ2gZf129vOvegxRn+UWJIQ6v7SbvmiJ8GCQ7?= =?us-ascii?Q?mFU/ujFSwu1vrPtQo0ARCDrGzLUMMWAk/HB46CTAdCrKgi6RCXX15hJukfI4?= =?us-ascii?Q?q2LEvgMLCyg2BjqJ2zgVawjqyoqk4tLncQxobvhoUSy7Dsp/a7o5/8YCaoa/?= =?us-ascii?Q?oE9OuBaT+bVA0YIGQzHQCEXYy8zZ0SCi2eTgJtXrKo1rQ5l6AcSWJgzV1weN?= =?us-ascii?Q?/V4yChs8vbw91SeQnLEFVEg45m4Dbh8Z26/3QaSZFNfq5NVbV8UtWObEVcRK?= =?us-ascii?Q?urnYUCiCKJNiV79kCqA1zzJEwJj8D6QjVxBRuY8Ky5Xbe6CgJdFegxT/4saY?= =?us-ascii?Q?lmq9b9yF1FPZOKGC0c2nEXtS86dldp6c83LM4b4nnZkCAM99kwcGDrH3ih8J?= =?us-ascii?Q?yTyCrgK2xoyKh3ERa6RyzLHJRkzFeF8/iDhA3eJc613nWUKoHl1l6Xy1EH/9?= =?us-ascii?Q?tHj3ZD9QFha6RTIGzSOAr8Gd5Vhlc6zorzorMW7kV/huA+jfO4X2eEU+wZln?= =?us-ascii?Q?N0c1Ss7yzwwedOXpOmtuYIEt3OpB2m2V/M++zU1JcSes1UnJDZ/DrkDTKpMv?= =?us-ascii?Q?+TBlWLHB9M0B37ZWTns9Gpi8UU9Vna9E7gVRXctvfQeOFQuxegKrC0ENoROS?= =?us-ascii?Q?OA5FcEXfUgcOLtdUlW0kiVH92HEWy5NeOby0Lbiz0kIMZflVDsRdwhvW3DMp?= =?us-ascii?Q?rzQnwSo4dNcwX4uEyC1uUydsRhR9wh+Bx9AfZ0/mALz7KzsJDrVxlhcOE170?= =?us-ascii?Q?EbUyXCgh/xmkIIbnpp7W751QmYu6woId1/py6ihItLPql5VlefOSFUwYbbUD?= =?us-ascii?Q?jEpJfDKz4N4AwoTSUPFcdnRoHk+Ibytjkpaf8r7t0msm9ApElSo1eTJlk4S7?= =?us-ascii?Q?ShI2bKWCsper27/ROZzGb4QLX/rcGUW+pCZYzMdqgQ+M8d2XwA+36JEzzGsD?= =?us-ascii?Q?tsF3O0kPo7JuEHnDOrMp9SPzbLgr1?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1211; 5:D69MtjjWijDYJIWF/JpSiXeDa3jQKgeJ7lrD4ai/ds2xb/fBNlO5eVHDxaMrl9vQg8Qudf8GXF6eU3GeFcOOCLKLABwdc9rl+KeJgi0UG7CvQX5J/Opuyk/AaPLj/Hm47ueC2yb7KquJ+qiHYLrMYg==; 24:audC0S1FSIuZeLhoDTcoNkqrybsfBPIsJ4O3jO8p0l5OYdoifpvWV5GlPybSZ4qD7IEedcreyIOOP97rra69pq0Ji+MzTm3t02009uZC0N8=; 7:HC7eN8fF1X+lqm0T3ovZy+sbPhYkHjuXk21TlicJb9csPnoiKvym4ToPBTbpMQNUaxEfOmYEwmJoTUYyA89OmxGVGRRnY1/8DmAtUu3pKCoqk9nyPuNtNdSFxFTR4l4AOEBnXnzQbz4cXRVEU/9TjlYmCcSE9ONYpVuh+5BpDFZWdiSoPpD5Yjwu/yBCTpobftoi+g62TmmGRwZZWGh+ZiYN/ITyi1U5dRV9X+//R6Y= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jun 2016 09:49:40.5542 (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.158.2]; Helo=[az84smr01.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 v5 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 */