LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sandbox: Deal with conflicting getenv() for SDL 

Unfortunately SDL requires getenv() to operate, since it wants to figure out
the display type. U-Boot has its own getenv() and they conflict. As a
work-around use #define to resolve the conflict.

A better but more complex solution might be to rename some U-Boot symbols
at link time. SDL audio is not functional at present, likely due to a related
issue.

Note: Vic Yank wrote a script for this, filed in crbug.com/271125.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2014-02-27 13:26:21 -07:00
parent a77bf70978
commit 20f86a0aea
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/common.h
View File

@ -360,6 +360,11 @@ int do_ext2load(cmd_tbl_t *, int, int, char * const []);
int env_init (void); int env_init (void);
void env_relocate (void); void env_relocate (void);
int envmatch (uchar *, int); int envmatch (uchar *, int);
/* Avoid unfortunate conflict with libc's getenv() */
#ifdef CONFIG_SANDBOX
#define getenv uboot_getenv
#endif
char *getenv (const char *); char *getenv (const char *);
int getenv_f (const char *name, char *buf, unsigned len); int getenv_f (const char *name, char *buf, unsigned len);
ulong getenv_ulong(const char *name, int base, ulong default_val); ulong getenv_ulong(const char *name, int base, ulong default_val);