mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-11-27 22:24:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

env: make file-scope env_ptr variables static

Browse Source 
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>
This commit is contained in:
Rasmus Villemoes 2020-02-18 08:54:09 +00:00 committed by Tom Rini
parent 8ce1f10cf2
commit 46d9d1c306
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
env/nvram.c vendored
View File

@ -38,7 +38,7 @@ DECLARE_GLOBAL_DATA_PTR;
extern void *nvram_read(void *dest, const long src, size_t count); extern void *nvram_read(void *dest, const long src, size_t count);
extern void nvram_write(long dest, const void *src, size_t count); extern void nvram_write(long dest, const void *src, size_t count);
#else #else
env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR; static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
#endif #endif
#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE

4
env/remote.c vendored
View File

@ -12,9 +12,9 @@
#include <u-boot/crc.h> #include <u-boot/crc.h>
#ifdef ENV_IS_EMBEDDED #ifdef ENV_IS_EMBEDDED
env_t *env_ptr = &environment; static env_t *env_ptr = &environment;
#else /* ! ENV_IS_EMBEDDED */ #else /* ! ENV_IS_EMBEDDED */
env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR; static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
#endif /* ENV_IS_EMBEDDED */ #endif /* ENV_IS_EMBEDDED */
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;