]> git.sur5r.net Git - u-boot/commit
powerpc/corenet_ds: Correct the compilation errors about ENV
authorLiu Gang <Gang.Liu@freescale.com>
Thu, 8 Mar 2012 00:33:15 +0000 (00:33 +0000)
committerAndy Fleming <afleming@freescale.com>
Wed, 25 Apr 2012 04:58:32 +0000 (23:58 -0500)
commitfd0451e4ba3503c4ab14d88888ddda11f2a540d7
tree5a61022c4bf910de704589e7f670862c069623fa
parent7d67ed58a239354713c140f7cc54b4861f653ad5
powerpc/corenet_ds: Correct the compilation errors about ENV

When defined CONFIG_ENV_IS_NOWHERE, there will be some
compilation errors:

./common/env_nowhere.o: In function `env_relocate_spec':
./common/env_nowhere.c:38: multiple definition of `env_relocate_spec'
./common/env_flash.o: ./common/env_flash.c:326: first defined here
./common/env_nowhere.o: In function `env_get_char_spec':
./common/env_nowhere.c:42: multiple definition of `env_get_char_spec'
./common/env_flash.o:./common/env_flash.c:78: first defined here
./common/env_nowhere.o: In function `env_init':
./common/env_nowhere.c:51: multiple definition of `env_init'
./common/env_flash.o:./common/env_flash.c:237: first defined here
make[1]: *** [./common/libcommon.o] Error 1
make[1]: Leaving directory `./common'
make: *** [./common/libcommon.o] Error 2

Remove the CONFIG_ENV_IS_IN_FLASH if defined CONFIG_ENV_IS_NOWHERE.

Signed-off-by: Liu Gang <Gang.Liu@freescale.com>
include/configs/corenet_ds.h