diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-12-05 23:33:48 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-12-05 23:33:48 +0100 |
| commit | d194837fc3042d943ba088fcc221d534330b2872 (patch) | |
| tree | 4ab6098374e2c02fb99f3672a23c271fd5ade89f /board | |
| parent | 2157497615696c41512d857478158f8546942d70 (diff) | |
| parent | 7717fe10bd61e16790d4605505100a2f8f632f02 (diff) | |
| download | u-boot-imx-d194837fc3042d943ba088fcc221d534330b2872.zip u-boot-imx-d194837fc3042d943ba088fcc221d534330b2872.tar.gz u-boot-imx-d194837fc3042d943ba088fcc221d534330b2872.tar.bz2 | |
Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging
* 'agust@denx.de' of git://git.denx.de/u-boot-staging:
Makefile: add tools/mkenvimage to target 'clean'
mv_common.c: get rid of 'defined but not used' warning
m68k: fix ambiguous bit testing
sparc: fix unknown escape sequence warnings
sparc: fix unused variable warnings
sf: fix erase debug output
Diffstat (limited to 'board')
| -rw-r--r-- | board/matrix_vision/common/mv_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/matrix_vision/common/mv_common.c b/board/matrix_vision/common/mv_common.c index 404c8b4..acb72c5 100644 --- a/board/matrix_vision/common/mv_common.c +++ b/board/matrix_vision/common/mv_common.c @@ -29,6 +29,7 @@ DECLARE_GLOBAL_DATA_PTR; +#ifndef CONFIG_ENV_IS_NOWHERE static char* entries_to_keep[] = { "serial#", "ethaddr", "eth1addr", "model_info", "sensor_cnt", "fpgadatasize", "ddr_size", "use_dhcp", "use_static_ipaddr", @@ -38,7 +39,6 @@ static char* entries_to_keep[] = { #define MV_MAX_ENV_ENTRY_LENGTH 64 #define MV_KEEP_ENTRIES ARRAY_SIZE(entries_to_keep) -#ifndef CONFIG_ENV_IS_NOWHERE void mv_reset_environment(void) { int i; |