]> git.baikalelectronics.ru Git - uboot.git/commit
env: make file-scope env_ptr variables static
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>
Tue, 18 Feb 2020 08:54:09 +0000 (08:54 +0000)
committerTom Rini <trini@konsulko.com>
Fri, 17 Apr 2020 16:29:43 +0000 (12:29 -0400)
commitd409a0f2d776e8d9a543f8a34a66882f44cc4d6b
treeca1c32286fa74c58501329e0d928bfce99386644
parent384ed9e5ba7f68a5f9e74bfed485f34aea33b473
env: make file-scope env_ptr variables static

The combination ENV_IS_IN_NVRAM=y, ENV_IS_IN_REMOTE=y fails to build:

env/remote.o:/mnt/ext4/devel/u-boot/env/remote.c:17: multiple definition of `env_ptr'
env/nvram.o:/mnt/ext4/devel/u-boot/env/nvram.c:41: first defined here

It's not necessarily a meaningful combination, but for build-testing
it's nice to be able to enable most ENV_IS_IN_* at the same time, and
since these env_ptr are not declared anywhere, they really have no
reason to have external linkage.

nand.c and flash.c similarly already define file-scope static env_ptr
variables.

Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
env/nvram.c
env/remote.c