diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/fallback_boot.c | 2 | ||||
| -rw-r--r-- | src/lib/uart8250.c | 2 | ||||
| -rw-r--r-- | src/lib/version.c | 12 | ||||
| -rw-r--r-- | src/lib/xmodem.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/src/lib/fallback_boot.c b/src/lib/fallback_boot.c index 9e892dd680..59476fdf2a 100644 --- a/src/lib/fallback_boot.c +++ b/src/lib/fallback_boot.c @@ -5,7 +5,7 @@ #include <arch/io.h> -#if HAVE_FALLBACK_BOOT == 1 +#if CONFIG_HAVE_FALLBACK_BOOT == 1 void set_boot_successful(void) { /* Remember I succesfully booted by setting diff --git a/src/lib/uart8250.c b/src/lib/uart8250.c index b9abc9e219..79eb1c51c1 100644 --- a/src/lib/uart8250.c +++ b/src/lib/uart8250.c @@ -80,7 +80,7 @@ void init_uart8250(unsigned base_port, struct uart8250 *uart) int lcs; divisor = 115200/(uart->baud ? uart->baud: 1); lcs = 3; - if (base_port == TTYS0_BASE) { + if (base_port == CONFIG_TTYS0_BASE) { /* Don't reinitialize the console serial port, * This is espeically nasty in SMP. */ diff --git a/src/lib/version.c b/src/lib/version.c index 404f50d730..2c84c4ae86 100644 --- a/src/lib/version.c +++ b/src/lib/version.c @@ -1,10 +1,10 @@ #include <version.h> -#ifndef MAINBOARD_VENDOR -#error MAINBOARD_VENDOR not defined +#ifndef CONFIG_MAINBOARD_VENDOR +#error CONFIG_MAINBOARD_VENDOR not defined #endif -#ifndef MAINBOARD_PART_NUMBER -#error MAINBOARD_PART_NUMBER not defined +#ifndef CONFIG_MAINBOARD_PART_NUMBER +#error CONFIG_MAINBOARD_PART_NUMBER not defined #endif #ifndef COREBOOT_VERSION @@ -39,8 +39,8 @@ #define COREBOOT_EXTRA_VERSION "" #endif -const char mainboard_vendor[] = MAINBOARD_VENDOR; -const char mainboard_part_number[] = MAINBOARD_PART_NUMBER; +const char mainboard_vendor[] = CONFIG_MAINBOARD_VENDOR; +const char mainboard_part_number[] = CONFIG_MAINBOARD_PART_NUMBER; const char coreboot_version[] = COREBOOT_VERSION; const char coreboot_extra_version[] = COREBOOT_EXTRA_VERSION; diff --git a/src/lib/xmodem.c b/src/lib/xmodem.c index aca6e49d58..8321151ce0 100644 --- a/src/lib/xmodem.c +++ b/src/lib/xmodem.c @@ -26,17 +26,17 @@ extern unsigned char uart8250_rx_byte(unsigned); static int _inbyte(int msec) { - while (!uart8250_can_rx_byte(TTYS0_BASE)) { + while (!uart8250_can_rx_byte(CONFIG_TTYS0_BASE)) { udelay(1000); if (msec-- <= 0) return -1; } - return uart8250_rx_byte(TTYS0_BASE); + return uart8250_rx_byte(CONFIG_TTYS0_BASE); } static void _outbyte(unsigned char c) { - uart8250_tx_byte(TTYS0_BASE, c); + uart8250_tx_byte(CONFIG_TTYS0_BASE, c); } static unsigned short crc16_ccitt(const unsigned char *buf, int sz) |