X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=common%2Fenv_onenand.c;h=4b4463218092fc48e29c5dce2dd67fb1c90d216a;hb=1ecab0f30f9051821fdb5ec1c689b7c531b4feda;hp=d5c907c6f0aa303065e5a4a695878f4e1d026917;hpb=ce0eb70333331da6942167c41e6841c8c7994a33;p=karo-tx-uboot.git diff --git a/common/env_onenand.c b/common/env_onenand.c index d5c907c6f0..4b44632180 100644 --- a/common/env_onenand.c +++ b/common/env_onenand.c @@ -1,117 +1,110 @@ /* - * (C) Copyright 2005-2007 Samsung Electronics - * Kyungmin Park - * - * See file CREDITS for list of people who contributed to this - * project. + * (C) Copyright 2010 DENX Software Engineering + * Wolfgang Denk * - * 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. + * (C) Copyright 2005-2009 Samsung Electronics + * Kyungmin Park * - * 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 - -#if defined(CFG_ENV_IS_IN_ONENAND) /* Environment is in OneNAND */ - #include #include #include #include +#include +#include +#include -#include +#include #include #include -extern struct mtd_info onenand_mtd; -extern struct onenand_chip onenand_chip; - -/* References to names in env_common.c */ -extern uchar default_environment[]; - -#define ONENAND_ENV_SIZE(mtd) (mtd.writesize - ENV_HEADER_SIZE) - char *env_name_spec = "OneNAND"; -#ifdef ENV_IS_EMBEDDED -extern uchar environment[]; -env_t *env_ptr = (env_t *) (&environment[0]); -#else /* ! ENV_IS_EMBEDDED */ -static unsigned char onenand_env[MAX_ONENAND_PAGESIZE]; -env_t *env_ptr = (env_t *) onenand_env; -#endif /* ENV_IS_EMBEDDED */ +#define ONENAND_MAX_ENV_SIZE CONFIG_ENV_SIZE +#define ONENAND_ENV_SIZE(mtd) (ONENAND_MAX_ENV_SIZE - ENV_HEADER_SIZE) DECLARE_GLOBAL_DATA_PTR; -uchar env_get_char_spec(int index) -{ - return (*((uchar *) (gd->env_addr + index))); -} - void env_relocate_spec(void) { - unsigned long env_addr; - int use_default = 0; + struct mtd_info *mtd = &onenand_mtd; +#ifdef CONFIG_ENV_ADDR_FLEX + struct onenand_chip *this = &onenand_chip; +#endif + int rc; size_t retlen; +#ifdef ENV_IS_EMBEDDED + char *buf = (char *)&environment; +#else + loff_t env_addr = CONFIG_ENV_ADDR; + char onenand_env[ONENAND_MAX_ENV_SIZE]; + char *buf = (char *)&onenand_env[0]; +#endif /* ENV_IS_EMBEDDED */ - env_addr = CFG_ENV_ADDR; - +#ifndef ENV_IS_EMBEDDED +# ifdef CONFIG_ENV_ADDR_FLEX + if (FLEXONENAND(this)) + env_addr = CONFIG_ENV_ADDR_FLEX; +# endif /* Check OneNAND exist */ - if (onenand_mtd.writesize) + if (mtd->writesize) /* Ignore read fail */ - onenand_read(&onenand_mtd, env_addr, onenand_mtd.writesize, - &retlen, (u_char *) env_ptr); + mtd_read(mtd, env_addr, ONENAND_MAX_ENV_SIZE, + &retlen, (u_char *)buf); else - onenand_mtd.writesize = MAX_ONENAND_PAGESIZE; - - if (crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd)) != - env_ptr->crc) - use_default = 1; + mtd->writesize = MAX_ONENAND_PAGESIZE; +#endif /* !ENV_IS_EMBEDDED */ - if (use_default) { - memcpy(env_ptr->data, default_environment, - ONENAND_ENV_SIZE(onenand_mtd)); - env_ptr->crc = - crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd)); - } - - gd->env_addr = (ulong) & env_ptr->data; - gd->env_valid = 1; + rc = env_import(buf, 1); + if (rc) + gd->env_valid = 1; } int saveenv(void) { - unsigned long env_addr = CFG_ENV_ADDR; + env_t env_new; + ssize_t len; + char *res; + struct mtd_info *mtd = &onenand_mtd; +#ifdef CONFIG_ENV_ADDR_FLEX + struct onenand_chip *this = &onenand_chip; +#endif + loff_t env_addr = CONFIG_ENV_ADDR; + size_t retlen; struct erase_info instr = { .callback = NULL, }; - size_t retlen; - instr.len = CFG_ENV_SIZE; + 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); + + instr.len = CONFIG_ENV_SIZE; +#ifdef CONFIG_ENV_ADDR_FLEX + if (FLEXONENAND(this)) { + env_addr = CONFIG_ENV_ADDR_FLEX; + instr.len = CONFIG_ENV_SIZE_FLEX; + instr.len <<= onenand_mtd.eraseregions[0].numblocks == 1 ? + 1 : 0; + } +#endif instr.addr = env_addr; - if (onenand_erase(&onenand_mtd, &instr)) { - printf("OneNAND: erase failed at 0x%08lx\n", env_addr); + instr.mtd = mtd; + if (mtd_erase(mtd, &instr)) { + printf("OneNAND: erase failed at 0x%08llx\n", env_addr); return 1; } - /* update crc */ - env_ptr->crc = - crc32(0, env_ptr->data, ONENAND_ENV_SIZE(onenand_mtd)); - - if (onenand_write(&onenand_mtd, env_addr, onenand_mtd.writesize, &retlen, - (u_char *) env_ptr)) { - printf("OneNAND: write failed at 0x%08x\n", instr.addr); + 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; } @@ -121,10 +114,8 @@ int saveenv(void) int env_init(void) { /* use default */ - gd->env_addr = (ulong) & default_environment[0]; + gd->env_addr = (ulong)&default_environment[0]; gd->env_valid = 1; return 0; } - -#endif /* CFG_ENV_IS_IN_ONENAND */