diff options
Diffstat (limited to 'common')
| -rwxr-xr-x[-rw-r--r--] | common/Makefile | 1 | ||||
| -rw-r--r-- | common/cmd_ext2.c | 64 | ||||
| -rwxr-xr-x[-rw-r--r--] | common/cmd_nvedit.c | 3 | ||||
| -rwxr-xr-x | common/env_emmc.c | 224 |
4 files changed, 291 insertions, 1 deletions
diff --git a/common/Makefile b/common/Makefile index 3781738e1..7ba449505 100644..100755 --- a/common/Makefile +++ b/common/Makefile @@ -61,6 +61,7 @@ COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o +COBJS-$(CONFIG_ENV_IS_IN_EMMC) += env_emmc.o COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o # command diff --git a/common/cmd_ext2.c b/common/cmd_ext2.c index b7e4048d6..e37b2b633 100644 --- a/common/cmd_ext2.c +++ b/common/cmd_ext2.c @@ -260,3 +260,67 @@ U_BOOT_CMD( " - load binary file 'filename' from 'dev' on 'interface'\n" " to address 'addr' from ext2 filesystem" ); + +/* + * Ext2fs part info + */ +static int do_ext2info(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + int i; + int dev=0; + int part=0; + int startpart, endpart; + char *ep; + disk_partition_t info; + block_dev_desc_t *dev_desc=NULL; + + if (argc < 3) { + cmd_usage(cmdtp); + return 1; + } + dev = (int)simple_strtoul (argv[2], &ep, 16); + dev_desc = get_dev(argv[1],dev); + + if (dev_desc == NULL) { + printf ("\n** Block device %s %d not supported\n", + argv[1], dev); + return 1; + } + + if (*ep) { + if (*ep != ':') { + puts ("\n** Invalid device, use `dev[:part]' **\n"); + return 1; + } + part = (int)simple_strtoul(++ep, NULL, 16); + } + + printf("part: name type start blocks blksize MiB\n"); + if (part == 0) { + startpart = 1; + endpart = 4; + } else { + startpart = part; + endpart = part; + } + for (i = startpart; i <= endpart; i++) { + if (get_partition_info (dev_desc, i, &info)) { + printf ("** Bad partition %d **\n", i); + return 1; + } + + printf("%3d : %s\t%s\t%lu\t%lu\t%d\t%lu\n", i, info.name, + info.type, info.start, info.size, info.blksz, + (unsigned long long) + (info.blksz * info.size) >> 20); + } + + return 0; +} + +U_BOOT_CMD( + ext2info, 3, 1, do_ext2info, + "print partition info", + "<interface> <dev[:part]>\n" + " - print partition table info\n" +); diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index eb89e9e60..6040a9996 100644..100755 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -63,9 +63,10 @@ DECLARE_GLOBAL_DATA_PTR; !defined(CONFIG_ENV_IS_IN_NVRAM) && \ !defined(CONFIG_ENV_IS_IN_ONENAND) && \ !defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \ + !defined(CONFIG_ENV_IS_IN_EMMC) && \ !defined(CONFIG_ENV_IS_NOWHERE) # error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|ONENAND|\ -SPI_FLASH|MG_DISK|NVRAM|NOWHERE} +SPI_FLASH|MG_DISK|NVRAM|EMMC|NOWHERE} #endif #define XMK_STR(x) #x diff --git a/common/env_emmc.c b/common/env_emmc.c new file mode 100755 index 000000000..c46e18aa6 --- /dev/null +++ b/common/env_emmc.c @@ -0,0 +1,224 @@ +/* + * (C) Copyright 2009 + * STEricsson, <www.stericsson.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 + */ +/* #define DEBUG */ + +#include <common.h> + +#if defined(CONFIG_ENV_IS_IN_EMMC) /* Environment is in EMMC Flash */ + +#include <command.h> +#include <environment.h> +#include <linux/stddef.h> +#include <malloc.h> +#include <asm/arch/emmc.h> + +#if defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_EMMC) +#define CMD_SAVEENV +#elif defined(CONFIG_ENV_OFFSET_REDUND) +#error Cannot use CONFIG_ENV_OFFSET_REDUND without CONFIG_CMD_ENV & CONFIG_CMD_EMMC +#endif + +#if defined(CONFIG_ENV_SIZE_REDUND) && (CONFIG_ENV_SIZE_REDUND != CONFIG_ENV_SIZE) +#error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE +#endif + +#ifdef CONFIG_INFERNO +#error CONFIG_INFERNO not supported yet +#endif + +/* references to names in env_common.c */ +extern uchar default_environment[]; +extern int default_environment_size; + +char * env_name_spec = "EMMC"; + + +#ifdef ENV_IS_EMBEDDED +extern uchar environment[]; +env_t *env_ptr = (env_t *)(&environment[0]); +#else /* ! ENV_IS_EMBEDDED */ +env_t *env_ptr = 0; +#endif /* ENV_IS_EMBEDDED */ + + +DECLARE_GLOBAL_DATA_PTR; + +uchar env_get_char_spec (int index) +{ + return ( *((uchar *)(gd->env_addr + index)) ); +} + + +/* this is called before nand_init() + * so we can't read Nand to validate env data. + * Mark it OK for now. env_relocate() in env_common.c + * will call our relocate function which will does + * the real validation. + * + * When using a eMMC boot image (like sequoia_nand), the environment + * can be embedded or attached to the U-Boot image in eMMC flash. This way + * the SPL loads not only the U-Boot image from eMMC but also the + * environment. + */ +int env_init(void) +{ +#if defined(ENV_IS_EMBEDDED) + ulong total; + int crc1_ok = 0, crc2_ok = 0; + env_t *tmp_env1, *tmp_env2; + + total = CONFIG_ENV_SIZE; + + tmp_env1 = env_ptr; + tmp_env2 = (env_t *)((ulong)env_ptr + CONFIG_ENV_SIZE); + + crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc); + crc2_ok = (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc); + + if (!crc1_ok && !crc2_ok) + gd->env_valid = 0; + else if(crc1_ok && !crc2_ok) + gd->env_valid = 1; + else if(!crc1_ok && crc2_ok) + gd->env_valid = 2; + else { + #ifdef CONFIG_REDUNDAND_ENVIRONMENT + /* both ok - check serial */ + if(tmp_env1->flags == 255 && tmp_env2->flags == 0) + gd->env_valid = 2; + else if(tmp_env2->flags == 255 && tmp_env1->flags == 0) + gd->env_valid = 1; + else if(tmp_env1->flags > tmp_env2->flags) + gd->env_valid = 1; + else if(tmp_env2->flags > tmp_env1->flags) + gd->env_valid = 2; + else /* flags are equal - almost impossible */ + #endif + gd->env_valid = 1; + } + + if (gd->env_valid == 1) + env_ptr = tmp_env1; + else if (gd->env_valid == 2) + env_ptr = tmp_env2; +#else /* ENV_IS_EMBEDDED */ + gd->env_addr = (ulong)&default_environment[0]; + gd->env_valid = 1; +#endif /* ENV_IS_EMBEDDED */ + + return (0); +} + +#ifdef CMD_SAVEENV +int saveenv(void) +{ + ulong total; + int ret = 0; + + puts ("Erasing eMMC..."); + if (emmc_erase(CONFIG_ENV_OFFSET_START, CONFIG_ENV_OFFSET_END)) + return 1; + + puts ("Writing to EMMC... "); + total = CONFIG_ENV_SIZE; + ret = emmc_write(CONFIG_ENV_OFFSET_START, (u32 *) env_ptr, + CONFIG_ENV_SIZE); + //if (ret || total != CONFIG_ENV_SIZE) + //return 1; + + puts ("done\n"); + return ret; +} +#endif /* CMD_SAVEENV */ +#ifdef CONFIG_ENV_OFFSET_REDUND +void env_relocate_spec (void) +{ +#if !defined(ENV_IS_EMBEDDED) + ulong total; + int crc1_ok = 0, crc2_ok = 0; + env_t *tmp_env1, *tmp_env2; + + total = CONFIG_ENV_SIZE; + + tmp_env1 = (env_t *) malloc(CONFIG_ENV_SIZE); + tmp_env2 = (env_t *) malloc(CONFIG_ENV_SIZE); + + emmc_read(CONFIG_ENV_OFFSET_START,(u32 *) tmp_env1, total); + emmc_read(CONFIG_ENV_OFFSET_START,(u32 *) tmp_env2, total); + + crc1_ok = (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc); + crc2_ok = (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc); + + if(!crc1_ok && !crc2_ok) + return set_default_env(); + else if(crc1_ok && !crc2_ok) + gd->env_valid = 1; + else if(!crc1_ok && crc2_ok) + gd->env_valid = 2; + else { + /* both ok - check serial */ + if(tmp_env1->flags == 255 && tmp_env2->flags == 0) + gd->env_valid = 2; + else if(tmp_env2->flags == 255 && tmp_env1->flags == 0) + gd->env_valid = 1; + else if(tmp_env1->flags > tmp_env2->flags) + gd->env_valid = 1; + else if(tmp_env2->flags > tmp_env1->flags) + gd->env_valid = 2; + else /* flags are equal - almost impossible */ + gd->env_valid = 1; + + } + + free(env_ptr); + if(gd->env_valid == 1) { + env_ptr = tmp_env1; + free(tmp_env2); + } else { + env_ptr = tmp_env2; + free(tmp_env1); + } + +#endif /* ! ENV_IS_EMBEDDED */ +} +#else /* ! CONFIG_ENV_OFFSET_REDUND */ +void env_relocate_spec (void) +{ +#if !defined(ENV_IS_EMBEDDED) + ulong total; + int ret; + + total = CONFIG_ENV_SIZE; + printf("env_relocate_spec start\n"); + emmc_init(4); + ret = emmc_read(CONFIG_ENV_OFFSET_START, (u_char*)env_ptr, total); + if (ret || total != CONFIG_ENV_SIZE) + return set_default_env(); + + if (crc32(0, env_ptr->data, ENV_SIZE) != env_ptr->crc) + return set_default_env(); +#endif /* ! ENV_IS_EMBEDDED */ +} +#endif /* CONFIG_ENV_OFFSET_REDUND */ + +#endif /* CONFIG_ENV_IS_IN_EMMC */ |