[people/ms/u-boot.git] / common / env_sf.c

/*
 * (C) Copyright 2000-2010
 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 *
 * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
 * Andreas Heppel <aheppel@sysgo.de>
 *
 * (C) Copyright 2008 Atmel Corporation
 *
 * SPDX-License-Identifier:	GPL-2.0+
 */
#include <common.h>
#include <environment.h>
#include <malloc.h>
#include <spi_flash.h>
#include <search.h>
#include <errno.h>

#ifndef CONFIG_ENV_SPI_BUS
# define CONFIG_ENV_SPI_BUS	0
#endif
#ifndef CONFIG_ENV_SPI_CS
# define CONFIG_ENV_SPI_CS	0
#endif
#ifndef CONFIG_ENV_SPI_MAX_HZ
# define CONFIG_ENV_SPI_MAX_HZ	1000000
#endif
#ifndef CONFIG_ENV_SPI_MODE
# define CONFIG_ENV_SPI_MODE	SPI_MODE_3
#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_OFFSET_REDUND */

DECLARE_GLOBAL_DATA_PTR;

char *env_name_spec = "SPI Flash";

static struct spi_flash *env_flash;

#if defined(CONFIG_ENV_OFFSET_REDUND)
int saveenv(void)
{
	env_t	env_new;
	ssize_t	len;
	char	*res, *saved_buffer = NULL, flag = OBSOLETE_FLAG;
	u32	saved_size, saved_offset, sector = 1;
	int	ret;

	if (!env_flash) {
		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) {
			set_default_env("!spi_flash_probe() failed");
			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, ENV_SIZE);
	env_new.flags	= ACTIVE_FLAG;

	if (gd->env_valid == 1) {
		env_new_offset = CONFIG_ENV_OFFSET_REDUND;
		env_offset = CONFIG_ENV_OFFSET;
	} else {
		env_new_offset = CONFIG_ENV_OFFSET;
		env_offset = CONFIG_ENV_OFFSET_REDUND;
	}

	/* 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,
		CONFIG_ENV_SIZE, &env_new);
	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;
	}

	ret = spi_flash_write(env_flash, env_offset + offsetof(env_t, flags),
				sizeof(env_new.flags), &flag);
	if (ret)
		goto done;

	puts("done\n");

	gd->env_valid = gd->env_valid == 2 ? 1 : 2;

	printf("Valid environment: %d\n", (int)gd->env_valid);

 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;
	env_t *ep = NULL;

	tmp_env1 = (env_t *)malloc(CONFIG_ENV_SIZE);
	tmp_env2 = (env_t *)malloc(CONFIG_ENV_SIZE);

	if (!tmp_env1 || !tmp_env2) {
		set_default_env("!malloc() failed");
		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) {
		set_default_env("!spi_flash_probe() failed");
		goto out;
	}

	ret = spi_flash_read(env_flash, CONFIG_ENV_OFFSET,
				CONFIG_ENV_SIZE, tmp_env1);
	if (ret) {
		set_default_env("!spi_flash_read() failed");
		goto err_read;
	}

	if (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc)
		crc1_ok = 1;

	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;
	}

	if (!crc1_ok && !crc2_ok) {
		set_default_env("!bad CRC");
		goto err_read;
	} else if (crc1_ok && !crc2_ok) {
		gd->env_valid = 1;
	} else if (!crc1_ok && crc2_ok) {
		gd->env_valid = 2;
	} else if (tmp_env1->flags == ACTIVE_FLAG &&
		   tmp_env2->flags == OBSOLETE_FLAG) {
		gd->env_valid = 1;
	} else if (tmp_env1->flags == OBSOLETE_FLAG &&
		   tmp_env2->flags == ACTIVE_FLAG) {
		gd->env_valid = 2;
	} else if (tmp_env1->flags == tmp_env2->flags) {
		gd->env_valid = 2;
	} else if (tmp_env1->flags == 0xFF) {
		gd->env_valid = 2;
	} else {
		/*
		 * this differs from code in env_flash.c, but I think a sane
		 * default path is desirable.
		 */
		gd->env_valid = 2;
	}

	if (gd->env_valid == 1)
		ep = tmp_env1;
	else
		ep = tmp_env2;

	ret = env_import((char *)ep, 0);
	if (!ret) {
		error("Cannot import environment: errno = %d\n", errno);
		set_default_env("env_import failed");
	}

err_read:
	spi_flash_free(env_flash);
	env_flash = NULL;
out:
	free(tmp_env1);
	free(tmp_env2);
}
#else
int saveenv(void)
{
	u32	saved_size, saved_offset, sector = 1;
	char	*res, *saved_buffer = NULL;
	int	ret = 1;
	env_t	env_new;
	ssize_t	len;

	if (!env_flash) {
		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) {
			set_default_env("!spi_flash_probe() failed");
			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 = CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE;
		saved_buffer = malloc(saved_size);
		if (!saved_buffer)
			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++;
	}

	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);
		goto done;
	}
	env_new.crc = crc32(0, env_new.data, ENV_SIZE);

	puts("Erasing SPI flash...");
	ret = spi_flash_erase(env_flash, CONFIG_ENV_OFFSET,
		sector * CONFIG_ENV_SECT_SIZE);
	if (ret)
		goto done;

	puts("Writing to SPI flash...");
	ret = spi_flash_write(env_flash, CONFIG_ENV_OFFSET,
		CONFIG_ENV_SIZE, &env_new);
	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;
	}

	ret = 0;
	puts("done\n");

 done:
	if (saved_buffer)
		free(saved_buffer);

	return ret;
}

void env_relocate_spec(void)
{
	char buf[CONFIG_ENV_SIZE];
	int ret;

	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) {
		set_default_env("!spi_flash_probe() failed");
		return;
	}

	ret = spi_flash_read(env_flash,
		CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, buf);
	if (ret) {
		set_default_env("!spi_flash_read() failed");
		goto out;
	}

	ret = env_import(buf, 1);
	if (ret)
		gd->env_valid = 1;
out:
	spi_flash_free(env_flash);
	env_flash = NULL;
}
#endif

int env_init(void)
{
	/* SPI flash isn't usable before relocation */
	gd->env_addr = (ulong)&default_environment[0];
	gd->env_valid = 1;

	return 0;
}
Commit	Line	Data
8c66497e	1	/*
ea882baf	2	* (C) Copyright 2000-2010
8c66497e HS	3	* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
	4	*
	5	* (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com>
	6	* Andreas Heppel <aheppel@sysgo.de>
	7	*
	8	* (C) Copyright 2008 Atmel Corporation
	9	*
402ba1e3	10	* SPDX-License-Identifier: GPL-2.0+
8c66497e HS	11	*/
8c66497e HS	12	#include <common.h>
8c66497e	13	#include <environment.h>
5b3375ac	14	#include <malloc.h>
8c66497e	15	#include <spi_flash.h>
ea882baf WD	16	#include <search.h>
ea882baf WD	17	#include <errno.h>
8c66497e	18
0e8d1586 JCPV	19	#ifndef CONFIG_ENV_SPI_BUS
0e8d1586 JCPV	20	# define CONFIG_ENV_SPI_BUS 0
8c66497e	21	#endif
0e8d1586	22	#ifndef CONFIG_ENV_SPI_CS
eb58a7fc	23	# define CONFIG_ENV_SPI_CS 0
8c66497e	24	#endif
0e8d1586 JCPV	25	#ifndef CONFIG_ENV_SPI_MAX_HZ
0e8d1586 JCPV	26	# define CONFIG_ENV_SPI_MAX_HZ 1000000
8c66497e	27	#endif
0e8d1586 JCPV	28	#ifndef CONFIG_ENV_SPI_MODE
0e8d1586 JCPV	29	# define CONFIG_ENV_SPI_MODE SPI_MODE_3
8c66497e HS	30	#endif
8c66497e HS	31
7319bcaf	32	#ifdef CONFIG_ENV_OFFSET_REDUND
eb58a7fc IG	33	static ulong env_offset = CONFIG_ENV_OFFSET;
eb58a7fc IG	34	static ulong env_new_offset = CONFIG_ENV_OFFSET_REDUND;
7319bcaf	35
eb58a7fc IG	36	#define ACTIVE_FLAG 1
eb58a7fc IG	37	#define OBSOLETE_FLAG 0
a3110f01	38	#endif /* CONFIG_ENV_OFFSET_REDUND */
7319bcaf	39
8c66497e HS	40	DECLARE_GLOBAL_DATA_PTR;
8c66497e HS	41
eb58a7fc	42	char *env_name_spec = "SPI Flash";
8c66497e HS	43
	44	static struct spi_flash *env_flash;
	45
7319bcaf	46	#if defined(CONFIG_ENV_OFFSET_REDUND)
7319bcaf WW	47	int saveenv(void)
7319bcaf WW	48	{
cd0f4fa1	49	env_t env_new;
ea882baf	50	ssize_t len;
eb58a7fc IG	51	char res, saved_buffer = NULL, flag = OBSOLETE_FLAG;
eb58a7fc IG	52	u32 saved_size, saved_offset, sector = 1;
ea882baf	53	int ret;
7319bcaf WW	54
7319bcaf WW	55	if (!env_flash) {
a3110f01 SB	56	env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS,
	57	CONFIG_ENV_SPI_CS,
	58	CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
	59	if (!env_flash) {
	60	set_default_env("!spi_flash_probe() failed");
	61	return 1;
	62	}
7319bcaf WW	63	}
7319bcaf WW	64
cd0f4fa1	65	res = (char *)&env_new.data;
be11235a	66	len = hexport_r(&env_htab, '\0', 0, &res, ENV_SIZE, 0, NULL);
ea882baf WD	67	if (len < 0) {
	68	error("Cannot export environment: errno = %d\n", errno);
	69	return 1;
	70	}
cd0f4fa1 TR	71	env_new.crc = crc32(0, env_new.data, ENV_SIZE);
cd0f4fa1 TR	72	env_new.flags = ACTIVE_FLAG;
ea882baf	73
a3110f01 SB	74	if (gd->env_valid == 1) {
	75	env_new_offset = CONFIG_ENV_OFFSET_REDUND;
	76	env_offset = CONFIG_ENV_OFFSET;
	77	} else {
	78	env_new_offset = CONFIG_ENV_OFFSET;
	79	env_offset = CONFIG_ENV_OFFSET_REDUND;
	80	}
	81
7319bcaf WW	82	/* Is the sector larger than the env (i.e. embedded) */
	83	if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) {
	84	saved_size = CONFIG_ENV_SECT_SIZE - CONFIG_ENV_SIZE;
	85	saved_offset = env_new_offset + CONFIG_ENV_SIZE;
	86	saved_buffer = malloc(saved_size);
	87	if (!saved_buffer) {
	88	ret = 1;
	89	goto done;
	90	}
	91	ret = spi_flash_read(env_flash, saved_offset,
	92	saved_size, saved_buffer);
	93	if (ret)
	94	goto done;
	95	}
	96
	97	if (CONFIG_ENV_SIZE > CONFIG_ENV_SECT_SIZE) {
	98	sector = CONFIG_ENV_SIZE / CONFIG_ENV_SECT_SIZE;
	99	if (CONFIG_ENV_SIZE % CONFIG_ENV_SECT_SIZE)
	100	sector++;
	101	}
	102
	103	puts("Erasing SPI flash...");
	104	ret = spi_flash_erase(env_flash, env_new_offset,
	105	sector * CONFIG_ENV_SECT_SIZE);
	106	if (ret)
	107	goto done;
	108
	109	puts("Writing to SPI flash...");
7319bcaf	110
a3110f01	111	ret = spi_flash_write(env_flash, env_new_offset,
cd0f4fa1	112	CONFIG_ENV_SIZE, &env_new);
7319bcaf WW	113	if (ret)
	114	goto done;
	115
	116	if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) {
	117	ret = spi_flash_write(env_flash, saved_offset,
	118	saved_size, saved_buffer);
	119	if (ret)
	120	goto done;
	121	}
	122
eb58a7fc	123	ret = spi_flash_write(env_flash, env_offset + offsetof(env_t, flags),
cd0f4fa1	124	sizeof(env_new.flags), &flag);
a3110f01 SB	125	if (ret)
a3110f01 SB	126	goto done;
7319bcaf	127
7319bcaf WW	128	puts("done\n");
7319bcaf WW	129
eb58a7fc	130	gd->env_valid = gd->env_valid == 2 ? 1 : 2;
a3110f01	131
2dc55d9e	132	printf("Valid environment: %d\n", (int)gd->env_valid);
a3110f01	133
7319bcaf WW	134	done:
	135	if (saved_buffer)
	136	free(saved_buffer);
eb58a7fc	137
7319bcaf WW	138	return ret;
	139	}
	140
	141	void env_relocate_spec(void)
	142	{
	143	int ret;
	144	int crc1_ok = 0, crc2_ok = 0;
	145	env_t *tmp_env1 = NULL;
	146	env_t *tmp_env2 = NULL;
a3110f01	147	env_t *ep = NULL;
7319bcaf WW	148
7319bcaf WW	149	tmp_env1 = (env_t *)malloc(CONFIG_ENV_SIZE);
7319bcaf	150	tmp_env2 = (env_t *)malloc(CONFIG_ENV_SIZE);
ea882baf WD	151
ea882baf WD	152	if (!tmp_env1 \|\| !tmp_env2) {
ea882baf	153	set_default_env("!malloc() failed");
2dc55d9e	154	goto out;
7319bcaf WW	155	}
	156
	157	env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
	158	CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
ea882baf WD	159	if (!env_flash) {
ea882baf WD	160	set_default_env("!spi_flash_probe() failed");
2dc55d9e	161	goto out;
ea882baf	162	}
7319bcaf WW	163
	164	ret = spi_flash_read(env_flash, CONFIG_ENV_OFFSET,
	165	CONFIG_ENV_SIZE, tmp_env1);
ea882baf WD	166	if (ret) {
ea882baf WD	167	set_default_env("!spi_flash_read() failed");
7319bcaf	168	goto err_read;
ea882baf	169	}
7319bcaf WW	170
	171	if (crc32(0, tmp_env1->data, ENV_SIZE) == tmp_env1->crc)
	172	crc1_ok = 1;
7319bcaf WW	173
	174	ret = spi_flash_read(env_flash, CONFIG_ENV_OFFSET_REDUND,
	175	CONFIG_ENV_SIZE, tmp_env2);
	176	if (!ret) {
	177	if (crc32(0, tmp_env2->data, ENV_SIZE) == tmp_env2->crc)
	178	crc2_ok = 1;
7319bcaf WW	179	}
7319bcaf WW	180
a3110f01	181	if (!crc1_ok && !crc2_ok) {
a3110f01	182	set_default_env("!bad CRC");
2dc55d9e	183	goto err_read;
a3110f01	184	} else if (crc1_ok && !crc2_ok) {
7319bcaf	185	gd->env_valid = 1;
7319bcaf	186	} else if (!crc1_ok && crc2_ok) {
2dc55d9e	187	gd->env_valid = 2;
	188	} else if (tmp_env1->flags == ACTIVE_FLAG &&
	189	tmp_env2->flags == OBSOLETE_FLAG) {
7319bcaf	190	gd->env_valid = 1;
2dc55d9e	191	} else if (tmp_env1->flags == OBSOLETE_FLAG &&
2dc55d9e	192	tmp_env2->flags == ACTIVE_FLAG) {
a3110f01	193	gd->env_valid = 2;
2dc55d9e	194	} else if (tmp_env1->flags == tmp_env2->flags) {
7319bcaf	195	gd->env_valid = 2;
2dc55d9e	196	} else if (tmp_env1->flags == 0xFF) {
7319bcaf	197	gd->env_valid = 2;
7319bcaf WW	198	} else {
	199	/*
	200	* this differs from code in env_flash.c, but I think a sane
	201	* default path is desirable.
	202	*/
	203	gd->env_valid = 2;
7319bcaf	204	}
ea882baf	205
a3110f01 SB	206	if (gd->env_valid == 1)
	207	ep = tmp_env1;
	208	else
	209	ep = tmp_env2;
	210
	211	ret = env_import((char *)ep, 0);
	212	if (!ret) {
	213	error("Cannot import environment: errno = %d\n", errno);
	214	set_default_env("env_import failed");
7319bcaf	215	}
7319bcaf WW	216
	217	err_read:
	218	spi_flash_free(env_flash);
	219	env_flash = NULL;
7319bcaf	220	out:
ea882baf WD	221	free(tmp_env1);
ea882baf WD	222	free(tmp_env2);
7319bcaf WW	223	}
7319bcaf WW	224	#else
8c66497e HS	225	int saveenv(void)
8c66497e HS	226	{
eb58a7fc IG	227	u32 saved_size, saved_offset, sector = 1;
	228	char res, saved_buffer = NULL;
	229	int ret = 1;
cd0f4fa1	230	env_t env_new;
a3110f01	231	ssize_t len;
07efc9e3	232
8c66497e	233	if (!env_flash) {
a3110f01 SB	234	env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS,
	235	CONFIG_ENV_SPI_CS,
	236	CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
	237	if (!env_flash) {
	238	set_default_env("!spi_flash_probe() failed");
	239	return 1;
	240	}
8c66497e HS	241	}
8c66497e HS	242
5b3375ac MF	243	/* Is the sector larger than the env (i.e. embedded) */
	244	if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) {
	245	saved_size = CONFIG_ENV_SECT_SIZE - CONFIG_ENV_SIZE;
	246	saved_offset = CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE;
	247	saved_buffer = malloc(saved_size);
eb58a7fc	248	if (!saved_buffer)
5b3375ac	249	goto done;
eb58a7fc	250
a3110f01 SB	251	ret = spi_flash_read(env_flash, saved_offset,
a3110f01 SB	252	saved_size, saved_buffer);
5b3375ac MF	253	if (ret)
	254	goto done;
	255	}
	256
0e8d1586 JCPV	257	if (CONFIG_ENV_SIZE > CONFIG_ENV_SECT_SIZE) {
	258	sector = CONFIG_ENV_SIZE / CONFIG_ENV_SECT_SIZE;
	259	if (CONFIG_ENV_SIZE % CONFIG_ENV_SECT_SIZE)
07efc9e3 TL	260	sector++;
	261	}
	262
cd0f4fa1	263	res = (char *)&env_new.data;
be11235a	264	len = hexport_r(&env_htab, '\0', 0, &res, ENV_SIZE, 0, NULL);
a3110f01 SB	265	if (len < 0) {
	266	error("Cannot export environment: errno = %d\n", errno);
	267	goto done;
	268	}
cd0f4fa1	269	env_new.crc = crc32(0, env_new.data, ENV_SIZE);
a3110f01	270
8c66497e	271	puts("Erasing SPI flash...");
a3110f01 SB	272	ret = spi_flash_erase(env_flash, CONFIG_ENV_OFFSET,
a3110f01 SB	273	sector * CONFIG_ENV_SECT_SIZE);
5b3375ac MF	274	if (ret)
5b3375ac MF	275	goto done;
8c66497e HS	276
8c66497e HS	277	puts("Writing to SPI flash...");
a3110f01	278	ret = spi_flash_write(env_flash, CONFIG_ENV_OFFSET,
cd0f4fa1	279	CONFIG_ENV_SIZE, &env_new);
5b3375ac MF	280	if (ret)
5b3375ac MF	281	goto done;
8c66497e	282
5b3375ac	283	if (CONFIG_ENV_SECT_SIZE > CONFIG_ENV_SIZE) {
a3110f01 SB	284	ret = spi_flash_write(env_flash, saved_offset,
a3110f01 SB	285	saved_size, saved_buffer);
5b3375ac MF	286	if (ret)
	287	goto done;
	288	}
	289
	290	ret = 0;
8c66497e	291	puts("done\n");
5b3375ac MF	292
	293	done:
	294	if (saved_buffer)
	295	free(saved_buffer);
eb58a7fc	296
5b3375ac	297	return ret;
8c66497e HS	298	}
	299
	300	void env_relocate_spec(void)
	301	{
cd0f4fa1	302	char buf[CONFIG_ENV_SIZE];
8c66497e HS	303	int ret;
8c66497e HS	304
0e8d1586 JCPV	305	env_flash = spi_flash_probe(CONFIG_ENV_SPI_BUS, CONFIG_ENV_SPI_CS,
0e8d1586 JCPV	306	CONFIG_ENV_SPI_MAX_HZ, CONFIG_ENV_SPI_MODE);
ea882baf WD	307	if (!env_flash) {
	308	set_default_env("!spi_flash_probe() failed");
	309	return;
	310	}
8c66497e	311
ea882baf WD	312	ret = spi_flash_read(env_flash,
	313	CONFIG_ENV_OFFSET, CONFIG_ENV_SIZE, buf);
	314	if (ret) {
	315	set_default_env("!spi_flash_read() failed");
	316	goto out;
	317	}
8c66497e	318
ea882baf	319	ret = env_import(buf, 1);
ea882baf WD	320	if (ret)
	321	gd->env_valid = 1;
	322	out:
8c66497e HS	323	spi_flash_free(env_flash);
8c66497e HS	324	env_flash = NULL;
8c66497e	325	}
7319bcaf	326	#endif
8c66497e HS	327
	328	int env_init(void)
	329	{
	330	/* SPI flash isn't usable before relocation */
	331	gd->env_addr = (ulong)&default_environment[0];
	332	gd->env_valid = 1;
	333
	334	return 0;
	335	}