mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-10 23:24:38 +00:00
a2f69d35f9
Previously the function was set_default_env(void), it is now set_default_env(const char *s). This patch adds the required parameter. This fixes a broken build on OMAP4430 SDP. Signed-off-by: Steve Sakoman <steve.sakoman@linaro.org>
152 lines
3.4 KiB
C
152 lines
3.4 KiB
C
/*
|
|
* (C) Copyright 2008-2010 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 <common.h>
|
|
|
|
#include <command.h>
|
|
#include <environment.h>
|
|
#include <linux/stddef.h>
|
|
#include <malloc.h>
|
|
#include <mmc.h>
|
|
|
|
/* references to names in env_common.c */
|
|
extern uchar default_environment[];
|
|
|
|
char *env_name_spec = "MMC";
|
|
|
|
#ifdef ENV_IS_EMBEDDED
|
|
extern uchar environment[];
|
|
env_t *env_ptr = (env_t *)(&environment[0]);
|
|
#else /* ! ENV_IS_EMBEDDED */
|
|
env_t *env_ptr = NULL;
|
|
#endif /* ENV_IS_EMBEDDED */
|
|
|
|
/* local functions */
|
|
#if !defined(ENV_IS_EMBEDDED)
|
|
static void use_default(void);
|
|
#endif
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
uchar env_get_char_spec(int index)
|
|
{
|
|
return *((uchar *)(gd->env_addr + index));
|
|
}
|
|
|
|
int env_init(void)
|
|
{
|
|
/* use default */
|
|
gd->env_addr = (ulong)&default_environment[0];
|
|
gd->env_valid = 1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
int init_mmc_for_env(struct mmc *mmc)
|
|
{
|
|
if (!mmc) {
|
|
puts("No MMC card found\n");
|
|
return -1;
|
|
}
|
|
|
|
if (mmc_init(mmc)) {
|
|
puts("MMC init failed\n");
|
|
return -1;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
#ifdef CONFIG_CMD_SAVEENV
|
|
|
|
inline int write_env(struct mmc *mmc, unsigned long size,
|
|
unsigned long offset, const void *buffer)
|
|
{
|
|
uint blk_start, blk_cnt, n;
|
|
|
|
blk_start = ALIGN(offset, mmc->write_bl_len) / mmc->write_bl_len;
|
|
blk_cnt = ALIGN(size, mmc->write_bl_len) / mmc->write_bl_len;
|
|
|
|
n = mmc->block_dev.block_write(CONFIG_SYS_MMC_ENV_DEV, blk_start,
|
|
blk_cnt, (u_char *)buffer);
|
|
|
|
return (n == blk_cnt) ? 0 : -1;
|
|
}
|
|
|
|
int saveenv(void)
|
|
{
|
|
struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
|
|
|
|
if (init_mmc_for_env(mmc))
|
|
return 1;
|
|
|
|
printf("Writing to MMC(%d)... ", CONFIG_SYS_MMC_ENV_DEV);
|
|
if (write_env(mmc, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, env_ptr)) {
|
|
puts("failed\n");
|
|
return 1;
|
|
}
|
|
|
|
puts("done\n");
|
|
return 0;
|
|
}
|
|
#endif /* CONFIG_CMD_SAVEENV */
|
|
|
|
inline int read_env(struct mmc *mmc, unsigned long size,
|
|
unsigned long offset, const void *buffer)
|
|
{
|
|
uint blk_start, blk_cnt, n;
|
|
|
|
blk_start = ALIGN(offset, mmc->read_bl_len) / mmc->read_bl_len;
|
|
blk_cnt = ALIGN(size, mmc->read_bl_len) / mmc->read_bl_len;
|
|
|
|
n = mmc->block_dev.block_read(CONFIG_SYS_MMC_ENV_DEV, blk_start,
|
|
blk_cnt, (uchar *)buffer);
|
|
|
|
return (n == blk_cnt) ? 0 : -1;
|
|
}
|
|
|
|
void env_relocate_spec(void)
|
|
{
|
|
#if !defined(ENV_IS_EMBEDDED)
|
|
struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
|
|
|
|
if (init_mmc_for_env(mmc))
|
|
return;
|
|
|
|
if (read_env(mmc, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, env_ptr))
|
|
return use_default();
|
|
|
|
if (crc32(0, env_ptr->data, ENV_SIZE) != env_ptr->crc)
|
|
return use_default();
|
|
|
|
gd->env_valid = 1;
|
|
#endif
|
|
}
|
|
|
|
#if !defined(ENV_IS_EMBEDDED)
|
|
static void use_default()
|
|
{
|
|
set_default_env(NULL);
|
|
}
|
|
#endif
|