coreboot: Replace all IS_ENABLED(CONFIG_XXX) with CONFIG(XXX)
This patch is a raw application of find src/ -type f | xargs sed -i -e 's/IS_ENABLED\s*(CONFIG_/CONFIG(/g' Change-Id: I6262d6d5c23cabe23c242b4f38d446b74fe16b88 Signed-off-by: Julius Werner <jwerner@chromium.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/31774 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
b3a8cc54db
commit
cd49cce7b7
@@ -20,9 +20,9 @@
|
||||
void cbmemc_init(void);
|
||||
void cbmemc_tx_byte(unsigned char data);
|
||||
|
||||
#define __CBMEM_CONSOLE_ENABLE__ (IS_ENABLED(CONFIG_CONSOLE_CBMEM) && \
|
||||
#define __CBMEM_CONSOLE_ENABLE__ (CONFIG(CONSOLE_CBMEM) && \
|
||||
(ENV_RAMSTAGE || ENV_VERSTAGE || ENV_POSTCAR || ENV_ROMSTAGE || \
|
||||
(ENV_BOOTBLOCK && IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE))))
|
||||
(ENV_BOOTBLOCK && CONFIG(BOOTBLOCK_CONSOLE))))
|
||||
|
||||
#if __CBMEM_CONSOLE_ENABLE__
|
||||
static inline void __cbmemc_init(void) { cbmemc_init(); }
|
||||
|
@@ -22,13 +22,13 @@
|
||||
#include <console/vtxprintf.h>
|
||||
#include <commonlib/loglevel.h>
|
||||
|
||||
#define RAM_DEBUG (IS_ENABLED(CONFIG_DEBUG_RAM_SETUP) ? BIOS_DEBUG : BIOS_NEVER)
|
||||
#define RAM_SPEW (IS_ENABLED(CONFIG_DEBUG_RAM_SETUP) ? BIOS_SPEW : BIOS_NEVER)
|
||||
#define RAM_DEBUG (CONFIG(DEBUG_RAM_SETUP) ? BIOS_DEBUG : BIOS_NEVER)
|
||||
#define RAM_SPEW (CONFIG(DEBUG_RAM_SETUP) ? BIOS_SPEW : BIOS_NEVER)
|
||||
|
||||
#ifndef __ROMCC__
|
||||
|
||||
void post_code(u8 value);
|
||||
#if IS_ENABLED(CONFIG_CMOS_POST_EXTRA)
|
||||
#if CONFIG(CMOS_POST_EXTRA)
|
||||
void post_log_extra(u32 value);
|
||||
struct device;
|
||||
void post_log_path(const struct device *dev);
|
||||
@@ -49,10 +49,10 @@ void __noreturn die(const char *msg);
|
||||
void die_notify(void);
|
||||
|
||||
#define __CONSOLE_ENABLE__ \
|
||||
((ENV_BOOTBLOCK && IS_ENABLED(CONFIG_BOOTBLOCK_CONSOLE)) || \
|
||||
(ENV_POSTCAR && IS_ENABLED(CONFIG_POSTCAR_CONSOLE)) || \
|
||||
((ENV_BOOTBLOCK && CONFIG(BOOTBLOCK_CONSOLE)) || \
|
||||
(ENV_POSTCAR && CONFIG(POSTCAR_CONSOLE)) || \
|
||||
ENV_VERSTAGE || ENV_ROMSTAGE || ENV_RAMSTAGE || ENV_LIBAGESA || \
|
||||
(ENV_SMM && IS_ENABLED(CONFIG_DEBUG_SMI)))
|
||||
(ENV_SMM && CONFIG(DEBUG_SMI)))
|
||||
|
||||
#if __CONSOLE_ENABLE__
|
||||
asmlinkage void console_init(void);
|
||||
@@ -64,7 +64,7 @@ void do_putchar(unsigned char byte);
|
||||
|
||||
enum { CONSOLE_LOG_NONE = 0, CONSOLE_LOG_FAST, CONSOLE_LOG_ALL };
|
||||
|
||||
#if IS_ENABLED(CONFIG_CONSOLE_OVERRIDE_LOGLEVEL)
|
||||
#if CONFIG(CONSOLE_OVERRIDE_LOGLEVEL)
|
||||
/*
|
||||
* This function should be implemented at mainboard level.
|
||||
* The returned value will _replace_ the loglevel value;
|
||||
|
@@ -22,7 +22,7 @@ void flashconsole_init(void);
|
||||
void flashconsole_tx_byte(unsigned char c);
|
||||
void flashconsole_tx_flush(void);
|
||||
|
||||
#define __CONSOLE_FLASH_ENABLE__ IS_ENABLED(CONFIG_CONSOLE_SPI_FLASH)
|
||||
#define __CONSOLE_FLASH_ENABLE__ CONFIG(CONSOLE_SPI_FLASH)
|
||||
|
||||
#if __CONSOLE_FLASH_ENABLE__
|
||||
static inline void __flashconsole_init(void) { flashconsole_init(); }
|
||||
|
@@ -22,7 +22,7 @@ void ne2k_append_data(unsigned char *d, int len, unsigned int base);
|
||||
int ne2k_init(unsigned int eth_nic_base);
|
||||
void ne2k_transmit(unsigned int eth_nic_base);
|
||||
|
||||
#if IS_ENABLED(CONFIG_CONSOLE_NE2K) && (ENV_ROMSTAGE || ENV_RAMSTAGE)
|
||||
#if CONFIG(CONSOLE_NE2K) && (ENV_ROMSTAGE || ENV_RAMSTAGE)
|
||||
static inline void __ne2k_init(void)
|
||||
{
|
||||
ne2k_init(CONFIG_CONSOLE_NE2K_IO_PORT);
|
||||
|
@@ -6,7 +6,7 @@
|
||||
void qemu_debugcon_init(void);
|
||||
void qemu_debugcon_tx_byte(unsigned char data);
|
||||
|
||||
#if IS_ENABLED(CONFIG_CONSOLE_QEMU_DEBUGCON) && (ENV_ROMSTAGE || ENV_RAMSTAGE)
|
||||
#if CONFIG(CONSOLE_QEMU_DEBUGCON) && (ENV_ROMSTAGE || ENV_RAMSTAGE)
|
||||
static inline void __qemu_debugcon_init(void) { qemu_debugcon_init(); }
|
||||
static inline void __qemu_debugcon_tx_byte(u8 data)
|
||||
{
|
||||
|
@@ -21,8 +21,8 @@
|
||||
void spiconsole_init(void);
|
||||
void spiconsole_tx_byte(unsigned char c);
|
||||
|
||||
#define __CONSOLE_SPI_ENABLE__ (IS_ENABLED(CONFIG_SPI_CONSOLE) && \
|
||||
(ENV_RAMSTAGE || (ENV_SMM && IS_ENABLED(CONFIG_DEBUG_SMI))))
|
||||
#define __CONSOLE_SPI_ENABLE__ (CONFIG(SPI_CONSOLE) && \
|
||||
(ENV_RAMSTAGE || (ENV_SMM && CONFIG(DEBUG_SMI))))
|
||||
|
||||
#if __CONSOLE_SPI_ENABLE__
|
||||
static inline void __spiconsole_init(void) { spiconsole_init(); }
|
||||
|
@@ -6,7 +6,7 @@
|
||||
void spkmodem_init(void);
|
||||
void spkmodem_tx_byte(unsigned char c);
|
||||
|
||||
#if IS_ENABLED(CONFIG_SPKMODEM) && (ENV_ROMSTAGE || ENV_RAMSTAGE)
|
||||
#if CONFIG(SPKMODEM) && (ENV_ROMSTAGE || ENV_RAMSTAGE)
|
||||
static inline void __spkmodem_init(void) { spkmodem_init(); }
|
||||
static inline void __spkmodem_tx_byte(u8 data) { spkmodem_tx_byte(data); }
|
||||
#else
|
||||
|
@@ -22,7 +22,7 @@
|
||||
* baudrate generator. */
|
||||
unsigned int uart_platform_refclk(void);
|
||||
|
||||
#if IS_ENABLED(CONFIG_UART_OVERRIDE_BAUDRATE)
|
||||
#if CONFIG(UART_OVERRIDE_BAUDRATE)
|
||||
/* Return the baudrate, define this in your platform when using the above
|
||||
configuration. */
|
||||
unsigned int get_uart_baudrate(void);
|
||||
@@ -63,9 +63,9 @@ static inline void *uart_platform_baseptr(int idx)
|
||||
|
||||
void oxford_remap(unsigned int new_base);
|
||||
|
||||
#define __CONSOLE_SERIAL_ENABLE__ (IS_ENABLED(CONFIG_CONSOLE_SERIAL) && \
|
||||
#define __CONSOLE_SERIAL_ENABLE__ (CONFIG(CONSOLE_SERIAL) && \
|
||||
(ENV_BOOTBLOCK || ENV_ROMSTAGE || ENV_RAMSTAGE || ENV_VERSTAGE || \
|
||||
ENV_POSTCAR || (ENV_SMM && IS_ENABLED(CONFIG_DEBUG_SMI))))
|
||||
ENV_POSTCAR || (ENV_SMM && CONFIG(DEBUG_SMI))))
|
||||
|
||||
#if __CONSOLE_SERIAL_ENABLE__
|
||||
static inline void __uart_init(void)
|
||||
@@ -86,7 +86,7 @@ static inline void __uart_tx_byte(u8 data) {}
|
||||
static inline void __uart_tx_flush(void) {}
|
||||
#endif
|
||||
|
||||
#if IS_ENABLED(CONFIG_GDB_STUB) && (ENV_ROMSTAGE || ENV_RAMSTAGE)
|
||||
#if CONFIG(GDB_STUB) && (ENV_ROMSTAGE || ENV_RAMSTAGE)
|
||||
#define CONF_UART_FOR_GDB CONFIG_UART_FOR_CONSOLE
|
||||
static inline void __gdb_hw_init(void) { uart_init(CONF_UART_FOR_GDB); }
|
||||
static inline void __gdb_tx_byte(u8 data)
|
||||
|
@@ -27,10 +27,10 @@ void usb_tx_flush(int idx);
|
||||
unsigned char usb_rx_byte(int idx);
|
||||
int usb_can_rx_byte(int idx);
|
||||
|
||||
#define __CONSOLE_USB_ENABLE__ (IS_ENABLED(CONFIG_CONSOLE_USB) && \
|
||||
((ENV_BOOTBLOCK && IS_ENABLED(CONFIG_USBDEBUG_IN_PRE_RAM)) || \
|
||||
(ENV_ROMSTAGE && IS_ENABLED(CONFIG_USBDEBUG_IN_PRE_RAM)) || \
|
||||
(ENV_POSTCAR && IS_ENABLED(CONFIG_USBDEBUG_IN_PRE_RAM)) || \
|
||||
#define __CONSOLE_USB_ENABLE__ (CONFIG(CONSOLE_USB) && \
|
||||
((ENV_BOOTBLOCK && CONFIG(USBDEBUG_IN_PRE_RAM)) || \
|
||||
(ENV_ROMSTAGE && CONFIG(USBDEBUG_IN_PRE_RAM)) || \
|
||||
(ENV_POSTCAR && CONFIG(USBDEBUG_IN_PRE_RAM)) || \
|
||||
ENV_RAMSTAGE))
|
||||
|
||||
#define USB_PIPE_FOR_CONSOLE 0
|
||||
@@ -50,8 +50,8 @@ static inline void __usb_tx_flush(void) {}
|
||||
#endif
|
||||
|
||||
/* */
|
||||
#if 0 && IS_ENABLED(CONFIG_GDB_STUB) && \
|
||||
((ENV_ROMSTAGE && IS_ENABLED(CONFIG_USBDEBUG_IN_PRE_RAM)) \
|
||||
#if 0 && CONFIG(GDB_STUB) && \
|
||||
((ENV_ROMSTAGE && CONFIG(USBDEBUG_IN_PRE_RAM)) \
|
||||
|| ENV_RAMSTAGE)
|
||||
static inline void __gdb_hw_init(void) { usbdebug_init(); }
|
||||
static inline void __gdb_tx_byte(u8 data)
|
||||
|
Reference in New Issue
Block a user