diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-06-29 15:47:34 -0700 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-06-30 18:55:15 +0200 |
| commit | 1b4d39428eac80bc76713b1f21a2c85e8900c1b8 (patch) | |
| tree | e2b9dfea6be47c785fa55964950c691643d0a232 /payloads/libpayload/libcbfs | |
| parent | de60c8899680f362a908d68efe9e4154ab3380be (diff) | |
| download | coreboot-1b4d39428eac80bc76713b1f21a2c85e8900c1b8.tar.xz | |
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 <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10711
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Diffstat (limited to 'payloads/libpayload/libcbfs')
| -rw-r--r-- | payloads/libpayload/libcbfs/cbfs.c | 2 | ||||
| -rw-r--r-- | payloads/libpayload/libcbfs/cbfs_core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/payloads/libpayload/libcbfs/cbfs.c b/payloads/libpayload/libcbfs/cbfs.c index b2b9d61608..9d7d2f1c75 100644 --- a/payloads/libpayload/libcbfs/cbfs.c +++ b/payloads/libpayload/libcbfs/cbfs.c @@ -31,7 +31,7 @@ #ifdef LIBPAYLOAD # include <libpayload-config.h> -# ifdef CONFIG_LP_LZMA +# if IS_ENABLED(CONFIG_LP_LZMA) # include <lzma.h> # define CBFS_CORE_WITH_LZMA # endif diff --git a/payloads/libpayload/libcbfs/cbfs_core.c b/payloads/libpayload/libcbfs/cbfs_core.c index 38232843b7..44205f666f 100644 --- a/payloads/libpayload/libcbfs/cbfs_core.c +++ b/payloads/libpayload/libcbfs/cbfs_core.c @@ -121,7 +121,7 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) // TODO Add a "size" in CBFS header for a platform independent way to // determine the end of CBFS data. -#if defined(CONFIG_LP_ARCH_X86) && CONFIG_LP_ARCH_X86 +#if IS_ENABLED(CONFIG_LP_ARCH_X86) // resolve actual length of ROM used for CBFS components // the bootblock size was not taken into account romsize -= ntohl(header->bootblocksize); |