From 1b4d39428eac80bc76713b1f21a2c85e8900c1b8 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 29 Jun 2015 15:47:34 -0700 Subject: libpayload: Make Kconfig bools use IS_ENABLED() This will make the code work with the different styles of Kconfig (emit unset bools vs don't emit unset bools) Roughly, the patch does this, and a little bit of fixing up: perl -pi -e 's,ifdef (CONFIG_LP_.+?)\b,if IS_ENABLED\($1\),g' `find . -name *.[ch]` perl -pi -e 's,ifndef (CONFIG_LP_.+?)\b,if !IS_ENABLED\($1\),g' `find . -name *.[ch]` Change-Id: Ib8a839b056a1f806a8597052e1b571ea3d18a79f Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/10711 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- payloads/libpayload/arch/x86/multiboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'payloads/libpayload/arch/x86/multiboot.c') 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 -- cgit v1.2.3