diff options
Diffstat (limited to 'payloads/libpayload/arch/x86')
| -rw-r--r-- | payloads/libpayload/arch/x86/main.c | 2 | ||||
| -rw-r--r-- | payloads/libpayload/arch/x86/multiboot.c | 4 | ||||
| -rw-r--r-- | payloads/libpayload/arch/x86/rom_media.c | 4 | ||||
| -rw-r--r-- | payloads/libpayload/arch/x86/sysinfo.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/payloads/libpayload/arch/x86/main.c b/payloads/libpayload/arch/x86/main.c index ee52a937e6..fbd4dc4e18 100644 --- a/payloads/libpayload/arch/x86/main.c +++ b/payloads/libpayload/arch/x86/main.c @@ -51,7 +51,7 @@ void start_main(void) lib_get_sysinfo(); /* Optionally set up the consoles. */ -#ifndef CONFIG_LP_SKIP_CONSOLE_INIT +#if !IS_ENABLED(CONFIG_LP_SKIP_CONSOLE_INIT) console_init(); #endif diff --git a/payloads/libpayload/arch/x86/multiboot.c b/payloads/libpayload/arch/x86/multiboot.c index c2c360732f..5fff453c8d 100644 --- a/payloads/libpayload/arch/x86/multiboot.c +++ b/payloads/libpayload/arch/x86/multiboot.c @@ -45,7 +45,7 @@ static void mb_parse_mmap(struct multiboot_header *table, while(ptr < (start + table->mmap_length)) { struct multiboot_mmap *mmap = (struct multiboot_mmap *) ptr; -#ifdef CONFIG_LP_MEMMAP_RAM_ONLY +#if IS_ENABLED(CONFIG_LP_MEMMAP_RAM_ONLY) /* 1 == normal RAM. Ignore everything else for now */ if (mmap->type == 1) { @@ -56,7 +56,7 @@ static void mb_parse_mmap(struct multiboot_header *table, if (++info->n_memranges == SYSINFO_MAX_MEM_RANGES) return; -#ifdef CONFIG_LP_MEMMAP_RAM_ONLY +#if IS_ENABLED(CONFIG_LP_MEMMAP_RAM_ONLY) } #endif diff --git a/payloads/libpayload/arch/x86/rom_media.c b/payloads/libpayload/arch/x86/rom_media.c index 5b8cbade1f..0c6f521bb5 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 defined(CONFIG_LP_ROM_SIZE) +#if IS_ENABLED(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 defined(CONFIG_LP_ROM_SIZE) +#if IS_ENABLED(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 8e8b1c8d0a..c3336b81e4 100644 --- a/payloads/libpayload/arch/x86/sysinfo.c +++ b/payloads/libpayload/arch/x86/sysinfo.c @@ -38,7 +38,7 @@ */ struct sysinfo_t lib_sysinfo = { .cpu_khz = 200, -#ifdef CONFIG_LP_SERIAL_CONSOLE +#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE) .ser_ioport = CONFIG_LP_SERIAL_IOBASE, #else .ser_ioport = 0x3f8, @@ -52,7 +52,7 @@ int lib_get_sysinfo(void) /* Get the CPU speed (for delays). */ lib_sysinfo.cpu_khz = get_cpu_speed(); -#ifdef CONFIG_LP_MULTIBOOT +#if IS_ENABLED(CONFIG_LP_MULTIBOOT) /* Get the information from the multiboot tables, * if they exist */ get_multiboot_info(&lib_sysinfo); |