diff options
author | Graeme Russ <graeme.russ@gmail.com> | 2011-08-29 02:14:05 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2011-10-01 19:54:49 (GMT) |
commit | e3e454cd72f319908355427b1a3ae54b3dd53356 (patch) | |
tree | b461a0dc8287aa0c7d3e3eab525cd4f76c27481a /drivers | |
parent | 79df1208ee6984aa63468673c042667d121bb0bc (diff) | |
download | u-boot-fsl-qoriq-e3e454cd72f319908355427b1a3ae54b3dd53356.tar.xz |
console: Squelch pre-console output in console functions
There are some locations in the code which anticipate printf() being called
before the console is ready by squelching printf() on gd->have_console.
Move this squelching into printf(), vprintf(), puts() and putc(). Also
make tstc() and getc() return 0 if console is not yet initialised
Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
Tested-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/i2c/ppc4xx_i2c.c | 5 | ||||
-rw-r--r-- | drivers/i2c/soft_i2c.c | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/i2c/ppc4xx_i2c.c b/drivers/i2c/ppc4xx_i2c.c index c1cbe55..53fedd5 100644 --- a/drivers/i2c/ppc4xx_i2c.c +++ b/drivers/i2c/ppc4xx_i2c.c @@ -396,10 +396,7 @@ static int ppc4xx_i2c_transfer(uchar chip, uint addr, int alen, uchar *buffer, #endif if ((ret = i2c_transfer(read, chip << 1, &xaddr[4 - alen], alen, buffer, len)) != 0) { - if (gd->have_console) { - printf("I2C %s: failed %d\n", - read ? "read" : "write", ret); - } + printf("I2C %s: failed %d\n", read ? "read" : "write", ret); return 1; } diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index 9b02e89..36c6114 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -119,7 +119,6 @@ DECLARE_GLOBAL_DATA_PTR; #ifdef DEBUG_I2C #define PRINTD(fmt,args...) do { \ - if (gd->have_console) \ printf (fmt ,##args); \ } while (0) #else |