payloads: Replace all IS_ENABLED(CONFIG_XXX) with CONFIG(XXX)
This patch is a raw application of find payloads/ -type f | \ xargs sed -i -e 's/IS_ENABLED\s*(CONFIG_/CONFIG(/g' Change-Id: I883b03b189f59b5d998a09a2596b0391a2d5cf33 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/31775 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
committed by
Patrick Georgi
parent
b431833c12
commit
eab2a29c8b
@@ -41,7 +41,7 @@ static uint8_t serial_read_reg(int offset)
|
||||
{
|
||||
offset *= lib_sysinfo.serial->regwidth;
|
||||
|
||||
#if IS_ENABLED(CONFIG_LP_IO_ADDRESS_SPACE)
|
||||
#if CONFIG(LP_IO_ADDRESS_SPACE)
|
||||
if (!serial_is_mem_mapped)
|
||||
return inb(IOBASE + offset);
|
||||
else
|
||||
@@ -56,7 +56,7 @@ static void serial_write_reg(uint8_t val, int offset)
|
||||
{
|
||||
offset *= lib_sysinfo.serial->regwidth;
|
||||
|
||||
#if IS_ENABLED(CONFIG_LP_IO_ADDRESS_SPACE)
|
||||
#if CONFIG(LP_IO_ADDRESS_SPACE)
|
||||
if (!serial_is_mem_mapped)
|
||||
outb(val, IOBASE + offset);
|
||||
else
|
||||
@@ -67,13 +67,13 @@ static void serial_write_reg(uint8_t val, int offset)
|
||||
writeb(val, MEMBASE + offset);
|
||||
}
|
||||
|
||||
#if IS_ENABLED(CONFIG_LP_SERIAL_SET_SPEED)
|
||||
#if CONFIG(LP_SERIAL_SET_SPEED)
|
||||
static void serial_hardware_init(int speed, int word_bits,
|
||||
int parity, int stop_bits)
|
||||
{
|
||||
unsigned char reg;
|
||||
|
||||
#if !IS_ENABLED(CONFIG_LP_PL011_SERIAL_CONSOLE)
|
||||
#if !CONFIG(LP_PL011_SERIAL_CONSOLE)
|
||||
/* Disable interrupts. */
|
||||
serial_write_reg(0, 0x01);
|
||||
|
||||
@@ -114,7 +114,7 @@ void serial_init(void)
|
||||
(lib_sysinfo.serial->type == CB_SERIAL_TYPE_MEMORY_MAPPED);
|
||||
|
||||
if (!serial_is_mem_mapped) {
|
||||
#if IS_ENABLED(CONFIG_LP_IO_ADDRESS_SPACE)
|
||||
#if CONFIG(LP_IO_ADDRESS_SPACE)
|
||||
if ((inb(IOBASE + 0x05) == 0xFF) &&
|
||||
(inb(IOBASE + 0x06) == 0xFF)) {
|
||||
printf("IO space mapped serial not present.");
|
||||
@@ -126,7 +126,7 @@ void serial_init(void)
|
||||
#endif
|
||||
}
|
||||
|
||||
#if IS_ENABLED(CONFIG_LP_SERIAL_SET_SPEED)
|
||||
#if CONFIG(LP_SERIAL_SET_SPEED)
|
||||
serial_hardware_init(CONFIG_LP_SERIAL_BAUD_RATE, 8, 0, 1);
|
||||
#endif
|
||||
}
|
||||
@@ -147,7 +147,7 @@ void serial_putchar(unsigned int c)
|
||||
{
|
||||
if (!serial_hardware_is_present)
|
||||
return;
|
||||
#if !IS_ENABLED(CONFIG_LP_PL011_SERIAL_CONSOLE)
|
||||
#if !CONFIG(LP_PL011_SERIAL_CONSOLE)
|
||||
while ((serial_read_reg(0x05) & 0x20) == 0) ;
|
||||
#endif
|
||||
serial_write_reg(c, 0x00);
|
||||
|
Reference in New Issue
Block a user