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/include/endian.h | 4 ++-- payloads/libpayload/include/stdlib.h | 4 ++-- payloads/libpayload/include/storage/storage.h | 2 +- payloads/libpayload/include/sysinfo.h | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'payloads/libpayload/include') diff --git a/payloads/libpayload/include/endian.h b/payloads/libpayload/include/endian.h index 3b79393492..2655634c93 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 defined CONFIG_LP_BIG_ENDIAN +#if IS_ENABLED(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 defined CONFIG_LP_LITTLE_ENDIAN +#elif IS_ENABLED(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 08c7d06c3e..689bf01b68 100644 --- a/payloads/libpayload/include/stdlib.h +++ b/payloads/libpayload/include/stdlib.h @@ -45,7 +45,7 @@ * @defgroup malloc Memory allocation functions * @{ */ -#if defined(CONFIG_LP_DEBUG_MALLOC) && !defined(IN_MALLOC_C) +#if IS_ENABLED(CONFIG_LP_DEBUG_MALLOC) && !defined(IN_MALLOC_C) #define free(p) \ ({ \ extern void print_malloc_map(void); \ @@ -217,7 +217,7 @@ void srand(unsigned int seed); void halt(void) __attribute__ ((noreturn)); void exit(int status) __attribute__ ((noreturn)); #define abort() halt() /**< Alias for the halt() function */ -#ifdef CONFIG_LP_REMOTEGDB +#if IS_ENABLED(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 a3cebd90bd..f2e6f292c0 100644 --- a/payloads/libpayload/include/storage/storage.h +++ b/payloads/libpayload/include/storage/storage.h @@ -34,7 +34,7 @@ #include -#ifndef CONFIG_LP_STORAGE_64BIT_LBA +#if !IS_ENABLED(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 083f19de82..5b58f55c99 100644 --- a/payloads/libpayload/include/sysinfo.h +++ b/payloads/libpayload/include/sysinfo.h @@ -66,7 +66,7 @@ struct sysinfo_t { u32 cmos_range_start; u32 cmos_range_end; u32 cmos_checksum_location; -#ifdef CONFIG_LP_CHROMEOS +#if IS_ENABLED(CONFIG_LP_CHROMEOS) u32 vbnv_start; u32 vbnv_size; #endif @@ -86,7 +86,7 @@ struct sysinfo_t { struct cb_framebuffer *framebuffer; -#ifdef CONFIG_LP_CHROMEOS +#if IS_ENABLED(CONFIG_LP_CHROMEOS) int num_gpios; struct cb_gpio gpios[SYSINFO_MAX_GPIOS]; int num_macs; @@ -99,14 +99,14 @@ struct sysinfo_t { struct cb_header *header; struct cb_mainboard *mainboard; -#ifdef CONFIG_LP_CHROMEOS +#if IS_ENABLED(CONFIG_LP_CHROMEOS) void *vboot_handoff; u32 vboot_handoff_size; void *vdat_addr; u32 vdat_size; #endif -#ifdef CONFIG_LP_ARCH_X86 +#if IS_ENABLED(CONFIG_LP_ARCH_X86) int x86_rom_var_mtrr_index; #endif -- cgit v1.2.3