From: Vagrant Cascadian Date: Tue, 7 Apr 2015 20:42:30 +0000 (+0000) Subject: spl-sata-support X-Git-Tag: archive/raspbian/2016.11+dfsg1-3+rpi1~1^2^2~25 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=55117fc265d2f165f276b8cadc99752dc4986c72;p=u-boot.git spl-sata-support Gbp-Pq: Topic cubox-i Gbp-Pq: Name spl-sata-support.diff --- diff --git a/common/Makefile b/common/Makefile index b19d3793b..7bdd8b315 100644 --- a/common/Makefile +++ b/common/Makefile @@ -60,6 +60,8 @@ obj-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o obj-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o obj-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o +obj-$(CONFIG_ENV_IS_IN_SATA) += env_sata.o +obj-$(CONFIG_ENV_IS_IN_BOOT_DEVICE) += env_bootdevice.o obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o obj-$(CONFIG_ENV_IS_IN_REMOTE) += env_remote.o obj-$(CONFIG_ENV_IS_IN_UBI) += env_ubi.o diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 855808c3e..5f56acb2a 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -49,6 +49,8 @@ DECLARE_GLOBAL_DATA_PTR; !defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \ !defined(CONFIG_ENV_IS_IN_REMOTE) && \ !defined(CONFIG_ENV_IS_IN_UBI) && \ + !defined(CONFIG_ENV_IS_IN_SATA) && \ + !defined(CONFIG_ENV_IS_IN_BOOT_DEVICE) && \ !defined(CONFIG_ENV_IS_NOWHERE) # error Define one of CONFIG_ENV_IS_IN_{EEPROM|FLASH|DATAFLASH|ONENAND|\ SPI_FLASH|NVRAM|MMC|FAT|REMOTE|UBI} or CONFIG_ENV_IS_NOWHERE diff --git a/common/cmd_sata.c b/common/cmd_sata.c index fc9213196..b729b8852 100644 --- a/common/cmd_sata.c +++ b/common/cmd_sata.c @@ -15,7 +15,7 @@ #include #include -static int sata_curr_device = -1; +int sata_curr_device = -1; block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE]; int __sata_initialize(void) diff --git a/common/env_sata.c b/common/env_sata.c new file mode 100644 index 000000000..31c479dfa --- /dev/null +++ b/common/env_sata.c @@ -0,0 +1,170 @@ +/* + * (C) Copyright 2010-2011 Freescale Semiconductor, Inc. + * + * 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 + +#include +#include +#include +#include +#include +#include + +#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 + +char *env_name_spec = "SATA"; + +#ifdef ENV_IS_EMBEDDED +env_t *env_ptr = &environment; +#else /* ! ENV_IS_EMBEDDED */ +env_t *env_ptr; +#endif /* ENV_IS_EMBEDDED */ + +extern int sata_curr_device; + +#if !defined(CONFIG_ENV_OFFSET) +#define CONFIG_ENV_OFFSET 0 +#endif + +DECLARE_GLOBAL_DATA_PTR; + +int env_init(void) +{ + /* use default */ + gd->env_addr = (ulong)&default_environment[0]; + gd->env_valid = 1; + + return 0; +} + + +inline int write_env(block_dev_desc_t *sata, unsigned long size, + unsigned long offset, const void *buffer) +{ + uint blk_start, blk_cnt, n; + + blk_start = ALIGN(offset, sata->blksz) / sata->blksz; + blk_cnt = ALIGN(size, sata->blksz) / sata->blksz; + + n = sata->block_write(sata_curr_device, blk_start, + blk_cnt, (u_char *)buffer); + + return (n == blk_cnt) ? 0 : -1; +} + +int saveenv(void) +{ + ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1); + ssize_t len; + char *res; + struct block_dev_desc_t *sata = NULL; + + if (sata_curr_device == -1) { + if (sata_initialize()) + return 1; + sata_curr_device = CONFIG_SATA_ENV_DEV; + } + + if (sata_curr_device >= CONFIG_SYS_SATA_MAX_DEVICE) { + printf("Unknown SATA(%d) device for environment!\n", + sata_curr_device); + return 1; + } + 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[0], ENV_SIZE); + + sata = sata_get_dev(sata_curr_device); + + printf("Writing to SATA(%d)... ", sata_curr_device); + if (write_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, (u_char *)env_new)) { + puts("failed\n"); + return 1; + } + + puts("done\n"); + + return 0; +} + + +inline int read_env(block_dev_desc_t *sata, unsigned long size, + unsigned long offset, const void *buffer) +{ + uint blk_start, blk_cnt, n; + + blk_start = ALIGN(offset, sata->blksz) / sata->blksz; + blk_cnt = ALIGN(size, sata->blksz) / sata->blksz; + + n = sata->block_read(sata_curr_device, blk_start, + blk_cnt, (uchar *)buffer); + + return (n == blk_cnt) ? 0 : -1; +} + +void env_relocate_spec(void) +{ +#if !defined(ENV_IS_EMBEDDED) + ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE); + struct block_dev_desc_t *sata = NULL; + int ret = 0; + + if (sata_curr_device == -1) { + if (sata_initialize()) + return 1; + sata_curr_device = CONFIG_SATA_ENV_DEV; + } + + if (sata_curr_device >= CONFIG_SYS_SATA_MAX_DEVICE) { + printf("Unknown SATA(%d) device for environment!\n", + sata_curr_device); + return 1; + } + sata = sata_get_dev(sata_curr_device); + + if (read_env(sata, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, buf)){ + printf( "\r\n--->Read environment failed \r\n"); + ret = 1; + goto err; + } + + gd->env_valid = 1; + env_import(buf, 1); + ret = 0; +err: + if (ret) + set_default_env(NULL); +#endif +} + + +