This patch unifies the use of config options in v2 to all start with CONFIG_
It's basically done with the following script and some manual fixup: VARS=`grep ^define src/config/Options.lb | cut -f2 -d\ | grep -v ^CONFIG | grep -v ^COREBOOT |grep -v ^CC` for VAR in $VARS; do find . -name .svn -prune -o -type f -exec perl -pi -e "s/(^|[^0-9a-zA-Z_]+)$VAR($|[^0-9a-zA-Z_]+)/\1CONFIG_$VAR\2/g" {} \; done Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Ronald G. Minnich <rminnich@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4381 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
committed by
Stefan Reinauer
parent
9702b6bf7e
commit
0867062412
@@ -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
|
||||
|
@@ -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.
|
||||
*/
|
||||
|
@@ -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;
|
||||
|
@@ -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)
|
||||
|
Reference in New Issue
Block a user