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

libpayload: Make Kconfig bools use IS_ENABLED()

Browse Source 
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>
This commit is contained in:
Stefan Reinauer
2015-06-29 15:47:34 -07:00
parent de60c88996
commit 1b4d39428e
44 changed files with 144 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
payloads/libpayload/include/endian.h
View File

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

4
payloads/libpayload/include/stdlib.h
View File

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

2
payloads/libpayload/include/storage/storage.h
View File

@ -34,7 +34,7 @@
#include <unistd.h>
#ifndef CONFIG_LP_STORAGE_64BIT_LBA
#if !IS_ENABLED(CONFIG_LP_STORAGE_64BIT_LBA)
typedef u32 lba_t;
#else
typedef u64 lba_t;

8
payloads/libpayload/include/sysinfo.h
View File

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