sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

payloads: Replace all IS_ENABLED(CONFIG_XXX) with CONFIG(XXX)

Browse Source 
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:
Julius Werner
2019-03-05 16:55:15 -08:00
committed by Patrick Georgi
parent b431833c12
commit eab2a29c8b
61 changed files with 176 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
payloads/libpayload/arch/x86/delay.c
View File

@@ -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)

6
payloads/libpayload/arch/x86/exception.c
View File

@@ -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);
}

4
payloads/libpayload/arch/x86/main.c
View File

@@ -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();

2
payloads/libpayload/arch/x86/multiboot.c
View File

@@ -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;

4
payloads/libpayload/arch/x86/rom_media.c
View File

@@ -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);

4
payloads/libpayload/arch/x86/sysinfo.c
View File

@@ -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);