From patchwork Sat Apr 8 09:59:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Fenkart X-Patchwork-Id: 748587 X-Patchwork-Delegate: jagannadh.teki@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3w0dY76cd2z9s7q for ; Sun, 9 Apr 2017 00:06:51 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="sz+0bsE1"; dkim-atps=neutral Received: by lists.denx.de (Postfix, from userid 105) id 9CB18C21D21; Sat, 8 Apr 2017 14:05:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id E6521C21CF0; Sat, 8 Apr 2017 14:04:47 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7E964C21C54; Sat, 8 Apr 2017 09:59:41 +0000 (UTC) Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by lists.denx.de (Postfix) with ESMTPS id 26C56C21C1F for ; Sat, 8 Apr 2017 09:59:41 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id x75so1888226wma.1 for ; Sat, 08 Apr 2017 02:59:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2SfCkxqlr6hH/Vw6IjHCYGIZxthoW0ltOY2Ef/7J9cs=; b=sz+0bsE1kP1w/eQFvNI2isJrsT33D/51AohZLcKt0XR7REr0Mw5VNE868092cOinJe QxxcH7TMlYaqH+Kshc0O7nheBkHr0K6swnDcU/ES1TLwpOwOe0LUCQpBUrz2sQjGd5Nm suBTEUzfIKHsZoAdg5q+vmvuC3+4Wr6U+HzKx/KGhB8/hat58h+RSeS21QJ9Kb0Iceed RkYIpenRIVbugRLhje3PjqXJxuoPSOcOf6qeqVoca4D+2dUx24ZRVGgPIk+9E4XPLnbd MFc8V0aYfV1wmJLDOUkTV1Rkw1U337matEuS+7pMstut3TAJbHhAab4dhAF4/yTAE6or csYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2SfCkxqlr6hH/Vw6IjHCYGIZxthoW0ltOY2Ef/7J9cs=; b=iTS43DpvSeNONN5k7cY95ja7b02g/YTki45EVq8UQg+M+86viqk0v1kWvVtQEASMGu bXC14dAzNTCZAL/0UuD0m/Q2q5RLUtWF+4FETI4JNvxP5Y3Q79BZLVieuPtLt6VpsqnS G9M9Lc2iOd6N6TZesIdIwJt+ED10nnQa1lwSC1Zv6J26BF3bG95UuGgSKtyX0VFEH9ZQ XsvZSlq9sFSRygUbhaxjZEo9+IwqllBS9GNaTJXQds/VcCVeop05N21YUDSiLGJ2DnGI sQ25zXtY18kRI0BcsfvRf3CXoFP8CKveg/a747O32R+OzyLCWXe581AHDeSdvJZ0xm86 RwIA== X-Gm-Message-State: AN3rC/4UYDFmCuwRb6fXeHpq/MSVED2t8JzPZUewEyltGP2t2q1N9S1G INUPNRqQ76RXFA== X-Received: by 10.28.218.71 with SMTP id r68mr2962155wmg.59.1491645580893; Sat, 08 Apr 2017 02:59:40 -0700 (PDT) Received: from localhost (37-48-6-215.tmcz.cz. [37.48.6.215]) by smtp.gmail.com with ESMTPSA id h68sm2163438wmd.19.2017.04.08.02.59.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 08 Apr 2017 02:59:40 -0700 (PDT) From: Andreas Fenkart To: u-boot@lists.denx.de Date: Sat, 8 Apr 2017 11:59:31 +0200 Message-Id: <20170408095934.32733-2-afenkart@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170408095934.32733-1-afenkart@gmail.com> References: <20170408095934.32733-1-afenkart@gmail.com> X-Mailman-Approved-At: Sat, 08 Apr 2017 14:04:45 +0000 Cc: Andreas Fenkart Subject: [U-Boot] [PATCH v2 1/4] env_sf: factor out prepare_flash_device X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" copy&paste code found in single/double buffered code path Signed-off-by: Andreas Fenkart Reviewed-by: Simon Glass --- common/env_sf.c | 48 +++++++++++++++++++----------------------------- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/common/env_sf.c b/common/env_sf.c index 27b4d1226a..8af590a3d9 100644 --- a/common/env_sf.c +++ b/common/env_sf.c @@ -45,15 +45,11 @@ char *env_name_spec = "SPI Flash"; static struct spi_flash *env_flash; -#if defined(CONFIG_ENV_OFFSET_REDUND) -int saveenv(void) +static int setup_flash_device(void) { - env_t env_new; - char *saved_buffer = NULL, flag = OBSOLETE_FLAG; - u32 saved_size, saved_offset, sector = 1; - int ret; #ifdef CONFIG_DM_SPI_FLASH struct udevice *new; + int ret; /* speed and mode will be read from DT */ ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, @@ -76,6 +72,20 @@ int saveenv(void) } } #endif + return 0; +} + +#if defined(CONFIG_ENV_OFFSET_REDUND) +int saveenv(void) +{ + env_t env_new; + char *saved_buffer = NULL, flag = OBSOLETE_FLAG; + u32 saved_size, saved_offset, sector = 1; + int ret; + + ret = setup_flash_device(); + if (ret) + return ret; ret = env_export(&env_new); if (ret) @@ -242,30 +252,10 @@ int saveenv(void) char *saved_buffer = NULL; int ret = 1; env_t env_new; -#ifdef CONFIG_DM_SPI_FLASH - struct udevice *new; - /* speed and mode will be read from DT */ - ret = spi_flash_probe_bus_cs(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS, - 0, 0, &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, - CONFIG_ENV_SPI_CS, - CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE); - if (!env_flash) { - set_default_env("!spi_flash_probe() failed"); - return 1; - } - } -#endif + ret = setup_flash_device(); + if (ret) + return ret; /* Is the sector larger than the env (i.e. embedded) */ if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) {