sf: Add S25FL128S_256K IDs

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

diff --git a/common/env_onenand.c b/common/env_onenand.c
index 6fd5613eebef0dfa1a607f16848fabe92ead28af..4b4463218092fc48e29c5dce2dd67fb1c90d216a 100644 (file)
--- a/common/env_onenand.c
+++ b/common/env_onenand.c
@@ -5,23 +5,7 @@
  * (C) Copyright 2005-2009 Samsung Electronics
  * Kyungmin Park <kyungmin.park@samsung.com>
  *
- * 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>
@@ -42,8 +26,6 @@ char *env_name_spec = "OneNAND";
 #define ONENAND_MAX_ENV_SIZE   CONFIG_ENV_SIZE
 #define ONENAND_ENV_SIZE(mtd)  (ONENAND_MAX_ENV_SIZE - ENV_HEADER_SIZE)
 
-static char env_buf[CONFIG_ENV_SIZE];
-
 DECLARE_GLOBAL_DATA_PTR;
 
 void env_relocate_spec(void)
@@ -58,7 +40,8 @@ void env_relocate_spec(void)
        char *buf = (char *)&environment;
 #else
        loff_t env_addr = CONFIG_ENV_ADDR;
-       char *buf = env_buf;
+       char onenand_env[ONENAND_MAX_ENV_SIZE];
+       char *buf = (char *)&onenand_env[0];
 #endif /* ENV_IS_EMBEDDED */
 
 #ifndef ENV_IS_EMBEDDED
@@ -69,7 +52,7 @@ void env_relocate_spec(void)
        /* Check OneNAND exist */
        if (mtd->writesize)
                /* Ignore read fail */
-               mtd->read(mtd, env_addr, ONENAND_MAX_ENV_SIZE,
+               mtd_read(mtd, env_addr, ONENAND_MAX_ENV_SIZE,
                                &retlen, (u_char *)buf);
        else
                mtd->writesize = MAX_ONENAND_PAGESIZE;
@@ -82,7 +65,7 @@ void env_relocate_spec(void)
 
 int saveenv(void)
 {
-       env_t   *env_new = env_buf;
+       env_t   env_new;
        ssize_t len;
        char    *res;
        struct mtd_info *mtd = &onenand_mtd;
@@ -95,13 +78,13 @@ int saveenv(void)
                .callback       = NULL,
        };
 
-       res = (char *)env_new->data;
+       res = (char *)&env_new.data;
        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.crc = crc32(0, env_new.data, ENV_SIZE);
 
        instr.len = CONFIG_ENV_SIZE;
 #ifdef CONFIG_ENV_ADDR_FLEX
@@ -114,13 +97,13 @@ int saveenv(void)
 #endif
        instr.addr = env_addr;
        instr.mtd = mtd;
-       if (mtd->erase(mtd, &instr)) {
+       if (mtd_erase(mtd, &instr)) {
                printf("OneNAND: erase failed at 0x%08llx\n", env_addr);
                return 1;
        }
 
-       if (mtd->write(mtd, env_addr, ONENAND_MAX_ENV_SIZE, &retlen,
-                       (u_char *)env_new)) {
+       if (mtd_write(mtd, env_addr, ONENAND_MAX_ENV_SIZE, &retlen,
+                       (u_char *)&env_new)) {
                printf("OneNAND: write failed at 0x%llx\n", instr.addr);
                return 2;
        }