diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-10-09 00:03:18 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-10-09 00:03:18 +0200 |
| commit | cd77dd109c4a439519a78c32eddc42bdebc7a61f (patch) | |
| tree | c5534647cb1786044ef0f7e4ad4067725eddf11d /common/serial.c | |
| parent | 95c44ec485b46ffb43dbdaa299f1491a500fdadf (diff) | |
| parent | afc3ba0fc4195624e79e21244380ed7cc2fd6969 (diff) | |
| download | olio-uboot-2014.01-cd77dd109c4a439519a78c32eddc42bdebc7a61f.tar.xz olio-uboot-2014.01-cd77dd109c4a439519a78c32eddc42bdebc7a61f.zip | |
Merge branch 'reloc'
Diffstat (limited to 'common/serial.c')
| -rw-r--r-- | common/serial.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/common/serial.c b/common/serial.c index 41a24c2fa..b4db46b16 100644 --- a/common/serial.c +++ b/common/serial.c @@ -81,12 +81,14 @@ struct serial_device *default_serial_console(void) __attribute__((weak, alias("_ int serial_register (struct serial_device *dev) { +#ifndef CONFIG_RELOC_FIXUP_WORKS dev->init += gd->reloc_off; dev->setbrg += gd->reloc_off; dev->getc += gd->reloc_off; dev->tstc += gd->reloc_off; dev->putc += gd->reloc_off; dev->puts += gd->reloc_off; +#endif dev->next = serial_devices; serial_devices = dev; |