From patchwork Thu Jan 21 03:34:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gong Qianyu X-Patchwork-Id: 571022 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 3E0F61402ED for ; Thu, 21 Jan 2016 14:43:16 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 850384BDB6; Thu, 21 Jan 2016 04:43:09 +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 s8cGwT_NbbqR; Thu, 21 Jan 2016 04:43:09 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B46C84BDBD; Thu, 21 Jan 2016 04:42:59 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2A6394BD93 for ; Thu, 21 Jan 2016 04:42:56 +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 2WpBY--4xfUg for ; Thu, 21 Jan 2016 04:42:56 +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-bl2-obe.outbound.protection.outlook.com (mail-bl2on0070.outbound.protection.outlook.com [65.55.169.70]) by theia.denx.de (Postfix) with ESMTPS id 2E5A04BD77 for ; Thu, 21 Jan 2016 04:42:51 +0100 (CET) Received: from BN3PR0301CA0030.namprd03.prod.outlook.com (10.160.180.168) by BY1PR0301MB1256.namprd03.prod.outlook.com (10.161.203.28) with Microsoft SMTP Server (TLS) id 15.1.365.19; Thu, 21 Jan 2016 03:42:49 +0000 Received: from BY2FFO11OLC010.protection.gbl (2a01:111:f400:7c0c::197) by BN3PR0301CA0030.outlook.office365.com (2a01:111:e400:4000::40) with Microsoft SMTP Server (TLS) id 15.1.390.13 via Frontend Transport; Thu, 21 Jan 2016 03:42:48 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.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 BY2FFO11OLC010.mail.protection.outlook.com (10.1.15.21) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Thu, 21 Jan 2016 03:42:48 +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 u0L3gY2u027263; Wed, 20 Jan 2016 20:42:45 -0700 From: Gong Qianyu To: , Date: Thu, 21 Jan 2016 11:34:12 +0800 Message-ID: <1453347252-1579-4-git-send-email-Qianyu.Gong@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1453347252-1579-1-git-send-email-Qianyu.Gong@nxp.com> References: <1453347252-1579-1-git-send-email-Qianyu.Gong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 130978213687618872; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC010; 1:TmM1l4o41eK0E4DgnMKyItw/Cz4SC2GiK8hpre3WYfbeJP+ktLxLZFwJ1o+wYEVWcr/q78cqVYZt0swYx/Lg+MCh73BYY1jXuXvdkrUKFR2NbjlQVPRF6Vdb/A4USizP7XCrVLwUwyg9paIigmSfBAIpM1pS5KJ1RGVp6G4CZy8bWLsAfddhAL6bRNXKZmUrLc0Z62MG7vXEUuc0JVgsuwNHye92vVNFmoiXrz++mgVjR721k4j20moPFVksku/58GkaaOYzYPK2NOoxb7NMyChO4lKXh93eYbs3EkYTMkjUax4hMBNl0gfGfzhZv51ZQOad6eVSFTD5BfPa5Ugfk+WWAuIPQXLcR4IyvrUR/0af++dV1CEPaeUl6ICiNdMHQQ2HuE+QdsUb1c9xhklpLvI2vZA4TpKHLPt/LgKRyuf3JJsPgA4yjfVAfuaAl1X/tn7ThV3Cy6BGgIYYdbAjYdI11JhSYUzmo0kYPkGSqR9/4fCAqwj5NVGZqReU+AtlAAip/GJGKqedl3A3kv3lQQLGvLq0NhyfeWhauhMZa5Q= X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(3190300001)(199003)(189002)(6806005)(104016004)(5003940100001)(19580405001)(47776003)(5008740100001)(19580395003)(4001430100002)(4326007)(36756003)(2906002)(86362001)(105606002)(107886002)(50986999)(81156007)(50466002)(50226001)(586003)(229853001)(48376002)(85426001)(5001960100002)(87936001)(106466001)(1096002)(77096005)(4001450100002)(11100500001)(97736004)(189998001)(5001770100001)(76176999)(2950100001)(92566002)(1220700001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY1PR0301MB1256; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 80b860b9-92f1-447e-0bda-08d32214ee9f X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1256; 2:wUh1knKil3f4fIPjN2bBx0Svan3psgp6jGI85i/Cx6iu2UipvdEMmWLOs8QMTkBGvR8FA9OJVp2Mb6dOk008Ulb42VzoKJTJFEDcc8kJvSXFxTE748IUcX7fNXN67oKDvgkJP2W4eLFRvNDtGxLsQFePoI0nDU0G9bRCkFH9TS+7B51LYstByOmpxCrqUdd+; 3:46GjGYSiND9wOkKaDAzyilCxS/zVQo7QYnecA4NuWwCRZHCWkeED+kqtukaT0MKkQ5BrpTD/6ZWDOZ2HELhMDZT73uDU3RD8uoU0WCA/JMx8i5cJUAIV9gx9QdPvymZ1oe+mo6Cfz7YpbnUopbTCo1tswB/o5SLIbhYIcgJFjsucIxoPua6xLC1IIEA+PtqLdgOSZnlDxajPVC/ovvcQyXBrqJUcbkYNKd5fFeMVxYM=; 25:E4O7L+yvrverGcS6C3rV5/5eulSqNJYcsyk4Pca78wbkS64CQr+ODvr41CiX8EB1BAQiyJJKT0dwSJlqdcMw8afTGDFt5U/FW1VEgt9aO2X+/lau8XD8cgCuFMAVGEPzR2LpwghORlV8QboU51k7YpQQGsJrK6K6xaOMjr+cnkU86ETuixeMZFBhrmfGWF3g1TKK2iigegKoKcLs4R3wxkH8EX/0Ddz/60Z5Us3ceTOR0OAiFdXqyCJQDR2IDn+e X-Exchange-Antispam-Report-Test: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0301MB1256; UriScan:(101931422205132); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(13015025)(13018025)(5005006)(13017025)(13023025)(8121501046)(520078)(13024025)(10201501046)(3002001); SRVR:BY1PR0301MB1256; BCL:0; PCL:0; RULEID:(400006); SRVR:BY1PR0301MB1256; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1256; 4:xPeJ/SDn/07xXkYvCQrmiB7//sC3NCLsp9QZQAChe7YGMVyJwUP79h7PNFIyUKPcuXHll8xXInDxNLxvXAU49temei3DlHE4tR2GASB+D+Nrt4Pi9whpiAY0JED+IzsG4whsZwDGZ02v32POcBSMs+ShPxVOC2jUML756BOdUPbfTkz7QwwNFO5bcjm72aaSZoFG5d8mDFXomipRI2gvYunkh1tzJ3TJxNmWL1fEwOMf/fSYzFLDVyCwAtFT82rItGMc+AEK5u6cd/z4ryz54B+wnIp0HsouamoLVwo/DlrOtv6raEzItIbfZQ9p1x2iIlGOhJ+iCMwP/P3S723t81mkWMdwcZf2XLx116HAdo1I0a3RyVBaVEkP/SREset27app/Xu3vJcrQfhNa3tpXXtwaOS9piCAApH7Tj/4dluc0rCeh4VF4leUZk6rrdT4fasbC0Nk3LkAsuuoU5U2dNEYew7wpfkEYDti7uWCqCshHdyl7jaXwnf8sKeH6CntiXhG2yRZMm7XaQU23PEQYA== X-Forefront-PRVS: 08286A0BE2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0301MB1256; 23:/yKyp9J6S+arrk30qSJgpm1NScghehOF/I9OHxW?= =?us-ascii?Q?M42Mj1bed82CpuWRb0Xknv+k7JY/bly9h3WnmUS5rfMP1Pv17rlrjrG64pt0?= =?us-ascii?Q?9j+dSBXzNhbvn7z76k/pYox2lT7RWvy2148jAaQ3lVmxApWH6y7DKReFD45T?= =?us-ascii?Q?b3oD2bbG+erq50Ehi6TSDrsNQphUQSYG4M0b+y3Ha/WHOFRJ7iMUvdEb4iNX?= =?us-ascii?Q?NsT1zUlptoxckbXCVhlG6rSe6vTuV2DlVCWWHZ/kGWG5TJqFQCxR6SDZ1ye8?= =?us-ascii?Q?huoVI684JhIoDyKA543iI2V0f+ChIvw81mHVLpsxJQZBXVs3Jdhrfkq6eLrE?= =?us-ascii?Q?saH86XLo7wE+gpkwnBnte7SIcGXzHIcxcKbd3OARKQO39rgMHk7LJeVNZq9R?= =?us-ascii?Q?aLNetBgrtMcU20y0wOoUMi9UTePF6sN2EnMpLgrcGUKUotntMQv6y1ii66E7?= =?us-ascii?Q?M3z1oe1/JQRLOLIDf9zpZcznVYztf96raSRXAnXSZbhVd4JozP/Q65wv0L+0?= =?us-ascii?Q?MINfgwGg4ESDcrnkGCZ1qiZKgDeLr6wsjIXnnFPT9ES1E4PER5UgKb1bJDtX?= =?us-ascii?Q?erUjKZV71uSYSgDg/XSrZhTSENDb6mLISYDqqrIwpy91+Qtksi2Nosa1D53+?= =?us-ascii?Q?cS6j1wRJ5oSkurZIFIIyUlEXZdl/P0yWUstnqW39bzp4uKsMKUkb3C5TKPJP?= =?us-ascii?Q?xzhg9xSfEu3LXn69pQ9Nzp9OduimEV7HttdsWTx9V9x42UecRgumrtcrRmgk?= =?us-ascii?Q?gFebOHR2MsDrW455OIEI/BZao4BGm8faC568fHjuswvRoNw3T23nRhAmNxs0?= =?us-ascii?Q?PpzFaLDqDAVTp0x00HCMNwR9gsFnFI+50C3eCuXkY56/MG5Gi5JzlYmnJ66C?= =?us-ascii?Q?snQqmBf0Pzjs/v11a6Jj00UYeYtzofCVHxOd4l6R9R+pvyyMDrl32g4MAecz?= =?us-ascii?Q?CgH4AT4ijOhK76JJCLoJJbAGmdlIcjvu51bjPVaxOE+p2OOheH7xH1bzOC7k?= =?us-ascii?Q?+2Ntec1vUq2CDEFL50DrWlf7eIQjwxRjD56s/0eWDGw7ERU8CPaw1SpaP5cO?= =?us-ascii?Q?nqX1GJoK9+PCiyqNDdgAQXCrbeh7/2jVWuIvgzS5Z+C7c5Zm1pgEuHZgJzxc?= =?us-ascii?Q?MfMppDiqq4nm+Q5ILTw6M8z4Mq8eJvoImEoyDk3Bzj+OX/fE80Rz3uoXaLHW?= =?us-ascii?Q?W9T3Ed7S2HtWr/20=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1256; 5:sncY0otYuJ0jGnBOmZ36WQEbF0B2abUQTgrBdhYJ0OkVO19TE+kgChEUbk6V6oITtwY2DGrKXa1SLKZFMsdjdqlae2PrGwvNb0ASk5Cdl1ofi8pGkGrzr6Q8C0Fhf028q6R0YY8EK5w9j7ZqfqgeHsdSjFI39V0Jxm7+QdzVmUM=; 24:asTTmHiyRkZnvtqyuWB9VA60BD+B/XjfIeYfMtiVulmD8PK6O4hkPEY2zYzZDiXvWn/VLyl24XNus8JAaFcO3Q7dpcpQQmyZX3HncqHO0Qk= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2016 03:42:48.5590 (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.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0301MB1256 Cc: B07421@freescale.com, Gong Qianyu , B48286@freescale.com, Wenbin.Song@freescale.com, jteki@openedev.com Subject: [U-Boot] [Patch V5 4/4] dm: env_sf: fix saveenv() to use driver model 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: Gong Qianyu It might be missed when converting spi_flash_probe() in cmd_sf.c. This patch refers to commit fbb099183e3a ("dm: Convert spi_flash_probe() and 'sf probe' to use driver model"). Signed-off-by: Gong Qianyu --- V5: - Revise commit message. V4: - Use CONFIG_ENV_* instead of CONFIG_SF_*. - Remove the variables and call the macros directly. - Use set_default_env instead of print info. V3: - Remove redundant operations for saveenv() V2: - New patch. common/env_sf.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/common/env_sf.c b/common/env_sf.c index 9409831..892e6cb 100644 --- a/common/env_sf.c +++ b/common/env_sf.c @@ -16,6 +16,7 @@ #include #include #include +#include #ifndef CONFIG_ENV_SPI_BUS # define CONFIG_ENV_SPI_BUS 0 @@ -51,6 +52,19 @@ int saveenv(void) char *saved_buffer = NULL, flag = OBSOLETE_FLAG; u32 saved_size, saved_offset, sector = 1; int ret; +#ifdef CONFIG_DM_SPI_FLASH + struct udevice *new; + + ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, + CONFIG_ENV_SPI_MAX_HZ, + CONFIG_ENV_SPI_MODE, &new); + if (ret) { + set_default_env("!spi_flash_probe_bus_cs() failed"); + return 1; + } + + env_flash = dev_get_uclass_priv(new); +#else if (!env_flash) { env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, @@ -61,6 +75,7 @@ int saveenv(void) return 1; } } +#endif ret = env_export(&env_new); if (ret) @@ -227,6 +242,19 @@ int saveenv(void) char *saved_buffer = NULL; int ret = 1; env_t env_new; +#ifdef CONFIG_DM_SPI_FLASH + struct udevice *new; + + ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, + CONFIG_ENV_SPI_MAX_HZ, + CONFIG_ENV_SPI_MODE, &new); + if (ret) { + set_default_env("!spi_flash_probe_bus_cs() failed"); + return 1; + } + + env_flash = dev_get_uclass_priv(new); +#else if (!env_flash) { env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, @@ -237,6 +265,7 @@ int saveenv(void) return 1; } } +#endif /* Is the sector larger than the env (i.e. embedded) */ if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) {