summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-02-27 13:26:21 -0700
committerSimon Glass <sjg@chromium.org>2014-03-17 20:05:49 -0600
commit20f86a0aeaad5dfa0b4f50bf5d04dd7bf1f7c3e9 (patch)
treec295a3345281016905cb782e955277f5c8a3fbc4
parenta77bf70978a42e94790a8bc81941edc1026939ce (diff)
downloadu-boot-imx-20f86a0aeaad5dfa0b4f50bf5d04dd7bf1f7c3e9.zip
u-boot-imx-20f86a0aeaad5dfa0b4f50bf5d04dd7bf1f7c3e9.tar.gz
u-boot-imx-20f86a0aeaad5dfa0b4f50bf5d04dd7bf1f7c3e9.tar.bz2
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>
-rw-r--r--include/common.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/common.h b/include/common.h
index 090fcde..968334b 100644
--- a/include/common.h
+++ b/include/common.h
@@ -360,6 +360,11 @@ int do_ext2load(cmd_tbl_t *, int, int, char * const []);
int env_init (void);
void env_relocate (void);
int envmatch (uchar *, int);
+
+/* Avoid unfortunate conflict with libc's getenv() */
+#ifdef CONFIG_SANDBOX
+#define getenv uboot_getenv
+#endif
char *getenv (const char *);
int getenv_f (const char *name, char *buf, unsigned len);
ulong getenv_ulong(const char *name, int base, ulong default_val);