diff mbox

[U-Boot,1/4] env_sf: factor out prepare_flash_device

Message ID 20161128100117.5237-2-andreas.fenkart@digitalstrom.com
State Changes Requested
Delegated to: Tom Rini
Headers show

Commit Message

Andreas Fenkart Nov. 28, 2016, 10:01 a.m. UTC 
copy&paste code found in single/double buffered code path

Signed-off-by: Andreas Fenkart <andreas.fenkart@digitalstrom.com>
---
 common/env_sf.c | 47 ++++++++++++++++++-----------------------------
 1 file changed, 18 insertions(+), 29 deletions(-)

Comments

Simon Glass Nov. 30, 2016, 12:34 a.m. UTC | #1 
On 28 November 2016 at 03:01, Andreas Fenkart
<andreas.fenkart@digitalstrom.com> wrote:
> copy&paste code found in single/double buffered code path
>
> Signed-off-by: Andreas Fenkart <andreas.fenkart@digitalstrom.com>
> ---
>  common/env_sf.c | 47 ++++++++++++++++++-----------------------------
>  1 file changed, 18 insertions(+), 29 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>
Tom Rini Dec. 2, 2016, 8:03 p.m. UTC | #2 
On Mon, Nov 28, 2016 at 11:01:14AM +0100, Andreas Fenkart wrote:

> copy&paste code found in single/double buffered code path
> 
> Signed-off-by: Andreas Fenkart <andreas.fenkart@digitalstrom.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Please test build this series on all platforms (perhaps via travis-ci)
as this breaks on ls1012afrdm_qspi and others, thanks!
diff mbox

Patch

diff --git a/common/env_sf.c b/common/env_sf.c
index c53200f..5126762 100644
--- a/common/env_sf.c
+++ b/common/env_sf.c
@@ -45,13 +45,8 @@  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;
 
@@ -76,6 +71,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 +251,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) {