projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't include standard parser if hush is used
[oweals/u-boot.git]
/
common
/
env_mmc.c
diff --git
a/common/env_mmc.c
b/common/env_mmc.c
index d443ff51f1a8f8a528ae37b0e996fe9e39d6ddfd..0c58ae19b21e973533d5ed19b4e1ce216fbcb4b8 100644
(file)
--- a/
common/env_mmc.c
+++ b/
common/env_mmc.c
@@
-1,5
+1,5
@@
/*
/*
- * (C) Copyright 2008-201
0
Freescale Semiconductor, Inc.
+ * (C) Copyright 2008-201
1
Freescale Semiconductor, Inc.
*
* See file CREDITS for list of people who contributed to this
* project.
*
* See file CREDITS for list of people who contributed to this
* project.
@@
-29,41
+29,41
@@
#include <linux/stddef.h>
#include <malloc.h>
#include <mmc.h>
#include <linux/stddef.h>
#include <malloc.h>
#include <mmc.h>
-
-/* references to names in env_common.c */
-extern uchar default_environment[];
+#include <search.h>
+#include <errno.h>
char *env_name_spec = "MMC";
#ifdef ENV_IS_EMBEDDED
char *env_name_spec = "MMC";
#ifdef ENV_IS_EMBEDDED
-extern uchar environment[];
-env_t *env_ptr = (env_t *)(&environment[0]);
+env_t *env_ptr = &environment;
#else /* ! ENV_IS_EMBEDDED */
#else /* ! ENV_IS_EMBEDDED */
-env_t *env_ptr
= NULL
;
+env_t *env_ptr;
#endif /* ENV_IS_EMBEDDED */
#endif /* ENV_IS_EMBEDDED */
-/* local functions */
-#if !defined(ENV_IS_EMBEDDED)
-static void use_default(void);
-#endif
-
DECLARE_GLOBAL_DATA_PTR;
DECLARE_GLOBAL_DATA_PTR;
-uchar env_get_char_spec(int index)
+#if !defined(CONFIG_ENV_OFFSET)
+#define CONFIG_ENV_OFFSET 0
+#endif
+
+static int __mmc_get_env_addr(struct mmc *mmc, u32 *env_addr)
{
{
- return *((uchar *)(gd->env_addr + index));
+ *env_addr = CONFIG_ENV_OFFSET;
+ return 0;
}
}
+int mmc_get_env_addr(struct mmc *mmc, u32 *env_addr)
+ __attribute__((weak, alias("__mmc_get_env_addr")));
int env_init(void)
{
/* use default */
int env_init(void)
{
/* use default */
- gd->env_addr = (ulong)&default_environment[0];
- gd->env_valid = 1;
+ gd->env_addr
= (ulong)&default_environment[0];
+ gd->env_valid
= 1;
return 0;
}
return 0;
}
-int init_mmc_for_env(struct mmc *mmc)
+
static
int init_mmc_for_env(struct mmc *mmc)
{
if (!mmc) {
puts("No MMC card found\n");
{
if (!mmc) {
puts("No MMC card found\n");
@@
-72,21
+72,20
@@
int init_mmc_for_env(struct mmc *mmc)
if (mmc_init(mmc)) {
puts("MMC init failed\n");
if (mmc_init(mmc)) {
puts("MMC init failed\n");
- return
-1;
+ return -1;
}
return 0;
}
#ifdef CONFIG_CMD_SAVEENV
}
return 0;
}
#ifdef CONFIG_CMD_SAVEENV
-
-inline int write_env(struct mmc *mmc, unsigned long size,
- unsigned long offset, const void *buffer)
+static inline int write_env(struct mmc *mmc, unsigned long size,
+ unsigned long offset, const void *buffer)
{
uint blk_start, blk_cnt, n;
{
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;
+ 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);
n = mmc->block_dev.block_write(CONFIG_SYS_MMC_ENV_DEV, blk_start,
blk_cnt, (u_char *)buffer);
@@
-96,13
+95,25
@@
inline int write_env(struct mmc *mmc, unsigned long size,
int saveenv(void)
{
int saveenv(void)
{
+ env_t env_new;
+ ssize_t len;
+ char *res;
struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
+ u32 offset;
+
+ if (init_mmc_for_env(mmc) || mmc_get_env_addr(mmc, &offset))
+ return 1;
- if (init_mmc_for_env(mmc))
+ res = (char *)&env_new.data;
+ len = hexport_r(&env_htab, '\0', &res, ENV_SIZE, 0, NULL);
+ if (len < 0) {
+ error("Cannot export environment: errno = %d\n", errno);
return 1;
return 1;
+ }
+ env_new.crc = crc32(0, env_new.data, ENV_SIZE);
printf("Writing to MMC(%d)... ", CONFIG_SYS_MMC_ENV_DEV);
printf("Writing to MMC(%d)... ", CONFIG_SYS_MMC_ENV_DEV);
- if (write_env(mmc, CONFIG_ENV_SIZE,
CONFIG_ENV_OFFSET, env_ptr
)) {
+ if (write_env(mmc, CONFIG_ENV_SIZE,
offset, (u_char *)&env_new
)) {
puts("failed\n");
return 1;
}
puts("failed\n");
return 1;
}
@@
-112,13
+123,13
@@
int saveenv(void)
}
#endif /* CONFIG_CMD_SAVEENV */
}
#endif /* CONFIG_CMD_SAVEENV */
-inline int read_env(struct mmc *mmc, unsigned long size,
- unsigned long offset, const void *buffer)
+
static
inline int read_env(struct mmc *mmc, unsigned long size,
+
unsigned long offset, const void *buffer)
{
uint blk_start, blk_cnt, n;
{
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;
+ 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);
n = mmc->block_dev.block_read(CONFIG_SYS_MMC_ENV_DEV, blk_start,
blk_cnt, (uchar *)buffer);
@@
-129,27
+140,16
@@
inline int read_env(struct mmc *mmc, unsigned long size,
void env_relocate_spec(void)
{
#if !defined(ENV_IS_EMBEDDED)
void env_relocate_spec(void)
{
#if !defined(ENV_IS_EMBEDDED)
- char buf[CONFIG_ENV_SIZE];
-
+ char buf[CONFIG_ENV_SIZE];
struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV);
+ u32 offset;
- if (init_mmc_for_env(mmc)) {
- use_default();
- return;
- }
+ if (init_mmc_for_env(mmc) || mmc_get_env_addr(mmc, &offset))
+ return set_default_env(NULL);
- if (read_env(mmc, CONFIG_ENV_SIZE, CONFIG_ENV_OFFSET, buf)) {
- use_default();
- return;
- }
+ if (read_env(mmc, CONFIG_ENV_SIZE, offset, buf))
+ return set_default_env(NULL);
env_import(buf, 1);
#endif
}
env_import(buf, 1);
#endif
}
-
-#if !defined(ENV_IS_EMBEDDED)
-static void use_default()
-{
- set_default_env(NULL);
-}
-#endif