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

2
payloads/libpayload/arch/arm/main.c
View File

@@ -48,7 +48,7 @@ void start_main(void)
lib_get_sysinfo();
/* Optionally set up the consoles. */
#ifndef CONFIG_LP_SKIP_CONSOLE_INIT
#if !IS_ENABLED(CONFIG_LP_SKIP_CONSOLE_INIT)
console_init();
#endif

2
payloads/libpayload/arch/arm64/main.c
View File

@@ -123,7 +123,7 @@ void start_main(void)
post_sysinfo_scan_mmu_setup();
#ifndef CONFIG_LP_SKIP_CONSOLE_INIT
#if !IS_ENABLED(CONFIG_LP_SKIP_CONSOLE_INIT)
console_init();
#endif

2
payloads/libpayload/arch/mips/main.c
View File

@@ -38,7 +38,7 @@ void start_main(void)
lib_get_sysinfo();
/* Optionally set up the consoles. */
#ifndef CONFIG_LP_SKIP_CONSOLE_INIT
#if !IS_ENABLED(CONFIG_LP_SKIP_CONSOLE_INIT)
console_init();
#endif

2
payloads/libpayload/arch/x86/main.c
View File

@@ -51,7 +51,7 @@ void start_main(void)
lib_get_sysinfo();
/* Optionally set up the consoles. */
#ifndef CONFIG_LP_SKIP_CONSOLE_INIT
#if !IS_ENABLED(CONFIG_LP_SKIP_CONSOLE_INIT)
console_init();
#endif

4
payloads/libpayload/arch/x86/multiboot.c
View File

@@ -45,7 +45,7 @@ static void mb_parse_mmap(struct multiboot_header *table,
while(ptr < (start + table->mmap_length)) {
struct multiboot_mmap *mmap = (struct multiboot_mmap *) ptr;
#ifdef CONFIG_LP_MEMMAP_RAM_ONLY
#if IS_ENABLED(CONFIG_LP_MEMMAP_RAM_ONLY)
/* 1 == normal RAM. Ignore everything else for now */
if (mmap->type == 1) {
@@ -56,7 +56,7 @@ static void mb_parse_mmap(struct multiboot_header *table,
if (++info->n_memranges == SYSINFO_MAX_MEM_RANGES)
return;
#ifdef CONFIG_LP_MEMMAP_RAM_ONLY
#if IS_ENABLED(CONFIG_LP_MEMMAP_RAM_ONLY)
}
#endif

4
payloads/libpayload/arch/x86/rom_media.c
View File

@@ -83,7 +83,7 @@ int init_x86rom_cbfs_media(struct cbfs_media *media) {
struct cbfs_header *header = (struct cbfs_header*)
*(uint32_t*)(0xfffffffc);
if (CBFS_HEADER_MAGIC != ntohl(header->magic)) {
#if defined(CONFIG_LP_ROM_SIZE)
#if IS_ENABLED(CONFIG_LP_ROM_SIZE)
printk(BIOS_ERR, "Invalid CBFS master header at %p\n", header);
media->context = (void*)CONFIG_LP_ROM_SIZE;
#else
@@ -92,7 +92,7 @@ int init_x86rom_cbfs_media(struct cbfs_media *media) {
} else {
uint32_t romsize = ntohl(header->romsize);
media->context = (void*)romsize;
#if defined(CONFIG_LP_ROM_SIZE)
#if IS_ENABLED(CONFIG_LP_ROM_SIZE)
if (CONFIG_LP_ROM_SIZE != romsize)
printk(BIOS_INFO, "Warning: rom size unmatch (%d/%d)\n",
CONFIG_LP_ROM_SIZE, romsize);

4
payloads/libpayload/arch/x86/sysinfo.c
View File

@@ -38,7 +38,7 @@
*/
struct sysinfo_t lib_sysinfo = {
.cpu_khz = 200,
#ifdef CONFIG_LP_SERIAL_CONSOLE
#if IS_ENABLED(CONFIG_LP_SERIAL_CONSOLE)
.ser_ioport = CONFIG_LP_SERIAL_IOBASE,
#else
.ser_ioport = 0x3f8,
@@ -52,7 +52,7 @@ int lib_get_sysinfo(void)
/* Get the CPU speed (for delays). */
lib_sysinfo.cpu_khz = get_cpu_speed();
#ifdef CONFIG_LP_MULTIBOOT
#if IS_ENABLED(CONFIG_LP_MULTIBOOT)
/* Get the information from the multiboot tables,
* if they exist */
get_multiboot_info(&lib_sysinfo);