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/libpayload/include | |
| 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/libpayload/include')
| -rw-r--r-- | payloads/libpayload/include/endian.h | 4 | ||||
| -rw-r--r-- | payloads/libpayload/include/stdlib.h | 4 | ||||
| -rw-r--r-- | payloads/libpayload/include/storage/storage.h | 2 | ||||
| -rw-r--r-- | payloads/libpayload/include/sysinfo.h | 2 |
4 files changed, 6 insertions, 6 deletions
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 |