mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-19 21:51:31 +00:00
Merge branch 'sf' of git://git.denx.de/u-boot-blackfin
This commit is contained in:
commit
f12d4cb48a
8 changed files with 276 additions and 16 deletions
232
common/env_sf.c
232
common/env_sf.c
|
@ -43,6 +43,14 @@
|
||||||
# define CONFIG_ENV_SPI_MODE SPI_MODE_3
|
# define CONFIG_ENV_SPI_MODE SPI_MODE_3
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef 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
|
||||||
|
#endif /* CONFIG_ENV_ADDR_REDUND */
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
/* references to names in env_common.c */
|
/* references to names in env_common.c */
|
||||||
|
@ -58,6 +66,229 @@ uchar env_get_char_spec(int index)
|
||||||
return *((uchar *)(gd->env_addr + index));
|
return *((uchar *)(gd->env_addr + index));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if defined(CONFIG_ENV_OFFSET_REDUND)
|
||||||
|
void swap_env(void)
|
||||||
|
{
|
||||||
|
ulong tmp_offset = env_offset;
|
||||||
|
|
||||||
|
env_offset = env_new_offset;
|
||||||
|
env_new_offset = tmp_offset;
|
||||||
|
}
|
||||||
|
|
||||||
|
int saveenv(void)
|
||||||
|
{
|
||||||
|
u32 saved_size, saved_offset;
|
||||||
|
char *saved_buffer = NULL;
|
||||||
|
u32 sector = 1;
|
||||||
|
int ret;
|
||||||
|
char flag = OBSOLETE_FLAG, new_flag = ACTIVE_FLAG;
|
||||||
|
|
||||||
|
if (!env_flash) {
|
||||||
|
puts("Environment SPI flash not initialized\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Is the sector larger than the env (i.e. embedded) */
|
||||||
|
if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) {
|
||||||
|
saved_size = CONFIG_ENV_SECT_SIZE - CONFIG_ENV_SIZE;
|
||||||
|
saved_offset = env_new_offset + CONFIG_ENV_SIZE;
|
||||||
|
saved_buffer = malloc(saved_size);
|
||||||
|
if (!saved_buffer) {
|
||||||
|
ret = 1;
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
ret = spi_flash_read(env_flash, saved_offset,
|
||||||
|
saved_size, saved_buffer);
|
||||||
|
if (ret)
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (CONFIG_ENV_SIZE > CONFIG_ENV_SECT_SIZE) {
|
||||||
|
sector = CONFIG_ENV_SIZE / CONFIG_ENV_SECT_SIZE;
|
||||||
|
if (CONFIG_ENV_SIZE % CONFIG_ENV_SECT_SIZE)
|
||||||
|
sector++;
|
||||||
|
}
|
||||||
|
|
||||||
|
puts("Erasing SPI flash...");
|
||||||
|
ret = spi_flash_erase(env_flash, env_new_offset,
|
||||||
|
sector * CONFIG_ENV_SECT_SIZE);
|
||||||
|
if (ret)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
puts("Writing to SPI flash...");
|
||||||
|
ret = spi_flash_write(env_flash,
|
||||||
|
env_new_offset + offsetof(env_t, data),
|
||||||
|
sizeof(env_ptr->data), env_ptr->data);
|
||||||
|
if (ret)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
ret = spi_flash_write(env_flash,
|
||||||
|
env_new_offset + offsetof(env_t, crc),
|
||||||
|
sizeof(env_ptr->crc), &env_ptr->crc);
|
||||||
|
if (ret)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
ret = spi_flash_write(env_flash,
|
||||||
|
env_offset + offsetof(env_t, flags),
|
||||||
|
sizeof(env_ptr->flags), &flag);
|
||||||
|
if (ret)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
ret = spi_flash_write(env_flash,
|
||||||
|
env_new_offset + offsetof(env_t, flags),
|
||||||
|
sizeof(env_ptr->flags), &new_flag);
|
||||||
|
if (ret)
|
||||||
|
goto done;
|
||||||
|
|
||||||
|
if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) {
|
||||||
|
ret = spi_flash_write(env_flash, saved_offset,
|
||||||
|
saved_size, saved_buffer);
|
||||||
|
if (ret)
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
|
swap_env();
|
||||||
|
|
||||||
|
ret = 0;
|
||||||
|
puts("done\n");
|
||||||
|
|
||||||
|
done:
|
||||||
|
if (saved_buffer)
|
||||||
|
free(saved_buffer);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
void env_relocate_spec(void)
|
||||||
|
{
|
||||||
|
int ret;
|
||||||
|
int crc1_ok = 0, crc2_ok = 0;
|
||||||
|
env_t *tmp_env1 = NULL;
|
||||||
|
env_t *tmp_env2 = NULL;
|
||||||
|
uchar flag1, flag2;
|
||||||
|
/* current_env is set only in case both areas are valid! */
|
||||||
|
int current_env = 0;
|
||||||
|
|
||||||
|
tmp_env1 = (env_t *)malloc(CONFIG_ENV_SIZE);
|
||||||
|
if (!tmp_env1) {
|
||||||
|
puts("*** Warning: could not init environment,"
|
||||||
|
" using defaults\n\n");
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
tmp_env2 = (env_t *)malloc(CONFIG_ENV_SIZE);
|
||||||
|
if (!tmp_env2) {
|
||||||
|
puts("*** Warning: could not init environment,"
|
||||||
|
" using defaults\n\n");
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
|
env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
|
||||||
|
CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
|
||||||
|
if (!env_flash)
|
||||||
|
goto err_probe;
|
||||||
|
|
||||||
|
ret = spi_flash_read(env_flash, CONFIG_ENV_OFFSET,
|
||||||
|
CONFIG_ENV_SIZE, tmp_env1);
|
||||||
|
if (ret)
|
||||||
|
goto err_read;
|
||||||
|
|
||||||
|
if (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc)
|
||||||
|
crc1_ok = 1;
|
||||||
|
flag1 = tmp_env1->flags;
|
||||||
|
|
||||||
|
ret = spi_flash_read(env_flash, CONFIG_ENV_OFFSET_REDUND,
|
||||||
|
CONFIG_ENV_SIZE, tmp_env2);
|
||||||
|
if (!ret) {
|
||||||
|
if (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc)
|
||||||
|
crc2_ok = 1;
|
||||||
|
flag2 = tmp_env2->flags;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!crc1_ok && !crc2_ok)
|
||||||
|
goto err_crc;
|
||||||
|
else if (crc1_ok && !crc2_ok) {
|
||||||
|
gd->env_valid = 1;
|
||||||
|
memcpy(env_ptr, tmp_env1, CONFIG_ENV_SIZE);
|
||||||
|
} else if (!crc1_ok && crc2_ok) {
|
||||||
|
gd->env_valid = 1;
|
||||||
|
memcpy(env_ptr, tmp_env2, CONFIG_ENV_SIZE);
|
||||||
|
swap_env();
|
||||||
|
} else if (flag1 == ACTIVE_FLAG && flag2 == OBSOLETE_FLAG) {
|
||||||
|
gd->env_valid = 1;
|
||||||
|
memcpy(env_ptr, tmp_env1, CONFIG_ENV_SIZE);
|
||||||
|
} else if (flag1 == OBSOLETE_FLAG && flag2 == ACTIVE_FLAG) {
|
||||||
|
gd->env_valid = 1;
|
||||||
|
memcpy(env_ptr, tmp_env2, CONFIG_ENV_SIZE);
|
||||||
|
swap_env();
|
||||||
|
} else if (flag1 == flag2) {
|
||||||
|
gd->env_valid = 2;
|
||||||
|
memcpy(env_ptr, tmp_env1, CONFIG_ENV_SIZE);
|
||||||
|
current_env = 1;
|
||||||
|
} else if (flag1 == 0xFF) {
|
||||||
|
gd->env_valid = 2;
|
||||||
|
memcpy(env_ptr, tmp_env1, CONFIG_ENV_SIZE);
|
||||||
|
current_env = 1;
|
||||||
|
} else {
|
||||||
|
/*
|
||||||
|
* this differs from code in env_flash.c, but I think a sane
|
||||||
|
* default path is desirable.
|
||||||
|
*/
|
||||||
|
gd->env_valid = 2;
|
||||||
|
memcpy(env_ptr, tmp_env2, CONFIG_ENV_SIZE);
|
||||||
|
swap_env();
|
||||||
|
current_env = 2;
|
||||||
|
}
|
||||||
|
if (current_env == 1) {
|
||||||
|
if (flag2 != OBSOLETE_FLAG) {
|
||||||
|
flag2 = OBSOLETE_FLAG;
|
||||||
|
spi_flash_write(env_flash,
|
||||||
|
env_new_offset + offsetof(env_t, flags),
|
||||||
|
sizeof(env_ptr->flags), &flag2);
|
||||||
|
}
|
||||||
|
if (flag1 != ACTIVE_FLAG) {
|
||||||
|
flag1 = ACTIVE_FLAG;
|
||||||
|
spi_flash_write(env_flash,
|
||||||
|
env_offset + offsetof(env_t, flags),
|
||||||
|
sizeof(env_ptr->flags), &flag1);
|
||||||
|
}
|
||||||
|
} else if (current_env == 2) {
|
||||||
|
if (flag1 != OBSOLETE_FLAG) {
|
||||||
|
flag1 = OBSOLETE_FLAG;
|
||||||
|
spi_flash_write(env_flash,
|
||||||
|
env_new_offset + offsetof(env_t, flags),
|
||||||
|
sizeof(env_ptr->flags), &flag1);
|
||||||
|
}
|
||||||
|
if (flag2 != ACTIVE_FLAG) {
|
||||||
|
flag2 = ACTIVE_FLAG;
|
||||||
|
spi_flash_write(env_flash,
|
||||||
|
env_offset + offsetof(env_t, flags),
|
||||||
|
sizeof(env_ptr->flags), &flag2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (gd->env_valid == 2) {
|
||||||
|
puts("*** Warning - some problems detected "
|
||||||
|
"reading environment; recovered successfully\n\n");
|
||||||
|
}
|
||||||
|
if (tmp_env1)
|
||||||
|
free(tmp_env1);
|
||||||
|
if (tmp_env2)
|
||||||
|
free(tmp_env2);
|
||||||
|
return;
|
||||||
|
|
||||||
|
err_read:
|
||||||
|
spi_flash_free(env_flash);
|
||||||
|
env_flash = NULL;
|
||||||
|
err_probe:
|
||||||
|
err_crc:
|
||||||
|
puts("*** Warning - bad CRC, using default environment\n\n");
|
||||||
|
out:
|
||||||
|
if (tmp_env1)
|
||||||
|
free(tmp_env1);
|
||||||
|
if (tmp_env2)
|
||||||
|
free(tmp_env2);
|
||||||
|
set_default_env();
|
||||||
|
}
|
||||||
|
#else
|
||||||
int saveenv(void)
|
int saveenv(void)
|
||||||
{
|
{
|
||||||
u32 saved_size, saved_offset;
|
u32 saved_size, saved_offset;
|
||||||
|
@ -144,6 +375,7 @@ err_crc:
|
||||||
|
|
||||||
set_default_env();
|
set_default_env();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
int env_init(void)
|
int env_init(void)
|
||||||
{
|
{
|
||||||
|
|
|
@ -467,7 +467,7 @@ out:
|
||||||
struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode)
|
struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode)
|
||||||
{
|
{
|
||||||
const struct atmel_spi_flash_params *params;
|
const struct atmel_spi_flash_params *params;
|
||||||
unsigned long page_size;
|
unsigned page_size;
|
||||||
unsigned int family;
|
unsigned int family;
|
||||||
struct atmel_spi_flash *asf;
|
struct atmel_spi_flash *asf;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
@ -540,8 +540,9 @@ struct spi_flash *spi_flash_probe_atmel(struct spi_slave *spi, u8 *idcode)
|
||||||
* params->blocks_per_sector
|
* params->blocks_per_sector
|
||||||
* params->nr_sectors;
|
* params->nr_sectors;
|
||||||
|
|
||||||
debug("SF: Detected %s with page size %lu, total %u bytes\n",
|
printf("SF: Detected %s with page size %u, total ",
|
||||||
params->name, page_size, asf->flash.size);
|
params->name, page_size);
|
||||||
|
print_size(asf->flash.size, "\n");
|
||||||
|
|
||||||
return &asf->flash;
|
return &asf->flash;
|
||||||
|
|
||||||
|
|
|
@ -330,8 +330,9 @@ struct spi_flash *spi_flash_probe_macronix(struct spi_slave *spi, u8 *idcode)
|
||||||
mcx->flash.size = params->page_size * params->pages_per_sector
|
mcx->flash.size = params->page_size * params->pages_per_sector
|
||||||
* params->sectors_per_block * params->nr_blocks;
|
* params->sectors_per_block * params->nr_blocks;
|
||||||
|
|
||||||
printf("SF: Detected %s with page size %u, total %u bytes\n",
|
printf("SF: Detected %s with page size %u, total ",
|
||||||
params->name, params->page_size, mcx->flash.size);
|
params->name, params->page_size);
|
||||||
|
print_size(mcx->flash.size, "\n");
|
||||||
|
|
||||||
return &mcx->flash;
|
return &mcx->flash;
|
||||||
}
|
}
|
||||||
|
|
|
@ -343,8 +343,9 @@ struct spi_flash *spi_flash_probe_spansion(struct spi_slave *spi, u8 *idcode)
|
||||||
spsn->flash.size = params->page_size * params->pages_per_sector
|
spsn->flash.size = params->page_size * params->pages_per_sector
|
||||||
* params->nr_sectors;
|
* params->nr_sectors;
|
||||||
|
|
||||||
debug("SF: Detected %s with page size %u, total %u bytes\n",
|
printf("SF: Detected %s with page size %u, total ",
|
||||||
params->name, params->page_size, spsn->flash.size);
|
params->name, params->page_size);
|
||||||
|
print_size(spsn->flash.size, "\n");
|
||||||
|
|
||||||
return &spsn->flash;
|
return &spsn->flash;
|
||||||
}
|
}
|
||||||
|
|
|
@ -106,7 +106,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
|
||||||
|
|
||||||
spi = spi_setup_slave(bus, cs, max_hz, spi_mode);
|
spi = spi_setup_slave(bus, cs, max_hz, spi_mode);
|
||||||
if (!spi) {
|
if (!spi) {
|
||||||
debug("SF: Failed to set up slave\n");
|
printf("SF: Failed to set up slave\n");
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -147,6 +147,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_SPI_FLASH_STMICRO
|
#ifdef CONFIG_SPI_FLASH_STMICRO
|
||||||
case 0x20:
|
case 0x20:
|
||||||
|
case 0xff: /* Let the stmicro func handle non-JEDEC ids */
|
||||||
flash = spi_flash_probe_stmicro(spi, idcode);
|
flash = spi_flash_probe_stmicro(spi, idcode);
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
|
@ -156,7 +157,7 @@ struct spi_flash *spi_flash_probe(unsigned int bus, unsigned int cs,
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
default:
|
default:
|
||||||
debug("SF: Unsupported manufacturer %02X\n", idcode[0]);
|
printf("SF: Unsupported manufacturer %02X\n", idcode[0]);
|
||||||
flash = NULL;
|
flash = NULL;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -364,8 +364,9 @@ spi_flash_probe_sst(struct spi_slave *spi, u8 *idcode)
|
||||||
stm->flash.read = sst_read_fast;
|
stm->flash.read = sst_read_fast;
|
||||||
stm->flash.size = SST_SECTOR_SIZE * params->nr_sectors;
|
stm->flash.size = SST_SECTOR_SIZE * params->nr_sectors;
|
||||||
|
|
||||||
debug("SF: Detected %s with page size %u, total %u bytes\n",
|
printf("SF: Detected %s with page size %u, total ",
|
||||||
params->name, SST_SECTOR_SIZE, stm->flash.size);
|
params->name, SST_SECTOR_SIZE);
|
||||||
|
print_size(stm->flash.size, "\n");
|
||||||
|
|
||||||
/* Flash powers up read-only, so clear BP# bits */
|
/* Flash powers up read-only, so clear BP# bits */
|
||||||
sst_unlock(&stm->flash);
|
sst_unlock(&stm->flash);
|
||||||
|
|
|
@ -46,6 +46,7 @@
|
||||||
#define CMD_M25PXX_DP 0xb9 /* Deep Power-down */
|
#define CMD_M25PXX_DP 0xb9 /* Deep Power-down */
|
||||||
#define CMD_M25PXX_RES 0xab /* Release from DP, and Read Signature */
|
#define CMD_M25PXX_RES 0xab /* Release from DP, and Read Signature */
|
||||||
|
|
||||||
|
#define STM_ID_M25P10 0x11
|
||||||
#define STM_ID_M25P16 0x15
|
#define STM_ID_M25P16 0x15
|
||||||
#define STM_ID_M25P20 0x12
|
#define STM_ID_M25P20 0x12
|
||||||
#define STM_ID_M25P32 0x16
|
#define STM_ID_M25P32 0x16
|
||||||
|
@ -77,6 +78,13 @@ static inline struct stmicro_spi_flash *to_stmicro_spi_flash(struct spi_flash
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct stmicro_spi_flash_params stmicro_spi_flash_table[] = {
|
static const struct stmicro_spi_flash_params stmicro_spi_flash_table[] = {
|
||||||
|
{
|
||||||
|
.idcode1 = STM_ID_M25P10,
|
||||||
|
.page_size = 256,
|
||||||
|
.pages_per_sector = 128,
|
||||||
|
.nr_sectors = 4,
|
||||||
|
.name = "M25P10",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
.idcode1 = STM_ID_M25P16,
|
.idcode1 = STM_ID_M25P16,
|
||||||
.page_size = 256,
|
.page_size = 256,
|
||||||
|
@ -316,6 +324,19 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode)
|
||||||
struct stmicro_spi_flash *stm;
|
struct stmicro_spi_flash *stm;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
|
if (idcode[0] == 0xff) {
|
||||||
|
i = spi_flash_cmd(spi, CMD_M25PXX_RES,
|
||||||
|
idcode, 4);
|
||||||
|
if (i)
|
||||||
|
return NULL;
|
||||||
|
if ((idcode[3] & 0xf0) == 0x10) {
|
||||||
|
idcode[0] = 0x20;
|
||||||
|
idcode[1] = 0x20;
|
||||||
|
idcode[2] = idcode[3] + 1;
|
||||||
|
} else
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(stmicro_spi_flash_table); i++) {
|
for (i = 0; i < ARRAY_SIZE(stmicro_spi_flash_table); i++) {
|
||||||
params = &stmicro_spi_flash_table[i];
|
params = &stmicro_spi_flash_table[i];
|
||||||
if (params->idcode1 == idcode[2]) {
|
if (params->idcode1 == idcode[2]) {
|
||||||
|
@ -344,8 +365,9 @@ struct spi_flash *spi_flash_probe_stmicro(struct spi_slave *spi, u8 * idcode)
|
||||||
stm->flash.size = params->page_size * params->pages_per_sector
|
stm->flash.size = params->page_size * params->pages_per_sector
|
||||||
* params->nr_sectors;
|
* params->nr_sectors;
|
||||||
|
|
||||||
debug("SF: Detected %s with page size %u, total %u bytes\n",
|
printf("SF: Detected %s with page size %u, total ",
|
||||||
params->name, params->page_size, stm->flash.size);
|
params->name, params->page_size);
|
||||||
|
print_size(stm->flash.size, "\n");
|
||||||
|
|
||||||
return &stm->flash;
|
return &stm->flash;
|
||||||
}
|
}
|
||||||
|
|
|
@ -289,7 +289,7 @@ out:
|
||||||
struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode)
|
struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode)
|
||||||
{
|
{
|
||||||
const struct winbond_spi_flash_params *params;
|
const struct winbond_spi_flash_params *params;
|
||||||
unsigned long page_size;
|
unsigned page_size;
|
||||||
struct winbond_spi_flash *stm;
|
struct winbond_spi_flash *stm;
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
|
@ -325,8 +325,9 @@ struct spi_flash *spi_flash_probe_winbond(struct spi_slave *spi, u8 *idcode)
|
||||||
* params->sectors_per_block
|
* params->sectors_per_block
|
||||||
* params->nr_blocks;
|
* params->nr_blocks;
|
||||||
|
|
||||||
debug("SF: Detected %s with page size %u, total %u bytes\n",
|
printf("SF: Detected %s with page size %u, total ",
|
||||||
params->name, page_size, stm->flash.size);
|
params->name, page_size);
|
||||||
|
print_size(stm->flash.size, "\n");
|
||||||
|
|
||||||
return &stm->flash;
|
return &stm->flash;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue