diff options
| author | Tom Rini <[email protected]> | 2019-11-06 22:54:47 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-11-06 22:54:47 -0500 |
| commit | 416b5dd5f4dd4e8634f526f4a77b6b66fb6d1843 (patch) | |
| tree | b49e2f218b642b3739540bcdf8bd974c5a12cc6a /common | |
| parent | 0f282c1876af26cc2c8c018ae6293a691561011e (diff) | |
| parent | 0219d014a781e4b79f9889a479f9b3782d76aeff (diff) | |
Merge branch '2019-11-06-reenable-llvm-in-ci'
- Re-enable LLVM tests in Travis and add them to GitLab and Azure
Diffstat (limited to 'common')
| -rw-r--r-- | common/console.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/common/console.c b/common/console.c index 89b1e9590ca..168ba60d0d9 100644 --- a/common/console.c +++ b/common/console.c @@ -252,10 +252,12 @@ static void console_puts(int file, const char *s) } } +#if CONFIG_IS_ENABLED(SYS_CONSOLE_IS_IN_ENV) static inline void console_doenv(int file, struct stdio_dev *dev) { iomux_doenv(file, dev->name); } +#endif #else static inline int console_getc(int file) { @@ -283,10 +285,12 @@ static inline void console_puts(int file, const char *s) stdio_devices[file]->puts(stdio_devices[file], s); } +#if CONFIG_IS_ENABLED(SYS_CONSOLE_IS_IN_ENV) static inline void console_doenv(int file, struct stdio_dev *dev) { console_setfile(file, dev); } +#endif #endif /* CONIFIG_IS_ENABLED(CONSOLE_MUX) */ /** U-Boot INITIAL CONSOLE-NOT COMPATIBLE FUNCTIONS *************************/ |