From patchwork Tue Jan 26 07:06:42 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gong Qianyu X-Patchwork-Id: 573090 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 B206B140291 for ; Tue, 26 Jan 2016 18:16:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A1120A751C; Tue, 26 Jan 2016 08:16:22 +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 1J-xepS6OQuX; Tue, 26 Jan 2016 08:16:22 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3306CA74F1; Tue, 26 Jan 2016 08:16:22 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C3A84A753B for ; Tue, 26 Jan 2016 08:15:48 +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 lJMNDqinaLid for ; Tue, 26 Jan 2016 08:15:48 +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-bn1-obe.outbound.protection.outlook.com (unknown [157.56.111.76]) by theia.denx.de (Postfix) with ESMTPS id 4BBF1A752A for ; Tue, 26 Jan 2016 08:15:44 +0100 (CET) Received: from BY2PR03CA005.namprd03.prod.outlook.com (10.255.93.22) by DM2PR03MB365.namprd03.prod.outlook.com (10.141.55.12) with Microsoft SMTP Server (TLS) id 15.1.390.13; Tue, 26 Jan 2016 07:15:13 +0000 Received: from BY2FFO11FD011.protection.gbl (10.255.93.4) by BY2PR03CA005.outlook.office365.com (10.255.93.22) with Microsoft SMTP Server (TLS) id 15.1.390.13 via Frontend Transport; Tue, 26 Jan 2016 07:15:13 +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 BY2FFO11FD011.mail.protection.outlook.com (10.1.14.129) with Microsoft SMTP Server (TLS) id 15.1.355.15 via Frontend Transport; Tue, 26 Jan 2016 07:15:12 +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 u0Q7F0RT021205; Tue, 26 Jan 2016 00:15:09 -0700 From: Gong Qianyu To: Date: Tue, 26 Jan 2016 15:06:42 +0800 Message-ID: <1453792002-25872-4-git-send-email-Qianyu.Gong@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1453792002-25872-1-git-send-email-Qianyu.Gong@nxp.com> References: <1453792002-25872-1-git-send-email-Qianyu.Gong@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 130982661127901313; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD011; 1:L8VqCQ8w0Snb4YXnWI9y3W3smw1YnDeeEUf+tUfWoIZW+1bQ3n6qHO7/xVZ334TLwY74llWJRiziKRfzL0XxLu8L+1BnUTW9AsQmDHhg2IKA/yxdklTMvwtdCKK4QNJHBmsCBxn23IUqBcTWkBRO62n0rjxuVJM9f4LHB0t5iGbFKkrGv4Ug29EQHlmN6Esm+qtntKazAOziPj0+Ar/1cTmFhKb6QE+wRsIxuVsQahWvS1s3FPvdwrS6u1D1iBAHd/mKRvyDYIc+zgNprh4/A+lsfH3yIfPVIHa6fdjUGMHGvJ2AkdQk36Y96r+JmvVd4L7wprVrRcJrcVXVdO0sMRaNPU9YFJrUYyvHtmrtAvbAx32tRheZv6/kBoGhSmCcf6XihTP+FXrzQUBSVmo8TOJ3Wh8PwGj75pKwiTEspPdoYDprzB3iapkec9YOugetR41IkSiueK/aLWa6sLjdbjbXBsdVEiMTP4O5kfZWRVTevpMUGW+DQSKzOx+4hiOk X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(4326007)(19580405001)(50466002)(87936001)(2906002)(92566002)(86362001)(85426001)(48376002)(50226001)(1220700001)(77096005)(1096002)(104016004)(110136002)(6806005)(5003940100001)(229853001)(11100500001)(107886002)(2351001)(5001960100002)(2950100001)(106466001)(4001430100002)(81156007)(76176999)(19580395003)(189998001)(97736004)(47776003)(36756003)(5008740100001)(105606002)(50986999)(586003)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR03MB365; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: e0ad7795-5f68-435a-2f20-08d326206eb8 X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB365; 2:gct1xHi94bBLfYYks5BWnHgvXf1vS/J4UCHefGVsMJsj+nc+6VcQukrC0D8cO49/BCmvUY3YiOlcWGG8shQjRkkm26mZopi+WJEcHs6FdgTUA9UbJY9743hn9jnUmMdRDTZtXf1soGyrAY4w5fZ3YksANl/T+4r24XECNK070tKvZun+djqgkwCKGSTI1nO7; 3:B3fCbrqPI5lJSRvff+MP8oo1b5DOTZTTwfcs3+uqfBo47rf+ImnxcTGeGqzANNtJQflKpc0/FEY13Fgbl3jxTIFsBt4ArEH3X8fBc5Sx0UmHwTmJuuFcc5VANONNE1qBg9EMOtqRYRYiD8Eo0M6z50+ABM5ByfP5ic67KkSm/0kUS4O4ZnUGJZXVZu9o4WrDB2aj8Z+prYZu3bUMZ066hVCOaCkrkncnnRqeVAO1/Ys=; 25:uPNUgiQDIZOJkyDwIe2sHCRAMWvixpL/YwrlQtsuZvqbncOTZlFeVuEaq0lnb8aDJtGxFMyKp5o9i99OZb0mFtcOb2TWXxWTqClSCupvhgW9iLVSzkpQOOR4v2g2EALha2bzwfxh76/ZOF3Fx+cVyq9344m32tBwpeiouvu7buTysouB40tvX6A+VhiU64bV7DGiY/JCZKIgJGUTKybonKx5bQ+SFxPh37QQjyPgOOlzmT8NfM8em+YlSBoBYUT/ X-Exchange-Antispam-Report-Test: UriScan:; BCL:0; PCL:0; RULEID:; SRVR:DM2PR03MB365; UriScan:(101931422205132); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(123027)(601004)(2401047)(5005006)(13024025)(520078)(13018025)(13023025)(13017025)(8121501046)(13015025)(10201501046)(3002001); SRVR:DM2PR03MB365; BCL:0; PCL:0; RULEID:(400006); SRVR:DM2PR03MB365; X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB365; 4:d43qQQeA7qHlLd2sYFZlkGN7a73iJbtu0yPuOxkFmWimGFNvXR7d2QlahaJeGw4xeEMu1htlPN5ZCuzWDKTfrg+Esk+tubCVkqQh3tlZYvfkIt2T7DeYEK86GPpOo/2OGT4FIoVA1QU1e4TSgKvsFZwlenOie7B6/pUTdx1VEPXFSOcfz1s5zSHflojpKuXyXr+LxXxX49BCKxnaMQHOsLqyglJXokMsYM8OmobewGJdHDkXBS9ERmvl9ui8ZBPqxs0n6PuQGV4v8dg7vo8j04vYNXCM13ftVBqZ/18QHJlgjhneYKxeQujB9FKJmvnxkvo+v0yUgbUmCix+0aHGVgRmd3MkjB/WXa7DkBQRGBWY/pnF+yPOILV/rdLpaM9rwm/FMtMq6M3P2rZRBTiqHJj3Q7DocTkt3zA98mfAJ0iDwk7Ahhhy8S4FIwJIbJCzd11VpcbSFTsBHQfYY22Nix217IosRJSRGD9sEQVoHJLufAU514M2pLtY4LxWjJeJPMBW0nwrAIhvZsCS4PBPhxJMwhYlJws2/8VQp41fFBc= X-Forefront-PRVS: 08331F819E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR03MB365; 23:HDOWVYORT6YCGa4V9lIEApkjeqkdhYkQGLwaq6offM?= =?us-ascii?Q?Rz/SZJ5WSMYdZbNVyngjhDD8ETjHSF4Rpb2j2D3D30rtN6YxTROSfJPwavuv?= =?us-ascii?Q?OnFBR6WvlbN1cxpfmgkxkwKPbK+2evFwIGQmWufJSDIXJNfRUxlsLUlf70jo?= =?us-ascii?Q?DL8vBRi5YFFbpOAVr3tjOsxBhQNygWeQ/F9fQlMor2+Zuc5f85q2gN1BmSfn?= =?us-ascii?Q?ypRNtR5Ee90M++2LuFkfo8I9O5MBRZIM2tLdyWyd9qYKxaqegNLORRS0exsM?= =?us-ascii?Q?1Nxr/mDPCD0KpMr29RZ6Va+EgQzke6Pd/utsjJWoqrJuPuET3yI/KzCEMmxd?= =?us-ascii?Q?6xVnvNfY9qua3Mt2aRIp+4AqE1HZnJtui54uovYzDc/1qIRTSHkvlH1Zna2Q?= =?us-ascii?Q?zDHdAncTnzjLkVmLIx6eRBinWT4kFsryL9CPNf0GKeAbo2WtZ0ph4efCvD6f?= =?us-ascii?Q?/DRDouvRiKV9kkehpmzD5IuDOLvR+P+nSDqzwwwoQcZNet7AVAmj+wc2JTb3?= =?us-ascii?Q?NrxFhtpH4mjUh0W7gc7gX9BL8Qegi1guJHY5/OAbinBVVDPxTgHr0ALOo0cT?= =?us-ascii?Q?nbONQA3RFuDzels+S+p0aMgwI84amAkuUqsW1Z1NJvHccPTqO03o9S79N1Ll?= =?us-ascii?Q?VtmYFPubpRpGZr+1Pr5QVq607pVOBq9bCoxZDqxGBHbKSh82n08T3fwsv+8S?= =?us-ascii?Q?0pJ+N1L9Is+dAOa/W/ktqZwXsB2CNQt5afmxl/7aFqJ0GkowUZv9nx3jcPcz?= =?us-ascii?Q?Ek+rtpeqQyU3FdpxVrrKKhsrgLqOYzunBqbatogdIOP2Jur5n9Cz4IhqaFKo?= =?us-ascii?Q?jgdIQTuUbsgLXqnC3G/JrtL8gAcVoFrQnvfEnli85PlRm3SSdReX+xSQASHd?= =?us-ascii?Q?Zez7CIyqVFNao2QCZnGMp62Phq4LFXKmBmqWOlx8RrAWstL5kR7vv3FBE7Kj?= =?us-ascii?Q?6nXH+tP0zoVF5OoRVuCC9aIUYacZnirOL5CvTqZodzQK+oXDvu3roOI05iML?= =?us-ascii?Q?cW8ODM/pPBgIMrh+1OETugXGadRX7+zXYohc/4ehw7WIMolSVU+PTDFWePb5?= =?us-ascii?Q?uSJ9oYAC3m/mPnMe41+fnnckzet9t81D7y5UhK/+JCEcGmRWM04iyqtFmg4Z?= =?us-ascii?Q?nKA2e3hekGh468K0schOtPCsh+POlh?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR03MB365; 5:4nubuivFqz0dAZ32RfXxbs1fIZfblcsGbaE8mvmpML2HGtulOyrWO3m7HJm+3YX3ov9DY0oZPzQdhnbX2RI3gU/1ZwUTW5KVVqcu0qbzCaWZk2qgOjINVa+zW3IgBJqu8jyY14WSu6Kt+ckOOcqLP3O1IImBT7Ivh4oll1IrGZs=; 24:1ptlNYkOobpVH7LOEyAIgiLBRf6715fofbVqiQuduvnhLS4gOKGiPT1cpohIFZGME1KbB4MvYCADRiEpJTxGysvQZGpdpWarp1Xn3fBXfVE= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Jan 2016 07:15:12.5717 (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: DM2PR03MB365 Cc: Gong Qianyu , oss@buserror.net, Mingkai.Hu@nxp.com, Qianyu.Gong@nxp.com Subject: [U-Boot] [Patch V7 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 --- V6-V7: - No change. 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) {