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 | |
| 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')
61 files changed, 176 insertions, 176 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 diff --git a/payloads/external/tint/libpayload_tint.patch b/payloads/external/tint/libpayload_tint.patch index bb197181bc..34246a6561 100644 --- a/payloads/external/tint/libpayload_tint.patch +++ b/payloads/external/tint/libpayload_tint.patch @@ -371,7 +371,7 @@ diff -rupN tint-0.04+nmu1/tint.c tint/tint.c int ch; engine_t engine; /* Initialize */ -+ if (IS_ENABLED(CONFIG_LP_USB)) ++ if (CONFIG(LP_USB)) + usb_initialize(); rand_init (); /* must be called before engine_init () */ engine_init (&engine,score_function); /* must be called before using engine.curshape */ diff --git a/payloads/libpayload/arch/arm/main.c b/payloads/libpayload/arch/arm/main.c index b63e0bec56..cb2d242679 100644 --- a/payloads/libpayload/arch/arm/main.c +++ b/payloads/libpayload/arch/arm/main.c @@ -48,7 +48,7 @@ void start_main(void) lib_get_sysinfo(); /* Optionally set up the consoles. */ -#if !IS_ENABLED(CONFIG_LP_SKIP_CONSOLE_INIT) +#if !CONFIG(LP_SKIP_CONSOLE_INIT) console_init(); #endif diff --git a/payloads/libpayload/arch/arm64/main.c b/payloads/libpayload/arch/arm64/main.c index aa2292ffec..593c40e9a1 100644 --- a/payloads/libpayload/arch/arm64/main.c +++ b/payloads/libpayload/arch/arm64/main.c @@ -123,7 +123,7 @@ void start_main(void) post_sysinfo_scan_mmu_setup(); -#if !IS_ENABLED(CONFIG_LP_SKIP_CONSOLE_INIT) +#if !CONFIG(LP_SKIP_CONSOLE_INIT) console_init(); #endif diff --git a/payloads/libpayload/arch/mips/main.c b/payloads/libpayload/arch/mips/main.c index 9f9326e1d4..b8c0c4d039 100644 --- a/payloads/libpayload/arch/mips/main.c +++ b/payloads/libpayload/arch/mips/main.c @@ -34,7 +34,7 @@ void start_main(void) lib_get_sysinfo(); /* Optionally set up the consoles. */ -#if !IS_ENABLED(CONFIG_LP_SKIP_CONSOLE_INIT) +#if !CONFIG(LP_SKIP_CONSOLE_INIT) console_init(); #endif diff --git a/payloads/libpayload/arch/x86/delay.c b/payloads/libpayload/arch/x86/delay.c index a617ce602e..14056dda33 100644 --- a/payloads/libpayload/arch/x86/delay.c +++ b/payloads/libpayload/arch/x86/delay.c @@ -50,7 +50,7 @@ void arch_ndelay(uint64_t ns) if (ns > APIC_INTERRUPT_LATENCY_NS) apic_us = (ns - APIC_INTERRUPT_LATENCY_NS) / NSECS_PER_USEC; - if (IS_ENABLED(CONFIG_LP_ENABLE_APIC) && apic_initialized() && apic_us) + if (CONFIG(LP_ENABLE_APIC) && apic_initialized() && apic_us) apic_delay(apic_us); if (delta > PAUSE_THRESHOLD_TICKS) diff --git a/payloads/libpayload/arch/x86/exception.c b/payloads/libpayload/arch/x86/exception.c index 983a9f3bd2..13ff58ccbe 100644 --- a/payloads/libpayload/arch/x86/exception.c +++ b/payloads/libpayload/arch/x86/exception.c @@ -173,10 +173,10 @@ void exception_dispatch(void) handlers[vec](vec); goto success; } else if (vec >= EXC_COUNT - && IS_ENABLED(CONFIG_LP_IGNORE_UNKNOWN_INTERRUPTS)) { + && CONFIG(LP_IGNORE_UNKNOWN_INTERRUPTS)) { goto success; } else if (vec >= EXC_COUNT - && IS_ENABLED(CONFIG_LP_LOG_UNKNOWN_INTERRUPTS)) { + && CONFIG(LP_LOG_UNKNOWN_INTERRUPTS)) { printf("Ignoring interrupt vector %u\n", vec); goto success; } @@ -192,7 +192,7 @@ void exception_dispatch(void) return; success: - if (IS_ENABLED(CONFIG_LP_ENABLE_APIC)) + if (CONFIG(LP_ENABLE_APIC)) apic_eoi(vec); } diff --git a/payloads/libpayload/arch/x86/main.c b/payloads/libpayload/arch/x86/main.c index 05ffa0d83b..4da0bba9f7 100644 --- a/payloads/libpayload/arch/x86/main.c +++ b/payloads/libpayload/arch/x86/main.c @@ -52,13 +52,13 @@ int start_main(void) lib_get_sysinfo(); /* Optionally set up the consoles. */ -#if !IS_ENABLED(CONFIG_LP_SKIP_CONSOLE_INIT) +#if !CONFIG(LP_SKIP_CONSOLE_INIT) console_init(); #endif exception_init(); - if (IS_ENABLED(CONFIG_LP_ENABLE_APIC)) { + if (CONFIG(LP_ENABLE_APIC)) { apic_init(); enable_interrupts(); diff --git a/payloads/libpayload/arch/x86/multiboot.c b/payloads/libpayload/arch/x86/multiboot.c index 1cd0295c47..76eeae33ac 100644 --- a/payloads/libpayload/arch/x86/multiboot.c +++ b/payloads/libpayload/arch/x86/multiboot.c @@ -40,7 +40,7 @@ static int mb_add_memrange(struct sysinfo_t *info, unsigned long long base, if (info->n_memranges >= SYSINFO_MAX_MEM_RANGES) return -1; -#if IS_ENABLED(CONFIG_LP_MEMMAP_RAM_ONLY) +#if CONFIG(LP_MEMMAP_RAM_ONLY) /* 1 == normal RAM. Ignore everything else for now */ if (type != 1) return 0; diff --git a/payloads/libpayload/arch/x86/rom_media.c b/payloads/libpayload/arch/x86/rom_media.c index 0c6f521bb5..d9c27fa8b4 100644 --- a/payloads/libpayload/arch/x86/rom_media.c +++ b/payloads/libpayload/arch/x86/rom_media.c @@ -83,7 +83,7 @@ int init_x86rom_cbfs_media(struct cbfs_media *media) { struct cbfs_header *header = (struct cbfs_header*) *(uint32_t*)(0xfffffffc); if (CBFS_HEADER_MAGIC != ntohl(header->magic)) { -#if IS_ENABLED(CONFIG_LP_ROM_SIZE) +#if CONFIG(LP_ROM_SIZE) printk(BIOS_ERR, "Invalid CBFS master header at %p\n", header); media->context = (void*)CONFIG_LP_ROM_SIZE; #else @@ -92,7 +92,7 @@ int init_x86rom_cbfs_media(struct cbfs_media *media) { } else { uint32_t romsize = ntohl(header->romsize); media->context = (void*)romsize; -#if IS_ENABLED(CONFIG_LP_ROM_SIZE) +#if CONFIG(LP_ROM_SIZE) if (CONFIG_LP_ROM_SIZE != romsize) printk(BIOS_INFO, "Warning: rom size unmatch (%d/%d)\n", CONFIG_LP_ROM_SIZE, romsize); diff --git a/payloads/libpayload/arch/x86/sysinfo.c b/payloads/libpayload/arch/x86/sysinfo.c index ddd6550e08..4494f0b415 100644 --- a/payloads/libpayload/arch/x86/sysinfo.c +++ b/payloads/libpayload/arch/x86/sysinfo.c @@ -40,7 +40,7 @@ */ struct sysinfo_t lib_sysinfo = { .cpu_khz = CPU_KHZ_DEFAULT, -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) .ser_ioport = CONFIG_LP_SERIAL_IOBASE, #else .ser_ioport = 0x3f8, @@ -51,7 +51,7 @@ int lib_get_sysinfo(void) { int ret; -#if IS_ENABLED(CONFIG_LP_MULTIBOOT) +#if CONFIG(LP_MULTIBOOT) /* Get the information from the multiboot tables, * if they exist */ get_multiboot_info(&lib_sysinfo); diff --git a/payloads/libpayload/crypto/sha1.c b/payloads/libpayload/crypto/sha1.c index 721d1a4da7..fc4a4f31da 100644 --- a/payloads/libpayload/crypto/sha1.c +++ b/payloads/libpayload/crypto/sha1.c @@ -30,7 +30,7 @@ typedef unsigned int u_int; /* Moved from libpayload.h */ -#if IS_ENABLED(CONFIG_LP_LITTLE_ENDIAN) +#if CONFIG(LP_LITTLE_ENDIAN) #define BYTE_ORDER LITTLE_ENDIAN #else #define BYTE_ORDER BIG_ENDIAN diff --git a/payloads/libpayload/curses/keyboard.c b/payloads/libpayload/curses/keyboard.c index f571d564ff..fe9dc34cb5 100644 --- a/payloads/libpayload/curses/keyboard.c +++ b/payloads/libpayload/curses/keyboard.c @@ -45,7 +45,7 @@ static int _halfdelay = 0; /* ============== Serial ==================== */ -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) /* We treat serial like a vt100 terminal. For now we do the cooking in here, but we should probably eventually pass it to dedicated vt100 code */ @@ -146,13 +146,13 @@ static int cook_serial(unsigned char ch) static int curses_getchar(int _delay) { -#if IS_ENABLED(CONFIG_LP_USB_HID) || IS_ENABLED(CONFIG_LP_PC_KEYBOARD) || \ - IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_USB_HID) || CONFIG(LP_PC_KEYBOARD) || \ + CONFIG(LP_SERIAL_CONSOLE) unsigned short c; #endif do { -#if IS_ENABLED(CONFIG_LP_USB_HID) +#if CONFIG(LP_USB_HID) usb_poll(); if ((curses_flags & F_ENABLE_CONSOLE) && usbhid_havechar()) { @@ -160,7 +160,7 @@ static int curses_getchar(int _delay) if (c != 0) return c; } #endif -#if IS_ENABLED(CONFIG_LP_PC_KEYBOARD) +#if CONFIG(LP_PC_KEYBOARD) if ((curses_flags & F_ENABLE_CONSOLE) && keyboard_havechar()) { c = keyboard_getchar(); @@ -168,7 +168,7 @@ static int curses_getchar(int _delay) } #endif -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if ((curses_flags & F_ENABLE_SERIAL) && serial_havechar()) { c = serial_getchar(); @@ -226,7 +226,7 @@ int nocbreak(void) return 0; } -#if IS_ENABLED(CONFIG_LP_VGA_VIDEO_CONSOLE) +#if CONFIG(LP_VGA_VIDEO_CONSOLE) void curses_enable_vga(int state) { if (state) @@ -244,7 +244,7 @@ void curses_enable_vga(int state) { } int curses_vga_enabled(void) { return 0; } #endif -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) void curses_enable_serial(int state) { if (state) diff --git a/payloads/libpayload/curses/local.h b/payloads/libpayload/curses/local.h index 660f5db581..274c389cb2 100644 --- a/payloads/libpayload/curses/local.h +++ b/payloads/libpayload/curses/local.h @@ -70,13 +70,13 @@ /* Flags used to determine what output methods are available */ -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) #define F_ENABLE_CONSOLE 0x01 #else #define F_ENABLE_CONSOLE 0x00 #endif -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) #define F_ENABLE_SERIAL 0x02 #else #define F_ENABLE_SERIAL 0x00 diff --git a/payloads/libpayload/curses/pdcurses-backend/pdcdisp.c b/payloads/libpayload/curses/pdcurses-backend/pdcdisp.c index af1b50a3eb..234d62a84b 100644 --- a/payloads/libpayload/curses/pdcurses-backend/pdcdisp.c +++ b/payloads/libpayload/curses/pdcurses-backend/pdcdisp.c @@ -66,8 +66,8 @@ chtype fallback_acs_map[128] = '|', '<', '>', '*', '!', 'f', 'o', ' ', }; -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) -#if IS_ENABLED(CONFIG_LP_SERIAL_ACS_FALLBACK) +#if CONFIG(LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_ACS_FALLBACK) chtype serial_acs_map[128]; #else /* See acsc of vt100. */ @@ -93,7 +93,7 @@ chtype serial_acs_map[128] = #endif #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) /* See acsc of linux. */ chtype console_acs_map[128] = { @@ -122,10 +122,10 @@ void PDC_gotoyx(int row, int col) { PDC_LOG(("PDC_gotoyx() - called: row %d col %d\n", row, col)); -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) serial_set_cursor(col, row); #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) video_console_set_cursor(col, row); #endif } @@ -139,7 +139,7 @@ void PDC_transform_line(int lineno, int x, int len, const chtype *srcp) PDC_LOG(("PDC_transform_line() - called: line %d, len %d, curses_flags %d\n", lineno, len, curses_flags)); -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) int serial_is_bold = 0; int serial_is_reverse = 0; int serial_is_altcharset = 0; @@ -157,7 +157,7 @@ void PDC_transform_line(int lineno, int x, int len, const chtype *srcp) { ch = srcp[j]; attr = ch; -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if (curses_flags & F_ENABLE_SERIAL) { if (attr & A_BOLD) { if (!serial_is_bold) { @@ -222,7 +222,7 @@ void PDC_transform_line(int lineno, int x, int len, const chtype *srcp) } #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) unsigned char c = pdc_atrtab[srcp[j] >> PDC_ATTR_SHIFT]; if (curses_flags & F_ENABLE_CONSOLE) { diff --git a/payloads/libpayload/curses/pdcurses-backend/pdckbd.c b/payloads/libpayload/curses/pdcurses-backend/pdckbd.c index 6b5b7eade1..2d8a55b4ca 100644 --- a/payloads/libpayload/curses/pdcurses-backend/pdckbd.c +++ b/payloads/libpayload/curses/pdcurses-backend/pdckbd.c @@ -5,7 +5,7 @@ unsigned long pdc_key_modifiers = 0L; -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) /* We treat serial like a vt100 terminal. For now we do the cooking in here, but we should probably eventually pass it to dedicated vt100 code */ @@ -108,7 +108,7 @@ void PDC_set_keyboard_binary(bool on) bool PDC_check_key(void) { -#if IS_ENABLED(CONFIG_LP_USB_HID) +#if CONFIG(LP_USB_HID) usb_poll(); if ((curses_flags & F_ENABLE_CONSOLE) && usbhid_havechar()) { @@ -116,14 +116,14 @@ bool PDC_check_key(void) } #endif -#if IS_ENABLED(CONFIG_LP_PC_KEYBOARD) +#if CONFIG(LP_PC_KEYBOARD) if ((curses_flags & F_ENABLE_CONSOLE) && keyboard_havechar()) { return TRUE; } #endif -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if ((curses_flags & F_ENABLE_SERIAL) && serial_havechar()) { return TRUE; @@ -139,7 +139,7 @@ int PDC_get_key(void) { int c = 0; -#if IS_ENABLED(CONFIG_LP_USB_HID) +#if CONFIG(LP_USB_HID) usb_poll(); if ((curses_flags & F_ENABLE_CONSOLE) && usbhid_havechar()) { @@ -147,14 +147,14 @@ int PDC_get_key(void) } #endif -#if IS_ENABLED(CONFIG_LP_PC_KEYBOARD) +#if CONFIG(LP_PC_KEYBOARD) if ((curses_flags & F_ENABLE_CONSOLE) && keyboard_havechar() && (c == 0)) { c = keyboard_getchar(); } #endif -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if ((curses_flags & F_ENABLE_SERIAL) && serial_havechar() && (c == 0)) { c = cook_serial(serial_getchar()); diff --git a/payloads/libpayload/curses/pdcurses-backend/pdcscrn.c b/payloads/libpayload/curses/pdcurses-backend/pdcscrn.c index e33edc2167..6286b7f600 100644 --- a/payloads/libpayload/curses/pdcurses-backend/pdcscrn.c +++ b/payloads/libpayload/curses/pdcurses-backend/pdcscrn.c @@ -72,7 +72,7 @@ int PDC_scr_open(int argc, char **argv) SP->lines = PDC_get_rows(); SP->cols = PDC_get_columns(); -#if IS_ENABLED(CONFIG_LP_SPEAKER) +#if CONFIG(LP_SPEAKER) SP->audible = TRUE; #endif diff --git a/payloads/libpayload/curses/pdcurses-backend/pdcsetsc.c b/payloads/libpayload/curses/pdcurses-backend/pdcsetsc.c index ba230c654b..adcf06926a 100644 --- a/payloads/libpayload/curses/pdcurses-backend/pdcsetsc.c +++ b/payloads/libpayload/curses/pdcurses-backend/pdcsetsc.c @@ -13,12 +13,12 @@ int PDC_curs_set(int visibility) ret_vis = SP->visibility; SP->visibility = visibility; -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if (curses_flags & F_ENABLE_SERIAL) { serial_cursor_enable(visibility); } #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) if (curses_flags & F_ENABLE_CONSOLE) { video_console_cursor_enable(visibility); } diff --git a/payloads/libpayload/curses/pdcurses-backend/pdcutil.c b/payloads/libpayload/curses/pdcurses-backend/pdcutil.c index d423f0cf29..f3f131f073 100644 --- a/payloads/libpayload/curses/pdcurses-backend/pdcutil.c +++ b/payloads/libpayload/curses/pdcurses-backend/pdcutil.c @@ -11,7 +11,7 @@ void PDC_beep(void) { PDC_LOG(("PDC_beep() - called\n")); -#if IS_ENABLED(CONFIG_LP_SPEAKER) +#if CONFIG(LP_SPEAKER) speaker_tone(1760, 500); /* 1760 == note A6 */ #endif } diff --git a/payloads/libpayload/curses/tinycurses.c b/payloads/libpayload/curses/tinycurses.c index 789accb475..c50f10bbcc 100644 --- a/payloads/libpayload/curses/tinycurses.c +++ b/payloads/libpayload/curses/tinycurses.c @@ -111,8 +111,8 @@ chtype fallback_acs_map[128] = '|', '<', '>', '*', '!', 'f', 'o', ' ', }; -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) -#if IS_ENABLED(CONFIG_LP_SERIAL_ACS_FALLBACK) +#if CONFIG(LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_ACS_FALLBACK) chtype serial_acs_map[128]; #else /* See acsc of vt100. */ @@ -138,7 +138,7 @@ chtype serial_acs_map[128] = #endif #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) /* See acsc of linux. */ chtype console_acs_map[128] = { @@ -191,7 +191,7 @@ NCURSES_CH_T _nc_render(WINDOW *win, NCURSES_CH_T ch) int beep(void) { /* TODO: Flash the screen if beeping fails? */ -#if IS_ENABLED(CONFIG_LP_SPEAKER) +#if CONFIG(LP_SPEAKER) speaker_tone(1760, 500); /* 1760 == note A6 */ #endif return OK; @@ -202,12 +202,12 @@ int cbreak(void) { /* TODO */ return 0; } // int color_content(short color, short *r, short *g, short *b) {} int curs_set(int on) { -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if (curses_flags & F_ENABLE_SERIAL) { serial_cursor_enable(on); } #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) if (curses_flags & F_ENABLE_CONSOLE) { video_console_cursor_enable(on); } @@ -315,12 +315,12 @@ WINDOW *initscr(void) for (i = 0; i < 128; i++) acs_map[i] = (chtype) i | A_ALTCHARSET; -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if (curses_flags & F_ENABLE_SERIAL) { serial_clear(); } #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) if (curses_flags & F_ENABLE_CONSOLE) { /* Clear the screen and kill the cursor */ @@ -724,7 +724,7 @@ int whline(WINDOW *win, chtype ch, int n) (((c) & 0x4400) >> 2) | ((c) & 0xAA00) | (((c) & 0x1100) << 2) int wnoutrefresh(WINDOW *win) { -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) // FIXME. int serial_is_bold = 0; int serial_is_reverse = 0; @@ -737,7 +737,7 @@ int wnoutrefresh(WINDOW *win) int x, y; chtype ch; -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) serial_end_bold(); serial_end_altcharset(); #endif @@ -749,7 +749,7 @@ int wnoutrefresh(WINDOW *win) /* Position the serial cursor */ -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if (curses_flags & F_ENABLE_SERIAL) serial_set_cursor(win->_begy + y, win->_begx + win->_line[y].firstchar); @@ -758,7 +758,7 @@ int wnoutrefresh(WINDOW *win) for (x = win->_line[y].firstchar; x <= win->_line[y].lastchar; x++) { attr_t attr = win->_line[y].text[x].attr; -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if (curses_flags & F_ENABLE_SERIAL) { ch = win->_line[y].text[x].chars[0]; @@ -824,7 +824,7 @@ int wnoutrefresh(WINDOW *win) } #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) unsigned int c = ((int)color_pairs[PAIR_NUMBER(attr)]) << 8; @@ -865,12 +865,12 @@ int wnoutrefresh(WINDOW *win) win->_line[y].lastchar = _NOCHANGE; } -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) if (curses_flags & F_ENABLE_SERIAL) serial_set_cursor(win->_begy + win->_cury, win->_begx + win->_curx); #endif -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) if (curses_flags & F_ENABLE_CONSOLE) video_console_set_cursor(win->_begx + win->_curx, win->_begy + win->_cury); #endif diff --git a/payloads/libpayload/drivers/i8042/i8042.c b/payloads/libpayload/drivers/i8042/i8042.c index 4cdd0be7ad..e97fab8429 100644 --- a/payloads/libpayload/drivers/i8042/i8042.c +++ b/payloads/libpayload/drivers/i8042/i8042.c @@ -229,7 +229,7 @@ u8 i8042_probe(void) } /* Test secondary port */ - if (IS_ENABLED(CONFIG_LP_PC_MOUSE)) { + if (CONFIG(LP_PC_MOUSE)) { if (i8042_cmd_with_response(I8042_CMD_AUX_TEST) == 0) aux_fifo = fifo_init(4 * 32); } diff --git a/payloads/libpayload/drivers/i8042/keyboard.c b/payloads/libpayload/drivers/i8042/keyboard.c index a0d5b63e13..be22497898 100644 --- a/payloads/libpayload/drivers/i8042/keyboard.c +++ b/payloads/libpayload/drivers/i8042/keyboard.c @@ -45,7 +45,7 @@ static struct layout_maps *map; static int modifier = 0; static struct layout_maps keyboard_layouts[] = { -#if IS_ENABLED(CONFIG_LP_PC_KEYBOARD_LAYOUT_US) +#if CONFIG(LP_PC_KEYBOARD_LAYOUT_US) { .country = "us", .map = { { /* No modifier */ 0x00, 0x1B, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, @@ -101,7 +101,7 @@ static struct layout_maps keyboard_layouts[] = { } }}, #endif -#if IS_ENABLED(CONFIG_LP_PC_KEYBOARD_LAYOUT_DE) +#if CONFIG(LP_PC_KEYBOARD_LAYOUT_DE) { .country = "de", .map = { { /* No modifier */ 0x00, 0x1B, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, @@ -309,16 +309,16 @@ void keyboard_init(void) /* Set scancode set 1 */ ret = keyboard_cmd(I8042_KBCMD_SET_SCANCODE); - if (!ret && !IS_ENABLED(CONFIG_LP_PC_KEYBOARD_IGNORE_INIT_FAILURE)) + if (!ret && !CONFIG(LP_PC_KEYBOARD_IGNORE_INIT_FAILURE)) return; ret = keyboard_cmd(I8042_SCANCODE_SET_1); - if (!ret && !IS_ENABLED(CONFIG_LP_PC_KEYBOARD_IGNORE_INIT_FAILURE)) + if (!ret && !CONFIG(LP_PC_KEYBOARD_IGNORE_INIT_FAILURE)) return; /* Enable scanning */ ret = keyboard_cmd(I8042_KBCMD_EN); - if (!ret && !IS_ENABLED(CONFIG_LP_PC_KEYBOARD_IGNORE_INIT_FAILURE)) + if (!ret && !CONFIG(LP_PC_KEYBOARD_IGNORE_INIT_FAILURE)) return; console_add_input_driver(&cons); diff --git a/payloads/libpayload/drivers/mouse_cursor.c b/payloads/libpayload/drivers/mouse_cursor.c index 40c8934889..7006b4dee0 100644 --- a/payloads/libpayload/drivers/mouse_cursor.c +++ b/payloads/libpayload/drivers/mouse_cursor.c @@ -60,7 +60,7 @@ void mouse_cursor_add_input_driver(struct mouse_cursor_input_driver *const in) /** Init enabled mouse cursor drivers */ void mouse_cursor_init(void) { -#if IS_ENABLED(CONFIG_LP_PC_MOUSE) +#if CONFIG(LP_PC_MOUSE) i8042_mouse_init(); #endif } diff --git a/payloads/libpayload/drivers/nvram.c b/payloads/libpayload/drivers/nvram.c index c82533173f..a116d1b65f 100644 --- a/payloads/libpayload/drivers/nvram.c +++ b/payloads/libpayload/drivers/nvram.c @@ -60,7 +60,7 @@ * doesn't try to do this on its own. */ #define RTC_PORT_STANDARD 0x70 -#if IS_ENABLED(CONFIG_LP_RTC_PORT_EXTENDED_VIA) +#if CONFIG(LP_RTC_PORT_EXTENDED_VIA) #define RTC_PORT_EXTENDED 0x74 #else #define RTC_PORT_EXTENDED 0x72 diff --git a/payloads/libpayload/drivers/serial/8250.c b/payloads/libpayload/drivers/serial/8250.c index 9327304248..f503bdb124 100644 --- a/payloads/libpayload/drivers/serial/8250.c +++ b/payloads/libpayload/drivers/serial/8250.c @@ -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); diff --git a/payloads/libpayload/drivers/storage/ahci.c b/payloads/libpayload/drivers/storage/ahci.c index bb0d37eecb..fbfcf97255 100644 --- a/payloads/libpayload/drivers/storage/ahci.c +++ b/payloads/libpayload/drivers/storage/ahci.c @@ -153,7 +153,7 @@ static int ahci_dev_init(hba_ctrl_t *const ctrl, switch (port->signature) { case HBA_PxSIG_ATA: printf("ahci: ATA drive on port #%d.\n", portnum); -#if IS_ENABLED(CONFIG_LP_STORAGE_ATA) +#if CONFIG(LP_STORAGE_ATA) dev->ata_dev.identify = ahci_identify_device; dev->ata_dev.read_sectors = ahci_ata_read_sectors; return ata_attach_device(&dev->ata_dev, PORT_TYPE_SATA); @@ -161,7 +161,7 @@ static int ahci_dev_init(hba_ctrl_t *const ctrl, break; case HBA_PxSIG_ATAPI: printf("ahci: ATAPI drive on port #%d.\n", portnum); -#if IS_ENABLED(CONFIG_LP_STORAGE_ATAPI) +#if CONFIG(LP_STORAGE_ATAPI) dev->atapi_dev.identify = ahci_identify_device; dev->atapi_dev.packet_read_cmd = ahci_packet_read_cmd; return atapi_attach_device(&dev->atapi_dev, PORT_TYPE_SATA); @@ -218,7 +218,7 @@ static void ahci_port_probe(hba_ctrl_t *const ctrl, ahci_dev_init(ctrl, port, portnum); } -#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI_ONLY_TESTED) +#if CONFIG(LP_STORAGE_AHCI_ONLY_TESTED) static u32 working_controllers[] = { 0x8086 | 0x2929 << 16, /* Mobile ICH9 */ 0x8086 | 0x1c03 << 16, /* Mobile Cougar Point PCH */ @@ -236,7 +236,7 @@ static void ahci_init_pci(pcidev_t dev) const u16 vendor = pci_read_config16(dev, 0x00); const u16 device = pci_read_config16(dev, 0x02); -#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI_ONLY_TESTED) +#if CONFIG(LP_STORAGE_AHCI_ONLY_TESTED) const u32 vendor_device = pci_read_config32(dev, 0x0); for (i = 0; i < ARRAY_SIZE(working_controllers); ++i) if (vendor_device == working_controllers[i]) diff --git a/payloads/libpayload/drivers/storage/ahci_ata.c b/payloads/libpayload/drivers/storage/ahci_ata.c index 2c916fda49..94c13e009c 100644 --- a/payloads/libpayload/drivers/storage/ahci_ata.c +++ b/payloads/libpayload/drivers/storage/ahci_ata.c @@ -56,7 +56,7 @@ ssize_t ahci_ata_read_sectors(ata_dev_t *const ata_dev, printf("ahci: Sector count too high (max. 256).\n"); count = 256; } -#if IS_ENABLED(CONFIG_LP_STORAGE_64BIT_LBA) +#if CONFIG(LP_STORAGE_64BIT_LBA) } else if (ata_dev->read_cmd == ATA_READ_DMA_EXT) { if (start >= (1ULL << 48)) { printf("ahci: Sector is not 48-bit addressable.\n"); @@ -84,7 +84,7 @@ ssize_t ahci_ata_read_sectors(ata_dev_t *const ata_dev, dev->cmdtable->fis[ 6] = (start >> 16) & 0xff; dev->cmdtable->fis[ 7] = FIS_H2D_DEV_LBA; dev->cmdtable->fis[ 8] = (start >> 24) & 0xff; -#if IS_ENABLED(CONFIG_LP_STORAGE_64BIT_LBA) +#if CONFIG(LP_STORAGE_64BIT_LBA) if (ata_dev->read_cmd == ATA_READ_DMA_EXT) { dev->cmdtable->fis[ 9] = (start >> 32) & 0xff; dev->cmdtable->fis[10] = (start >> 40) & 0xff; diff --git a/payloads/libpayload/drivers/storage/ata.c b/payloads/libpayload/drivers/storage/ata.c index 80178c313d..91ddf59e60 100644 --- a/payloads/libpayload/drivers/storage/ata.c +++ b/payloads/libpayload/drivers/storage/ata.c @@ -212,7 +212,7 @@ int ata_attach_device(ata_dev_t *const dev, const storage_port_t port_type) ata_strncpy(model, id + 27, sizeof(model)); printf("ata: Identified %s [%s]\n", model, fw); -#if IS_ENABLED(CONFIG_LP_STORAGE_64BIT_LBA) +#if CONFIG(LP_STORAGE_64BIT_LBA) if (id[ATA_CMDS_AND_FEATURE_SETS + 1] & (1 << 10)) { printf("ata: Support for LBA-48 enabled.\n"); dev->read_cmd = ATA_READ_DMA_EXT; diff --git a/payloads/libpayload/drivers/storage/storage.c b/payloads/libpayload/drivers/storage/storage.c index c4cfd40293..a7141ee772 100644 --- a/payloads/libpayload/drivers/storage/storage.c +++ b/payloads/libpayload/drivers/storage/storage.c @@ -28,7 +28,7 @@ */ #include <libpayload.h> -#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI) +#if CONFIG(LP_STORAGE_AHCI) # include <storage/ahci.h> #endif #include <storage/storage.h> @@ -110,7 +110,7 @@ ssize_t storage_read_blocks512(const size_t dev_num, */ void storage_initialize(void) { -#if IS_ENABLED(CONFIG_LP_STORAGE_AHCI) +#if CONFIG(LP_STORAGE_AHCI) ahci_initialize(); #endif } diff --git a/payloads/libpayload/drivers/usb/ehci.c b/payloads/libpayload/drivers/usb/ehci.c index eb59d979a5..30cf191433 100644 --- a/payloads/libpayload/drivers/usb/ehci.c +++ b/payloads/libpayload/drivers/usb/ehci.c @@ -850,7 +850,7 @@ ehci_init (unsigned long physical_bar) return controller; } -#if IS_ENABLED(CONFIG_LP_USB_PCI) +#if CONFIG(LP_USB_PCI) hci_t * ehci_pci_init (pcidev_t addr) { diff --git a/payloads/libpayload/drivers/usb/ehci_rh.c b/payloads/libpayload/drivers/usb/ehci_rh.c index da8d8aff8b..d3fc9799a9 100644 --- a/payloads/libpayload/drivers/usb/ehci_rh.c +++ b/payloads/libpayload/drivers/usb/ehci_rh.c @@ -102,7 +102,7 @@ ehci_rh_scanport (usbdev_t *dev, int port) /* device connected, handle */ if (RH_INST(dev)->ports[port] & P_CURR_CONN_STATUS) { mdelay(100); // usb20 spec 9.1.2 - if (!IS_ENABLED(CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT) && + if (!CONFIG(LP_USB_EHCI_HOSTPC_ROOT_HUB_TT) && (RH_INST(dev)->ports[port] & P_LINE_STATUS) == P_LINE_STATUS_LOWSPEED) { ehci_rh_hand_over_port(dev, port); @@ -138,7 +138,7 @@ ehci_rh_scanport (usbdev_t *dev, int port) ehci_rh_hand_over_port(dev, port); return; } - if (IS_ENABLED(CONFIG_LP_USB_EHCI_HOSTPC_ROOT_HUB_TT)) { + if (CONFIG(LP_USB_EHCI_HOSTPC_ROOT_HUB_TT)) { port_speed = (usb_speed) ((EHCI_INST(dev->controller)->operation->hostpc >> 25) & 0x03); diff --git a/payloads/libpayload/drivers/usb/ohci.c b/payloads/libpayload/drivers/usb/ohci.c index dcf7169f6a..1964689b41 100644 --- a/payloads/libpayload/drivers/usb/ohci.c +++ b/payloads/libpayload/drivers/usb/ohci.c @@ -247,7 +247,7 @@ ohci_init (unsigned long physical_bar) return controller; } -#if IS_ENABLED(CONFIG_LP_USB_PCI) +#if CONFIG(LP_USB_PCI) hci_t * ohci_pci_init (pcidev_t addr) { diff --git a/payloads/libpayload/drivers/usb/usb.c b/payloads/libpayload/drivers/usb/usb.c index 62604a27ca..9c9854da76 100644 --- a/payloads/libpayload/drivers/usb/usb.c +++ b/payloads/libpayload/drivers/usb/usb.c @@ -563,7 +563,7 @@ set_address (hci_t *controller, usb_speed speed, int hubport, int hubaddr) break; case hid_device: usb_debug ("HID\n"); -#if IS_ENABLED(CONFIG_LP_USB_HID) +#if CONFIG(LP_USB_HID) dev->init = usb_hid_init; return dev->address; #else @@ -581,7 +581,7 @@ set_address (hci_t *controller, usb_speed speed, int hubport, int hubaddr) break; case msc_device: usb_debug ("MSC\n"); -#if IS_ENABLED(CONFIG_LP_USB_MSC) +#if CONFIG(LP_USB_MSC) dev->init = usb_msc_init; return dev->address; #else @@ -590,7 +590,7 @@ set_address (hci_t *controller, usb_speed speed, int hubport, int hubaddr) break; case hub_device: usb_debug ("hub\n"); -#if IS_ENABLED(CONFIG_LP_USB_HUB) +#if CONFIG(LP_USB_HUB) dev->init = usb_hub_init; return dev->address; #else diff --git a/payloads/libpayload/drivers/usb/usbhid.c b/payloads/libpayload/drivers/usb/usbhid.c index 22ed8e7885..072530cc5e 100644 --- a/payloads/libpayload/drivers/usb/usbhid.c +++ b/payloads/libpayload/drivers/usb/usbhid.c @@ -142,7 +142,7 @@ struct layout_maps { static const struct layout_maps *map; static const struct layout_maps keyboard_layouts[] = { -// #if IS_ENABLED(CONFIG_LP_PC_KEYBOARD_LAYOUT_US) +// #if CONFIG(LP_PC_KEYBOARD_LAYOUT_US) { .country = "us", .map = { { /* No modifier */ -1, -1, -1, -1, 'a', 'b', 'c', 'd', diff --git a/payloads/libpayload/drivers/usb/usbinit.c b/payloads/libpayload/drivers/usb/usbinit.c index 721fde8a93..0ac27e4456 100644 --- a/payloads/libpayload/drivers/usb/usbinit.c +++ b/payloads/libpayload/drivers/usb/usbinit.c @@ -37,7 +37,7 @@ #include "dwc2.h" #include <usb/usbdisk.h> -#if IS_ENABLED(CONFIG_LP_USB_PCI) +#if CONFIG(LP_USB_PCI) /** * Initializes USB controller attached to PCI * @@ -72,7 +72,7 @@ static int usb_controller_initialize(int bus, int dev, int func) pciid >> 16, pciid & 0xFFFF, func); switch (prog_if) { case 0x00: -#if IS_ENABLED(CONFIG_LP_USB_UHCI) +#if CONFIG(LP_USB_UHCI) usb_debug("UHCI controller\n"); uhci_pci_init (pci_device); #else @@ -81,7 +81,7 @@ static int usb_controller_initialize(int bus, int dev, int func) break; case 0x10: -#if IS_ENABLED(CONFIG_LP_USB_OHCI) +#if CONFIG(LP_USB_OHCI) usb_debug("OHCI controller\n"); ohci_pci_init(pci_device); #else @@ -90,7 +90,7 @@ static int usb_controller_initialize(int bus, int dev, int func) break; case 0x20: -#if IS_ENABLED(CONFIG_LP_USB_EHCI) +#if CONFIG(LP_USB_EHCI) usb_debug("EHCI controller\n"); ehci_pci_init(pci_device); #else @@ -99,7 +99,7 @@ static int usb_controller_initialize(int bus, int dev, int func) break; case 0x30: -#if IS_ENABLED(CONFIG_LP_USB_XHCI) +#if CONFIG(LP_USB_XHCI) usb_debug("xHCI controller\n"); xhci_pci_init(pci_device); #else @@ -166,7 +166,7 @@ static void usb_scan_pci_bus(int bus) */ int usb_initialize(void) { -#if IS_ENABLED(CONFIG_LP_USB_PCI) +#if CONFIG(LP_USB_PCI) usb_scan_pci_bus(0); #endif return 0; @@ -175,19 +175,19 @@ int usb_initialize(void) hci_t *usb_add_mmio_hc(hc_type type, void *bar) { switch (type) { -#if IS_ENABLED(CONFIG_LP_USB_OHCI) +#if CONFIG(LP_USB_OHCI) case OHCI: return ohci_init((unsigned long)bar); #endif -#if IS_ENABLED(CONFIG_LP_USB_EHCI) +#if CONFIG(LP_USB_EHCI) case EHCI: return ehci_init((unsigned long)bar); #endif -#if IS_ENABLED(CONFIG_LP_USB_DWC2) +#if CONFIG(LP_USB_DWC2) case DWC2: return dwc2_init(bar); #endif -#if IS_ENABLED(CONFIG_LP_USB_XHCI) +#if CONFIG(LP_USB_XHCI) case XHCI: return xhci_init((unsigned long)bar); #endif diff --git a/payloads/libpayload/drivers/usb/xhci.c b/payloads/libpayload/drivers/usb/xhci.c index 3f1064a405..0a69c5137b 100644 --- a/payloads/libpayload/drivers/usb/xhci.c +++ b/payloads/libpayload/drivers/usb/xhci.c @@ -88,7 +88,7 @@ xhci_init_cycle_ring(transfer_ring_t *const tr, const size_t ring_size) } /* On Panther Point: switch ports shared with EHCI to xHCI */ -#if IS_ENABLED(CONFIG_LP_USB_PCI) +#if CONFIG(LP_USB_PCI) static void xhci_switch_ppt_ports(pcidev_t addr) { @@ -112,7 +112,7 @@ xhci_switch_ppt_ports(pcidev_t addr) } #endif -#if IS_ENABLED(CONFIG_LP_USB_PCI) +#if CONFIG(LP_USB_PCI) /* On Panther Point: switch all ports back to EHCI */ static void xhci_switchback_ppt_ports(pcidev_t addr) @@ -297,7 +297,7 @@ _free_xhci: return NULL; } -#if IS_ENABLED(CONFIG_LP_USB_PCI) +#if CONFIG(LP_USB_PCI) hci_t * xhci_pci_init (pcidev_t addr) { @@ -336,7 +336,7 @@ xhci_reset(hci_t *const controller) * Without this delay, the subsequent HC register access, * may result in a system hang very rarely. */ - if (IS_ENABLED(CONFIG_LP_ARCH_X86)) + if (CONFIG(LP_ARCH_X86)) mdelay(1); xhci_debug("Resetting controller... "); @@ -426,7 +426,7 @@ xhci_shutdown(hci_t *const controller) xhci_t *const xhci = XHCI_INST(controller); xhci_stop(controller); -#if IS_ENABLED(CONFIG_LP_USB_PCI) +#if CONFIG(LP_USB_PCI) if (controller->pcidev) xhci_switchback_ppt_ports(controller->pcidev); #endif @@ -563,7 +563,7 @@ xhci_enqueue_td(transfer_ring_t *const tr, const int ep, const size_t mps, cur_length = length; packets = 0; length = 0; - } else if (!IS_ENABLED(CONFIG_LP_USB_XHCI_MTK_QUIRK)) { + } else if (!CONFIG(LP_USB_XHCI_MTK_QUIRK)) { packets -= (residue + cur_length) / mps; residue = (residue + cur_length) % mps; length -= cur_length; @@ -576,7 +576,7 @@ xhci_enqueue_td(transfer_ring_t *const tr, const int ep, const size_t mps, TRB_SET(TDS, trb, MIN(TRB_MAX_TD_SIZE, packets)); TRB_SET(CH, trb, 1); - if (length && IS_ENABLED(CONFIG_LP_USB_XHCI_MTK_QUIRK)) { + if (length && CONFIG(LP_USB_XHCI_MTK_QUIRK)) { /* * For MTK's xHCI controller, TDS defines a number of * packets that remain to be transferred for a TD after diff --git a/payloads/libpayload/drivers/usb/xhci_devconf.c b/payloads/libpayload/drivers/usb/xhci_devconf.c index b697b0fd0f..99e3037304 100644 --- a/payloads/libpayload/drivers/usb/xhci_devconf.c +++ b/payloads/libpayload/drivers/usb/xhci_devconf.c @@ -353,7 +353,7 @@ xhci_finish_ep_config(const endpoint_t *const ep, inputctx_t *const ic) EC_SET(AVRTRB, epctx, avrtrb); EC_SET(MXESIT, epctx, EC_GET(MPS, epctx) * EC_GET(MBS, epctx)); - if (IS_ENABLED(CONFIG_LP_USB_XHCI_MTK_QUIRK)) { + if (CONFIG(LP_USB_XHCI_MTK_QUIRK)) { /* The MTK xHCI defines some extra SW parameters which are * put into reserved DWs in Slot and Endpoint Contexts for * synchronous endpoints. But for non-isochronous transfers, diff --git a/payloads/libpayload/drivers/usb/xhci_rh.c b/payloads/libpayload/drivers/usb/xhci_rh.c index ddf6ce80a4..453fa5b409 100644 --- a/payloads/libpayload/drivers/usb/xhci_rh.c +++ b/payloads/libpayload/drivers/usb/xhci_rh.c @@ -122,7 +122,7 @@ xhci_rh_reset_port(usbdev_t *const dev, const int port) static int xhci_rh_enable_port(usbdev_t *const dev, int port) { - if (IS_ENABLED(CONFIG_LP_USB_XHCI_MTK_QUIRK)) { + if (CONFIG(LP_USB_XHCI_MTK_QUIRK)) { xhci_t *const xhci = XHCI_INST(dev->controller); volatile u32 *const portsc = &xhci->opreg->prs[port - 1].portsc; diff --git a/payloads/libpayload/drivers/video/video.c b/payloads/libpayload/drivers/video/video.c index b932a63555..9ab7ba20a5 100644 --- a/payloads/libpayload/drivers/video/video.c +++ b/payloads/libpayload/drivers/video/video.c @@ -31,27 +31,27 @@ #include <libpayload.h> #include <video_console.h> -#if IS_ENABLED(CONFIG_LP_GEODELX_VIDEO_CONSOLE) +#if CONFIG(LP_GEODELX_VIDEO_CONSOLE) extern struct video_console geodelx_video_console; #endif -#if IS_ENABLED(CONFIG_LP_COREBOOT_VIDEO_CONSOLE) +#if CONFIG(LP_COREBOOT_VIDEO_CONSOLE) extern struct video_console coreboot_video_console; #endif -#if IS_ENABLED(CONFIG_LP_VGA_VIDEO_CONSOLE) +#if CONFIG(LP_VGA_VIDEO_CONSOLE) extern struct video_console vga_video_console; #endif static struct video_console *console_list[] = { -#if IS_ENABLED(CONFIG_LP_GEODELX_VIDEO_CONSOLE) +#if CONFIG(LP_GEODELX_VIDEO_CONSOLE) &geodelx_video_console, #endif -#if IS_ENABLED(CONFIG_LP_COREBOOT_VIDEO_CONSOLE) +#if CONFIG(LP_COREBOOT_VIDEO_CONSOLE) &coreboot_video_console, #endif -#if IS_ENABLED(CONFIG_LP_VGA_VIDEO_CONSOLE) +#if CONFIG(LP_VGA_VIDEO_CONSOLE) &vga_video_console, #endif }; diff --git a/payloads/libpayload/include/endian.h b/payloads/libpayload/include/endian.h index 2dcfa1f8da..b387e66243 100644 --- a/payloads/libpayload/include/endian.h +++ b/payloads/libpayload/include/endian.h @@ -53,7 +53,7 @@ static inline uint64_t swap_bytes64(uint64_t in) /* Endian functions from glibc 2.9 / BSD "endian.h" */ -#if IS_ENABLED(CONFIG_LP_BIG_ENDIAN) +#if CONFIG(LP_BIG_ENDIAN) #define htobe16(in) (in) #define htobe32(in) (in) @@ -63,7 +63,7 @@ static inline uint64_t swap_bytes64(uint64_t in) #define htole32(in) swap_bytes32(in) #define htole64(in) swap_bytes64(in) -#elif IS_ENABLED(CONFIG_LP_LITTLE_ENDIAN) +#elif CONFIG(LP_LITTLE_ENDIAN) #define htobe16(in) swap_bytes16(in) #define htobe32(in) swap_bytes32(in) diff --git a/payloads/libpayload/include/stdlib.h b/payloads/libpayload/include/stdlib.h index a2e612de41..aaacc87973 100644 --- a/payloads/libpayload/include/stdlib.h +++ b/payloads/libpayload/include/stdlib.h @@ -45,7 +45,7 @@ * @defgroup malloc Memory allocation functions * @{ */ -#if IS_ENABLED(CONFIG_LP_DEBUG_MALLOC) && !defined(IN_MALLOC_C) +#if CONFIG(LP_DEBUG_MALLOC) && !defined(IN_MALLOC_C) #define free(p) \ ({ \ extern void print_malloc_map(void); \ @@ -222,7 +222,7 @@ void gdb_exit(s8 exit_status); void halt(void) __attribute__((noreturn)); void exit(int status) __attribute__((noreturn)); #define abort() halt() /**< Alias for the halt() function */ -#if IS_ENABLED(CONFIG_LP_REMOTEGDB) +#if CONFIG(LP_REMOTEGDB) /* Override abort()/halt() to trap into GDB if it is enabled. */ #define halt() do { gdb_enter(); halt(); } while (0) #endif diff --git a/payloads/libpayload/include/storage/storage.h b/payloads/libpayload/include/storage/storage.h index f2e6f292c0..2dc70b0267 100644 --- a/payloads/libpayload/include/storage/storage.h +++ b/payloads/libpayload/include/storage/storage.h @@ -34,7 +34,7 @@ #include <unistd.h> -#if !IS_ENABLED(CONFIG_LP_STORAGE_64BIT_LBA) +#if !CONFIG(LP_STORAGE_64BIT_LBA) typedef u32 lba_t; #else typedef u64 lba_t; diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h index bd64cdb7f1..845b7c4c84 100644 --- a/payloads/libpayload/include/sysinfo.h +++ b/payloads/libpayload/include/sysinfo.h @@ -98,7 +98,7 @@ struct sysinfo_t { void *vboot_handoff; u32 vboot_handoff_size; -#if IS_ENABLED(CONFIG_LP_ARCH_X86) +#if CONFIG(LP_ARCH_X86) int x86_rom_var_mtrr_index; #endif diff --git a/payloads/libpayload/libc/64bit_div.c b/payloads/libpayload/libc/64bit_div.c index 877cef26b6..5cd5bc5e95 100644 --- a/payloads/libpayload/libc/64bit_div.c +++ b/payloads/libpayload/libc/64bit_div.c @@ -30,7 +30,7 @@ #include <libpayload-config.h> #include <stdlib.h> -#if !IS_ENABLED(CONFIG_LP_LITTLE_ENDIAN) +#if !CONFIG(LP_LITTLE_ENDIAN) #error this code is for little endian only #endif diff --git a/payloads/libpayload/libc/console.c b/payloads/libpayload/libc/console.c index b57fc47bf6..8d7d62d572 100644 --- a/payloads/libpayload/libc/console.c +++ b/payloads/libpayload/libc/console.c @@ -102,16 +102,16 @@ int console_remove_output_driver(void *function) void console_init(void) { -#if IS_ENABLED(CONFIG_LP_VIDEO_CONSOLE) +#if CONFIG(LP_VIDEO_CONSOLE) video_console_init(); #endif -#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) +#if CONFIG(LP_SERIAL_CONSOLE) serial_console_init(); #endif -#if IS_ENABLED(CONFIG_LP_PC_KEYBOARD) +#if CONFIG(LP_PC_KEYBOARD) keyboard_init(); #endif -#if IS_ENABLED(CONFIG_LP_CBMEM_CONSOLE) +#if CONFIG(LP_CBMEM_CONSOLE) cbmem_console_init(); #endif } @@ -147,7 +147,7 @@ int puts(const char *s) int havekey(void) { -#if IS_ENABLED(CONFIG_LP_USB) +#if CONFIG(LP_USB) usb_poll(); #endif struct console_input_driver *in; @@ -164,7 +164,7 @@ int havekey(void) int getchar(void) { while (1) { -#if IS_ENABLED(CONFIG_LP_USB) +#if CONFIG(LP_USB) usb_poll(); #endif struct console_input_driver *in; diff --git a/payloads/libpayload/libc/coreboot.c b/payloads/libpayload/libc/coreboot.c index 2189161f1b..ba5bb27294 100644 --- a/payloads/libpayload/libc/coreboot.c +++ b/payloads/libpayload/libc/coreboot.c @@ -56,7 +56,7 @@ static void cb_parse_memory(void *ptr, struct sysinfo_t *info) for (i = 0; i < count; i++) { struct cb_memory_range *range = MEM_RANGE_PTR(mem, i); -#if IS_ENABLED(CONFIG_LP_MEMMAP_RAM_ONLY) +#if CONFIG(LP_MEMMAP_RAM_ONLY) if (range->type != CB_MEM_RAM) continue; #endif @@ -155,7 +155,7 @@ static void cb_parse_sku_id(unsigned char *ptr, struct sysinfo_t *info) info->sku_id = sku_id->id_code; } -#if IS_ENABLED(CONFIG_LP_NVRAM) +#if CONFIG(LP_NVRAM) static void cb_parse_optiontable(void *ptr, struct sysinfo_t *info) { /* ptr points to a coreboot table entry and is already virtual */ @@ -171,7 +171,7 @@ static void cb_parse_checksum(void *ptr, struct sysinfo_t *info) } #endif -#if IS_ENABLED(CONFIG_LP_COREBOOT_VIDEO_CONSOLE) +#if CONFIG(LP_COREBOOT_VIDEO_CONSOLE) static void cb_parse_framebuffer(void *ptr, struct sysinfo_t *info) { /* ptr points to a coreboot table entry and is already virtual */ @@ -232,7 +232,7 @@ static void cb_parse_vpd(void *ptr, struct sysinfo_t *info) info->chromeos_vpd = phys_to_virt(cbmem->cbmem_tab); } -#if IS_ENABLED(CONFIG_LP_TIMER_RDTSC) +#if CONFIG(LP_TIMER_RDTSC) static void cb_parse_tsc_info(void *ptr, struct sysinfo_t *info) { const struct cb_tsc_info *tsc_info = ptr; @@ -328,7 +328,7 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info) case CB_TAG_ASSEMBLER: cb_parse_string(ptr, &info->assembler); break; -#if IS_ENABLED(CONFIG_LP_NVRAM) +#if CONFIG(LP_NVRAM) case CB_TAG_CMOS_OPTION_TABLE: cb_parse_optiontable(ptr, info); break; @@ -336,7 +336,7 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info) cb_parse_checksum(ptr, info); break; #endif -#if IS_ENABLED(CONFIG_LP_COREBOOT_VIDEO_CONSOLE) +#if CONFIG(LP_COREBOOT_VIDEO_CONSOLE) // FIXME we should warn on serial if coreboot set up a // framebuffer buf the payload does not know about it. case CB_TAG_FRAMEBUFFER: @@ -394,7 +394,7 @@ int cb_parse_header(void *addr, int len, struct sysinfo_t *info) case CB_TAG_BOOT_MEDIA_PARAMS: cb_parse_boot_media_params(ptr, info); break; -#if IS_ENABLED(CONFIG_LP_TIMER_RDTSC) +#if CONFIG(LP_TIMER_RDTSC) case CB_TAG_TSC_INFO: cb_parse_tsc_info(ptr, info); break; diff --git a/payloads/libpayload/libc/exec.c b/payloads/libpayload/libc/exec.c index d48d2132de..533600d710 100644 --- a/payloads/libpayload/libc/exec.c +++ b/payloads/libpayload/libc/exec.c @@ -30,7 +30,7 @@ #include <libpayload-config.h> #include <libpayload.h> -#if IS_ENABLED(CONFIG_LP_ARCH_X86) +#if CONFIG(LP_ARCH_X86) extern void i386_do_exec(long addr, int argc, char **argv, int *ret); #endif @@ -46,7 +46,7 @@ int exec(long addr, int argc, char **argv) { int val = -1; -#if IS_ENABLED(CONFIG_LP_ARCH_X86) +#if CONFIG(LP_ARCH_X86) i386_do_exec(addr, argc, argv, &val); #endif return val; diff --git a/payloads/libpayload/libc/malloc.c b/payloads/libpayload/libc/malloc.c index 595af63194..957f0e07b0 100644 --- a/payloads/libpayload/libc/malloc.c +++ b/payloads/libpayload/libc/malloc.c @@ -47,7 +47,7 @@ struct memory_type { void *start; void *end; struct align_region_t* align_regions; -#if IS_ENABLED(CONFIG_LP_DEBUG_MALLOC) +#if CONFIG(LP_DEBUG_MALLOC) int magic_initialized; size_t minimal_free; const char *name; @@ -58,7 +58,7 @@ extern char _heap, _eheap; /* Defined in the ldscript. */ static struct memory_type default_type = { (void *)&_heap, (void *)&_eheap, NULL -#if IS_ENABLED(CONFIG_LP_DEBUG_MALLOC) +#if CONFIG(LP_DEBUG_MALLOC) , 0, 0, "HEAP" #endif }; @@ -104,7 +104,7 @@ void init_dma_memory(void *start, u32 size) dma->end = start + size; dma->align_regions = NULL; -#if IS_ENABLED(CONFIG_LP_DEBUG_MALLOC) +#if CONFIG(LP_DEBUG_MALLOC) dma->minimal_free = 0; dma->magic_initialized = 0; dma->name = "DMA"; @@ -139,7 +139,7 @@ static void *alloc(int len, struct memory_type *type) if (!HAS_MAGIC(*ptr)) { size_t size = (type->end - type->start) - HDRSIZE; *ptr = FREE_BLOCK(size); -#if IS_ENABLED(CONFIG_LP_DEBUG_MALLOC) +#if CONFIG(LP_DEBUG_MALLOC) type->magic_initialized = 1; type->minimal_free = size; #endif @@ -356,7 +356,7 @@ static struct align_region_t *allocate_region(int alignment, int num_elements, struct align_region_t *r; size_t extra_space; -#if IS_ENABLED(CONFIG_LP_DEBUG_MALLOC) +#if CONFIG(LP_DEBUG_MALLOC) printf("%s(old align_regions=%p, alignment=%u, num_elements=%u, size=%zu)\n", __func__, type->align_regions, alignment, num_elements, size); #endif @@ -479,7 +479,7 @@ look_further: { if ((reg->alignment == align) && (reg->free >= (size + align - 1)/align)) { -#if IS_ENABLED(CONFIG_LP_DEBUG_MALLOC) +#if CONFIG(LP_DEBUG_MALLOC) printf(" found memalign region. %x free, %x required\n", reg->free, (size + align - 1)/align); #endif break; @@ -488,12 +488,12 @@ look_further: } if (reg == 0) { -#if IS_ENABLED(CONFIG_LP_DEBUG_MALLOC) +#if CONFIG(LP_DEBUG_MALLOC) printf(" need to allocate a new memalign region\n"); #endif /* get align regions */ reg = allocate_region(align, large_request/align, size, type); -#if IS_ENABLED(CONFIG_LP_DEBUG_MALLOC) +#if CONFIG(LP_DEBUG_MALLOC) printf(" ... returned %p\n", reg); #endif } @@ -539,7 +539,7 @@ void *dma_memalign(size_t align, size_t size) } /* This is for debugging purposes. */ -#if IS_ENABLED(CONFIG_LP_DEBUG_MALLOC) +#if CONFIG(LP_DEBUG_MALLOC) void print_malloc_map(void) { struct memory_type *type = heap; diff --git a/payloads/libpayload/libc/time.c b/payloads/libpayload/libc/time.c index f8913466dc..75834486b5 100644 --- a/payloads/libpayload/libc/time.c +++ b/payloads/libpayload/libc/time.c @@ -34,7 +34,7 @@ #include <libpayload-config.h> #include <libpayload.h> -#if IS_ENABLED(CONFIG_LP_ARCH_X86) && IS_ENABLED(CONFIG_LP_NVRAM) +#if CONFIG(LP_ARCH_X86) && CONFIG(LP_NVRAM) #include <arch/rdtsc.h> #endif @@ -70,7 +70,7 @@ static void update_clock(void) } } -#if IS_ENABLED(CONFIG_LP_NVRAM) +#if CONFIG(LP_NVRAM) static unsigned int day_of_year(int mon, int day, int year) { diff --git a/payloads/libpayload/libcbfs/cbfs.c b/payloads/libpayload/libcbfs/cbfs.c index d679e6708a..d2d13eac8e 100644 --- a/payloads/libpayload/libcbfs/cbfs.c +++ b/payloads/libpayload/libcbfs/cbfs.c @@ -31,11 +31,11 @@ #ifdef LIBPAYLOAD # include <libpayload-config.h> -# if IS_ENABLED(CONFIG_LP_LZMA) +# if CONFIG(LP_LZMA) # include <lzma.h> # define CBFS_CORE_WITH_LZMA # endif -# if IS_ENABLED(CONFIG_LP_LZ4) +# if CONFIG(LP_LZ4) # include <lz4.h> # define CBFS_CORE_WITH_LZ4 # endif diff --git a/payloads/libpayload/libcbfs/cbfs_core.c b/payloads/libpayload/libcbfs/cbfs_core.c index 39bbdb5260..e94e1e76ba 100644 --- a/payloads/libpayload/libcbfs/cbfs_core.c +++ b/payloads/libpayload/libcbfs/cbfs_core.c @@ -119,7 +119,7 @@ static int get_cbfs_range(uint32_t *offset, uint32_t *cbfs_end, // Logical offset (for source media) of first file. *offset = ntohl(header->offset); *cbfs_end = ntohl(header->romsize); -#if IS_ENABLED(CONFIG_LP_ARCH_X86) +#if CONFIG(LP_ARCH_X86) // resolve actual length of ROM used for CBFS components // the bootblock size was not taken into account *cbfs_end -= ntohl(header->bootblocksize); diff --git a/payloads/nvramcui/nvramcui.c b/payloads/nvramcui/nvramcui.c index 675e00292f..453b9aae43 100644 --- a/payloads/nvramcui/nvramcui.c +++ b/payloads/nvramcui/nvramcui.c @@ -176,7 +176,7 @@ int main(void) int ch, done; int i; - if (IS_ENABLED(CONFIG_LP_USB)) + if (CONFIG(LP_USB)) usb_initialize(); /* coreboot data structures */ |