[U-Boot] [Patch V3 4/4] dm: env_sf: fix saveenv() to use driver model

[Jagan Teki]

On 8 January 2016 at 12:57, Gong Qianyu <Qianyu.Gong at nxp.com> wrote:
> From: Gong Qianyu <Qianyu.Gong at freescale.com>
>
> It might be missed when converting spi_flash_probe() in cmd_sf.c.
>
> This commit refers to fbb099183e3a53f77a975964cdf2e73d11e565af.
>
> Signed-off-by: Gong Qianyu <Qianyu.Gong at freescale.com>
> ---
> V3:
>  - Remove redundant operations for saveenv()
> V2:
>  - New patch.
>
>  common/env_sf.c | 35 +++++++++++++++++++++++++++++++++++
>  1 file changed, 35 insertions(+)
>
> diff --git a/common/env_sf.c b/common/env_sf.c
> index 9409831..fd0c82a 100644
> --- a/common/env_sf.c
> +++ b/common/env_sf.c
> @@ -16,6 +16,7 @@
>  #include <spi_flash.h>
>  #include <search.h>
>  #include <errno.h>
> +#include <dm/device-internal.h>
>
>  #ifndef CONFIG_ENV_SPI_BUS
>  # define CONFIG_ENV_SPI_BUS    0
> @@ -51,6 +52,22 @@ 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;
> +       unsigned int bus = CONFIG_SF_DEFAULT_BUS;
> +       unsigned int cs = CONFIG_SF_DEFAULT_CS;
> +       unsigned int speed = CONFIG_SF_DEFAULT_SPEED;
> +       unsigned int mode = CONFIG_SF_DEFAULT_MODE;

non-dm uses CONFIG_ENV_ *  may be we can use the same?

> +
> +       ret = spi_flash_probe_bus_cs(bus, cs, speed, mode, &new);

Call the macros directly instead of assigning with variables since
there is no updates on these further.

> +       if (ret) {
> +               printf("Failed to initialize SPI flash at %u:%u (error %d)\n",
> +                      bus, cs, ret);
> +               return 1;
> +       }
> +
> +       env_flash = dev_get_uclass_priv(new);
> +#else
>
>         if (!env_flash) {
>                 env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS,
> @@ -61,6 +78,7 @@ int saveenv(void)
>                         return 1;
>                 }
>         }
> +#endif
>
>         ret = env_export(&env_new);
>         if (ret)
> @@ -227,6 +245,22 @@ int saveenv(void)
>         char    *saved_buffer = NULL;
>         int     ret = 1;
>         env_t   env_new;
> +#ifdef CONFIG_DM_SPI_FLASH
> +       struct udevice *new;
> +       unsigned int bus = CONFIG_SF_DEFAULT_BUS;
> +       unsigned int cs = CONFIG_SF_DEFAULT_CS;
> +       unsigned int speed = CONFIG_SF_DEFAULT_SPEED;
> +       unsigned int mode = CONFIG_SF_DEFAULT_MODE;
> +
> +       ret = spi_flash_probe_bus_cs(bus, cs, speed, mode, &new);
> +       if (ret) {
> +               printf("Failed to initialize SPI flash at %u:%u (error %d)\n",
> +                      bus, cs, ret);
> +               return 1;
> +       }
> +
> +       env_flash = dev_get_uclass_priv(new);
> +#else
>
>         if (!env_flash) {
>                 env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS,
> @@ -237,6 +271,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) {
> --
> 2.1.0.27.g96db324
>

-- 
Jagan.