projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rename CFG_ENV macros to CONFIG_ENV
[platform/kernel/u-boot.git]
/
common
/
env_eeprom.c
diff --git
a/common/env_eeprom.c
b/common/env_eeprom.c
index
2adc129
..
1f0f413
100644
(file)
--- a/
common/env_eeprom.c
+++ b/
common/env_eeprom.c
@@
-25,9
+25,6
@@
*/
#include <common.h>
*/
#include <common.h>
-
-#if defined(CFG_ENV_IS_IN_EEPROM) /* Environment is in EEPROM */
-
#include <command.h>
#include <environment.h>
#include <linux/stddef.h>
#include <command.h>
#include <environment.h>
#include <linux/stddef.h>
@@
-38,16
+35,12
@@
env_t *env_ptr = NULL;
char * env_name_spec = "EEPROM";
char * env_name_spec = "EEPROM";
-extern uchar (*env_get_char)(int);
-extern uchar env_get_char_memory (int index);
-
-
uchar env_get_char_spec (int index)
{
uchar c;
eeprom_read (CFG_DEF_EEPROM_ADDR,
uchar env_get_char_spec (int index)
{
uchar c;
eeprom_read (CFG_DEF_EEPROM_ADDR,
- C
F
G_ENV_OFFSET+index+offsetof(env_t,data),
+ C
ONFI
G_ENV_OFFSET+index+offsetof(env_t,data),
&c, 1);
return (c);
&c, 1);
return (c);
@@
-56,17
+49,17
@@
uchar env_get_char_spec (int index)
void env_relocate_spec (void)
{
eeprom_read (CFG_DEF_EEPROM_ADDR,
void env_relocate_spec (void)
{
eeprom_read (CFG_DEF_EEPROM_ADDR,
- C
F
G_ENV_OFFSET,
+ C
ONFI
G_ENV_OFFSET,
(uchar*)env_ptr,
(uchar*)env_ptr,
- C
F
G_ENV_SIZE);
+ C
ONFI
G_ENV_SIZE);
}
int saveenv(void)
{
return eeprom_write (CFG_DEF_EEPROM_ADDR,
}
int saveenv(void)
{
return eeprom_write (CFG_DEF_EEPROM_ADDR,
- C
F
G_ENV_OFFSET,
+ C
ONFI
G_ENV_OFFSET,
(uchar *)env_ptr,
(uchar *)env_ptr,
- C
F
G_ENV_SIZE);
+ C
ONFI
G_ENV_SIZE);
}
/************************************************************************
}
/************************************************************************
@@
-85,7
+78,7
@@
int env_init(void)
/* read old CRC */
eeprom_read (CFG_DEF_EEPROM_ADDR,
/* read old CRC */
eeprom_read (CFG_DEF_EEPROM_ADDR,
- C
F
G_ENV_OFFSET+offsetof(env_t,crc),
+ C
ONFI
G_ENV_OFFSET+offsetof(env_t,crc),
(uchar *)&crc, sizeof(ulong));
new = 0;
(uchar *)&crc, sizeof(ulong));
new = 0;
@@
-94,7
+87,7
@@
int env_init(void)
while (len > 0) {
int n = (len > sizeof(buf)) ? sizeof(buf) : len;
while (len > 0) {
int n = (len > sizeof(buf)) ? sizeof(buf) : len;
- eeprom_read (CFG_DEF_EEPROM_ADDR, C
F
G_ENV_OFFSET+off, buf, n);
+ eeprom_read (CFG_DEF_EEPROM_ADDR, C
ONFI
G_ENV_OFFSET+off, buf, n);
new = crc32 (new, buf, n);
len -= n;
off += n;
new = crc32 (new, buf, n);
len -= n;
off += n;
@@
-110,5
+103,3
@@
int env_init(void)
return (0);
}
return (0);
}
-
-#endif /* CFG_ENV_IS_IN_EEPROM */