diff options
author | Julius Werner <jwerner@chromium.org> | 2019-03-05 16:55:15 -0800 |
---|---|---|
committer | Patrick Georgi <pgeorgi@google.com> | 2019-03-07 17:15:30 +0000 |
commit | eab2a29c8bb0fafebd398cf60425dee37df27820 (patch) | |
tree | 419dab747e0148442c1a7ac7082fcfe37784ea27 /payloads/coreinfo | |
parent | b431833c129e0d6402c6f7be8e6028e4b54e94fb (diff) |
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>
Diffstat (limited to 'payloads/coreinfo')
-rw-r--r-- | payloads/coreinfo/bootlog_module.c | 2 | ||||
-rw-r--r-- | payloads/coreinfo/cbfs_module.c | 2 | ||||
-rw-r--r-- | payloads/coreinfo/coreboot_module.c | 2 | ||||
-rw-r--r-- | payloads/coreinfo/coreinfo.c | 26 | ||||
-rw-r--r-- | payloads/coreinfo/cpuinfo_module.c | 2 | ||||
-rw-r--r-- | payloads/coreinfo/multiboot_module.c | 2 | ||||
-rw-r--r-- | payloads/coreinfo/nvram_module.c | 2 | ||||
-rw-r--r-- | payloads/coreinfo/pci_module.c | 2 | ||||
-rw-r--r-- | payloads/coreinfo/ramdump_module.c | 2 | ||||
-rw-r--r-- | payloads/coreinfo/timestamps_module.c | 2 |
10 files changed, 22 insertions, 22 deletions
diff --git a/payloads/coreinfo/bootlog_module.c b/payloads/coreinfo/bootlog_module.c index 1d00744eac..caf5d1317e 100644 --- a/payloads/coreinfo/bootlog_module.c +++ b/payloads/coreinfo/bootlog_module.c @@ -15,7 +15,7 @@ #include "coreinfo.h" -#if IS_ENABLED(CONFIG_MODULE_BOOTLOG) +#if CONFIG(MODULE_BOOTLOG) #define LINES_SHOWN 19 #define TAB_WIDTH 2 diff --git a/payloads/coreinfo/cbfs_module.c b/payloads/coreinfo/cbfs_module.c index 6a04879440..e7cfc8ccc6 100644 --- a/payloads/coreinfo/cbfs_module.c +++ b/payloads/coreinfo/cbfs_module.c @@ -16,7 +16,7 @@ #include "coreinfo.h" #include "endian.h" -#if IS_ENABLED(CONFIG_MODULE_CBFS) +#if CONFIG(MODULE_CBFS) #define FILES_VISIBLE 19 diff --git a/payloads/coreinfo/coreboot_module.c b/payloads/coreinfo/coreboot_module.c index adf8f1434f..d294288cf7 100644 --- a/payloads/coreinfo/coreboot_module.c +++ b/payloads/coreinfo/coreboot_module.c @@ -16,7 +16,7 @@ #include "coreinfo.h" #include <coreboot_tables.h> -#if IS_ENABLED(CONFIG_MODULE_COREBOOT) +#if CONFIG(MODULE_COREBOOT) #define MAX_MEMORY_COUNT 5 diff --git a/payloads/coreinfo/coreinfo.c b/payloads/coreinfo/coreinfo.c index 718c58972f..649bfde837 100644 --- a/payloads/coreinfo/coreinfo.c +++ b/payloads/coreinfo/coreinfo.c @@ -28,34 +28,34 @@ extern struct coreinfo_module cbfs_module; extern struct coreinfo_module timestamps_module; struct coreinfo_module *system_modules[] = { -#if IS_ENABLED(CONFIG_MODULE_CPUINFO) +#if CONFIG(MODULE_CPUINFO) &cpuinfo_module, #endif -#if IS_ENABLED(CONFIG_MODULE_PCI) +#if CONFIG(MODULE_PCI) &pci_module, #endif -#if IS_ENABLED(CONFIG_MODULE_NVRAM) +#if CONFIG(MODULE_NVRAM) &nvram_module, #endif -#if IS_ENABLED(CONFIG_MODULE_RAMDUMP) +#if CONFIG(MODULE_RAMDUMP) &ramdump_module, #endif }; struct coreinfo_module *firmware_modules[] = { -#if IS_ENABLED(CONFIG_MODULE_COREBOOT) +#if CONFIG(MODULE_COREBOOT) &coreboot_module, #endif -#if IS_ENABLED(CONFIG_MODULE_MULTIBOOT) +#if CONFIG(MODULE_MULTIBOOT) &multiboot_module, #endif -#if IS_ENABLED(CONFIG_MODULE_BOOTLOG) +#if CONFIG(MODULE_BOOTLOG) &bootlog_module, #endif -#if IS_ENABLED(CONFIG_MODULE_CBFS) +#if CONFIG(MODULE_CBFS) &cbfs_module, #endif -#if IS_ENABLED(CONFIG_MODULE_TIMESTAMPS) +#if CONFIG(MODULE_TIMESTAMPS) ×tamps_module, #endif }; @@ -114,7 +114,7 @@ static void print_submenu(struct coreinfo_cat *cat) mvwprintw(menuwin, 0, 0, menu); } -#if IS_ENABLED(CONFIG_SHOW_DATE_TIME) +#if CONFIG(SHOW_DATE_TIME) static void print_time_and_date(void) { struct tm tm; @@ -149,7 +149,7 @@ static void print_menu(void) mvwprintw(menuwin, 1, 0, menu); -#if IS_ENABLED(CONFIG_SHOW_DATE_TIME) +#if CONFIG(SHOW_DATE_TIME) print_time_and_date(); #endif } @@ -253,7 +253,7 @@ static void loop(void) while (1) { int ch = -1; -#if IS_ENABLED(CONFIG_SHOW_DATE_TIME) +#if CONFIG(SHOW_DATE_TIME) print_time_and_date(); wrefresh(menuwin); #endif @@ -291,7 +291,7 @@ int main(void) { int i, j; - if (IS_ENABLED(CONFIG_LP_USB)) + if (CONFIG(LP_USB)) usb_initialize(); initscr(); diff --git a/payloads/coreinfo/cpuinfo_module.c b/payloads/coreinfo/cpuinfo_module.c index 72b941ef27..0ea2dfce46 100644 --- a/payloads/coreinfo/cpuinfo_module.c +++ b/payloads/coreinfo/cpuinfo_module.c @@ -18,7 +18,7 @@ #include "coreinfo.h" -#if IS_ENABLED(CONFIG_MODULE_CPUINFO) +#if CONFIG(MODULE_CPUINFO) #include <arch/rdtsc.h> #define VENDOR_INTEL 0x756e6547 diff --git a/payloads/coreinfo/multiboot_module.c b/payloads/coreinfo/multiboot_module.c index 2fc60fabd4..e394dbd732 100644 --- a/payloads/coreinfo/multiboot_module.c +++ b/payloads/coreinfo/multiboot_module.c @@ -16,7 +16,7 @@ #include <multiboot_tables.h> #include "coreinfo.h" -#if IS_ENABLED(CONFIG_MODULE_MULTIBOOT) +#if CONFIG(MODULE_MULTIBOOT) #define MAX_MEMORY_COUNT 10 diff --git a/payloads/coreinfo/nvram_module.c b/payloads/coreinfo/nvram_module.c index 799791134a..45edfb37b7 100644 --- a/payloads/coreinfo/nvram_module.c +++ b/payloads/coreinfo/nvram_module.c @@ -15,7 +15,7 @@ #include "coreinfo.h" -#if IS_ENABLED(CONFIG_MODULE_NVRAM) +#if CONFIG(MODULE_NVRAM) /** * Dump 256 bytes of NVRAM. diff --git a/payloads/coreinfo/pci_module.c b/payloads/coreinfo/pci_module.c index 9f10b12703..ff042af65d 100644 --- a/payloads/coreinfo/pci_module.c +++ b/payloads/coreinfo/pci_module.c @@ -18,7 +18,7 @@ #include <libpayload.h> #include "coreinfo.h" -#if IS_ENABLED(CONFIG_MODULE_PCI) +#if CONFIG(MODULE_PCI) struct pci_devices { pcidev_t device; diff --git a/payloads/coreinfo/ramdump_module.c b/payloads/coreinfo/ramdump_module.c index 8401a61ab1..28d7a0381a 100644 --- a/payloads/coreinfo/ramdump_module.c +++ b/payloads/coreinfo/ramdump_module.c @@ -15,7 +15,7 @@ #include "coreinfo.h" -#if IS_ENABLED(CONFIG_MODULE_RAMDUMP) +#if CONFIG(MODULE_RAMDUMP) static s64 cursor = 0; static s64 cursor_max = (1 * 1024 * 1024 * 1024); /* Max. 1 GB RAM for now. */ diff --git a/payloads/coreinfo/timestamps_module.c b/payloads/coreinfo/timestamps_module.c index fda5a9608a..0978f319b0 100644 --- a/payloads/coreinfo/timestamps_module.c +++ b/payloads/coreinfo/timestamps_module.c @@ -14,7 +14,7 @@ #include "coreinfo.h" #include <commonlib/timestamp_serialized.h> -#if IS_ENABLED(CONFIG_MODULE_TIMESTAMPS) +#if CONFIG(MODULE_TIMESTAMPS) #define LINES_SHOWN 19 #define TAB_WIDTH 2 |