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

coreinfo: Use IS_ENABLED() to query Kconfig variables

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_.+?)\b,if IS_ENABLED\($1\),g' `find . -name *.[ch]`
perl -pi -e 's,ifndef (CONFIG_.+?)\b,if !IS_ENABLED\($1\),g' `find . -name *.[ch]`

Change-Id: Ia461a33541f58ff39e984119c44ece7e6c05608a
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10713
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
This commit is contained in:
Stefan Reinauer
2015-06-29 16:08:39 -07:00
parent d13fd1b013
commit 04fb7a81c1
10 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
payloads/coreinfo/coreinfo.c
View File

@@ -35,34 +35,34 @@ extern struct coreinfo_module lar_module;
extern struct coreinfo_module cbfs_module;
struct coreinfo_module *system_modules[] = {
#ifdef CONFIG_MODULE_CPUINFO
#if IS_ENABLED(CONFIG_MODULE_CPUINFO)
&cpuinfo_module,
#endif
#ifdef CONFIG_MODULE_PCI
#if IS_ENABLED(CONFIG_MODULE_PCI)
&pci_module,
#endif
#ifdef CONFIG_MODULE_NVRAM
#if IS_ENABLED(CONFIG_MODULE_NVRAM)
&nvram_module,
#endif
#ifdef CONFIG_MODULE_RAMDUMP
#if IS_ENABLED(CONFIG_MODULE_RAMDUMP)
&ramdump_module,
#endif
};
struct coreinfo_module *firmware_modules[] = {
#ifdef CONFIG_MODULE_COREBOOT
#if IS_ENABLED(CONFIG_MODULE_COREBOOT)
&coreboot_module,
#endif
#ifdef CONFIG_MODULE_MULTIBOOT
#if IS_ENABLED(CONFIG_MODULE_MULTIBOOT)
&multiboot_module,
#endif
#ifdef CONFIG_MODULE_BOOTLOG
#if IS_ENABLED(CONFIG_MODULE_BOOTLOG)
&bootlog_module,
#endif
#ifdef CONFIG_MODULE_LAR
#if IS_ENABLED(CONFIG_MODULE_LAR)
&lar_module,
#endif
#ifdef CONFIG_MODULE_CBFS
#if IS_ENABLED(CONFIG_MODULE_CBFS)
&cbfs_module,
#endif
};
@@ -121,7 +121,7 @@ static void print_submenu(struct coreinfo_cat *cat)
mvwprintw(menuwin, 0, 0, menu);
}
#ifdef CONFIG_SHOW_DATE_TIME
#if IS_ENABLED(CONFIG_SHOW_DATE_TIME)
static void print_time_and_date(void)
{
struct tm tm;
@@ -156,7 +156,7 @@ static void print_menu(void)
mvwprintw(menuwin, 1, 0, menu);
#ifdef CONFIG_SHOW_DATE_TIME
#if IS_ENABLED(CONFIG_SHOW_DATE_TIME)
print_time_and_date();
#endif
}
@@ -234,7 +234,7 @@ static void loop(void)
halfdelay(10);
while (1) {
#ifdef CONFIG_SHOW_DATE_TIME
#if IS_ENABLED(CONFIG_SHOW_DATE_TIME)
print_time_and_date();
wrefresh(menuwin);
#endif
@@ -271,7 +271,7 @@ int main(void)
{
int i, j;
#if defined(CONFIG_USB)
#if IS_ENABLED(CONFIG_LP_USB)
usb_initialize();
#endif