diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-12-17 16:53:07 +0100 |
| commit | cb5473205206c7f14cbb1e747f28ec75b48826e2 (patch) | |
| tree | 8f4808d60917100b18a10b05230f7638a0a9bbcc /board/hymod/env.c | |
| parent | baf449fc5ff96f071bb0e3789fd3265f6d4fd9a0 (diff) | |
| parent | 92c78a3bbcb2ce508b4bf1c4a1e0940406a024bb (diff) | |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
Diffstat (limited to 'board/hymod/env.c')
| -rw-r--r-- | board/hymod/env.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/hymod/env.c b/board/hymod/env.c index 062553bfa..c0e2cd5d6 100644 --- a/board/hymod/env.c +++ b/board/hymod/env.c @@ -35,7 +35,7 @@ static int env_callback (uchar *name, uchar *value) { hymod_conf_t *cp = &gd->bd->bi_hymod_conf; - char ov[CFG_CBSIZE], nv[CFG_CBSIZE], *p, *q, *nn, c, *curver, *newver; + char ov[CONFIG_SYS_CBSIZE], nv[CONFIG_SYS_CBSIZE], *p, *q, *nn, c, *curver, *newver; int override = 1, append = 0, remove = 0, nnl, ovl, nvl; nn = (char *)name; @@ -205,7 +205,7 @@ hymod_check_env (void) if ((path = getenv ("global_env_path")) == NULL || *path == '\0') path = def_global_env_path; - if (fetch_and_parse (path, CFG_LOAD_ADDR, env_callback) == 0) { + if (fetch_and_parse (path, CONFIG_SYS_LOAD_ADDR, env_callback) == 0) { puts ("*** Fetch of global environment failed!\n"); return; } |