karo: tx6: factor out PMIC initialization

[karo-tx-uboot.git] / common / env_sf.c

diff --git a/common/env_sf.c b/common/env_sf.c
index a1ff297ba7e2568b795af35ce6cd653468cf79f3..e3e1897ccb95cf1501e353dc846a938b84dc4939 100644 (file)
--- a/common/env_sf.c
+++ b/common/env_sf.c
@@ -7,23 +7,7 @@
  *
  * (C) Copyright 2008 Atmel Corporation
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+ 
  */
 #include <common.h>
 #include <environment.h>
@@ -36,7 +20,7 @@
 # define CONFIG_ENV_SPI_BUS    0
 #endif
 #ifndef CONFIG_ENV_SPI_CS
-# define CONFIG_ENV_SPI_CS             0
+# define CONFIG_ENV_SPI_CS     0
 #endif
 #ifndef CONFIG_ENV_SPI_MAX_HZ
 # define CONFIG_ENV_SPI_MAX_HZ 1000000
@@ -46,39 +30,27 @@
 #endif
 
 #ifdef CONFIG_ENV_OFFSET_REDUND
-static ulong env_offset = CONFIG_ENV_OFFSET;
-static ulong env_new_offset = CONFIG_ENV_OFFSET_REDUND;
+static ulong env_offset                = CONFIG_ENV_OFFSET;
+static ulong env_new_offset    = CONFIG_ENV_OFFSET_REDUND;
 
-#define ACTIVE_FLAG   1
-#define OBSOLETE_FLAG 0
+#define ACTIVE_FLAG    1
+#define OBSOLETE_FLAG  0
 #endif /* CONFIG_ENV_OFFSET_REDUND */
 
 DECLARE_GLOBAL_DATA_PTR;
 
-/* references to names in env_common.c */
-extern uchar default_environment[];
-
-char * env_name_spec = "SPI Flash";
+char *env_name_spec = "SPI Flash";
 
 static struct spi_flash *env_flash;
 
-uchar env_get_char_spec(int index)
-{
-       return *((uchar *)(gd->env_addr + index));
-}
-
 #if defined(CONFIG_ENV_OFFSET_REDUND)
-
 int saveenv(void)
 {
        env_t   env_new;
        ssize_t len;
-       char    *res;
-       u32     saved_size, saved_offset;
-       char    *saved_buffer = NULL;
-       u32     sector = 1;
+       char    *res, *saved_buffer = NULL, flag = OBSOLETE_FLAG;
+       u32     saved_size, saved_offset, sector = 1;
        int     ret;
-       char    flag = OBSOLETE_FLAG;
 
        if (!env_flash) {
                env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS,
@@ -91,13 +63,13 @@ int saveenv(void)
        }
 
        res = (char *)&env_new.data;
-       len = hexport_r(&env_htab, '\0', &res, ENV_SIZE, 0, NULL);
+       len = hexport_r(&env_htab, '\0', 0, &res, ENV_SIZE, 0, NULL);
        if (len < 0) {
                error("Cannot export environment: errno = %d\n", errno);
                return 1;
        }
-       env_new.crc   = crc32(0, env_new.data, ENV_SIZE);
-       env_new.flags = ACTIVE_FLAG;
+       env_new.crc     = crc32(0, env_new.data, ENV_SIZE);
+       env_new.flags   = ACTIVE_FLAG;
 
        if (gd->env_valid == 1) {
                env_new_offset = CONFIG_ENV_OFFSET_REDUND;
@@ -148,21 +120,21 @@ int saveenv(void)
                        goto done;
        }
 
-       ret = spi_flash_write(env_flash,
-               env_offset + offsetof(env_t, flags),
-               sizeof(env_new.flags), &flag);
+       ret = spi_flash_write(env_flash, env_offset + offsetof(env_t, flags),
+                               sizeof(env_new.flags), &flag);
        if (ret)
                goto done;
 
        puts("done\n");
 
-       gd->env_valid = (gd->env_valid == 2 ? 1 : 2);
+       gd->env_valid = gd->env_valid == 2 ? 1 : 2;
 
        printf("Valid environment: %d\n", (int)gd->env_valid);
 
  done:
        if (saved_buffer)
                free(saved_buffer);
+
        return ret;
 }
 
@@ -248,18 +220,14 @@ err_read:
 out:
        free(tmp_env1);
        free(tmp_env2);
-
-       return;
 }
 #else
 int saveenv(void)
 {
-       u32 saved_size, saved_offset;
-       char *saved_buffer = NULL;
-       u32 sector = 1;
-       int ret = 1;
+       u32     saved_size, saved_offset, sector = 1;
+       char    *res, *saved_buffer = NULL;
+       int     ret = 1;
        env_t   env_new;
-       char    *res;
        ssize_t len;
 
        if (!env_flash) {
@@ -277,9 +245,9 @@ int saveenv(void)
                saved_size = CONFIG_ENV_SECT_SIZE - CONFIG_ENV_SIZE;
                saved_offset = CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE;
                saved_buffer = malloc(saved_size);
-               if (!saved_buffer) {
+               if (!saved_buffer)
                        goto done;
-               }
+
                ret = spi_flash_read(env_flash, saved_offset,
                        saved_size, saved_buffer);
                if (ret)
@@ -293,7 +261,7 @@ int saveenv(void)
        }
 
        res = (char *)&env_new.data;
-       len = hexport_r(&env_htab, '\0', &res, ENV_SIZE, 0, NULL);
+       len = hexport_r(&env_htab, '\0', 0, &res, ENV_SIZE, 0, NULL);
        if (len < 0) {
                error("Cannot export environment: errno = %d\n", errno);
                goto done;
@@ -325,6 +293,7 @@ int saveenv(void)
  done:
        if (saved_buffer)
                free(saved_buffer);
+
        return ret;
 }
 
@@ -348,7 +317,6 @@ void env_relocate_spec(void)
        }
 
        ret = env_import(buf, 1);
-
        if (ret)
                gd->env_valid = 1;
 out: