[coreboot] New patch to review for coreboot: 8cd8c90 libpayload: Use #ifdef for CONFIG_* checks

Nico Huber (nico.huber@secunet.com) gerrit at coreboot.org
Wed Nov 14 10:04:14 CET 2012


Nico Huber (nico.huber at secunet.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1847

-gerrit

commit 8cd8c90f2aaaf43977ade3ffdf127d0ee99d8ef2
Author: Nico Huber <nico.huber at secunet.com>
Date:   Mon Nov 12 16:59:24 2012 +0100

    libpayload: Use #ifdef for CONFIG_* checks
    
    Libpayload uses the linux kernel's config style, where CONFIG_* defines
    don't get written for unset tristates.
    
    Change-Id: I3f832cf86bca9a1e153d96af4bf6434a19eba2f6
    Signed-off-by: Nico Huber <nico.huber at secunet.com>
---
 payloads/libpayload/arch/i386/coreboot.c | 4 ++--
 payloads/libpayload/arch/i386/main.c     | 5 +++--
 payloads/libpayload/arch/powerpc/main.c  | 5 +++--
 payloads/libpayload/include/sysinfo.h    | 6 +++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/payloads/libpayload/arch/i386/coreboot.c b/payloads/libpayload/arch/i386/coreboot.c
index 81d121a..5037011 100644
--- a/payloads/libpayload/arch/i386/coreboot.c
+++ b/payloads/libpayload/arch/i386/coreboot.c
@@ -84,7 +84,7 @@ static void cb_parse_version(void *ptr, struct sysinfo_t *info)
 	info->cb_version = (char *)ver->string;
 }
 
-#if CONFIG_CHROMEOS
+#ifdef CONFIG_CHROMEOS
 static void cb_parse_vbnv(unsigned char *ptr, struct sysinfo_t *info)
 {
 	struct cb_vbnv *vbnv = (struct cb_vbnv *)ptr;
@@ -251,7 +251,7 @@ static int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
 #endif
 		case CB_TAG_MAINBOARD:
 			info->mainboard = (struct cb_mainboard *)ptr;
-#if CONFIG_CHROMEOS
+#ifdef CONFIG_CHROMEOS
 		case CB_TAG_GPIO:
 			cb_parse_gpios(ptr, info);
 			break;
diff --git a/payloads/libpayload/arch/i386/main.c b/payloads/libpayload/arch/i386/main.c
index 19ac662..1bac7a8 100644
--- a/payloads/libpayload/arch/i386/main.c
+++ b/payloads/libpayload/arch/i386/main.c
@@ -50,8 +50,9 @@ void start_main(void)
 	lib_get_sysinfo();
 
 	/* Optionally set up the consoles. */
-	if (!CONFIG_SKIP_CONSOLE_INIT)
-		console_init();
+#ifndef CONFIG_SKIP_CONSOLE_INIT
+	console_init();
+#endif
 
 	/*
 	 * Any other system init that has to happen before the
diff --git a/payloads/libpayload/arch/powerpc/main.c b/payloads/libpayload/arch/powerpc/main.c
index 431cac4..9722e0c 100644
--- a/payloads/libpayload/arch/powerpc/main.c
+++ b/payloads/libpayload/arch/powerpc/main.c
@@ -47,8 +47,9 @@ void start_main(void)
 	extern int main(int argc, char **argv);
 
 	/* Optionally set up the consoles. */
-	if (!CONFIG_SKIP_CONSOLE_INIT)
-		console_init();
+#ifndef CONFIG_SKIP_CONSOLE_INIT
+	console_init();
+#endif
 
 	/* Gather system information. */
 	lib_get_sysinfo();
diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h
index bb5b2ee..80763f0 100644
--- a/payloads/libpayload/include/sysinfo.h
+++ b/payloads/libpayload/include/sysinfo.h
@@ -57,7 +57,7 @@ struct sysinfo_t {
 	u32 cmos_range_start;
 	u32 cmos_range_end;
 	u32 cmos_checksum_location;
-#if CONFIG_CHROMEOS
+#ifdef CONFIG_CHROMEOS
 	u32 vbnv_start;
 	u32 vbnv_size;
 #endif
@@ -77,7 +77,7 @@ struct sysinfo_t {
 
 	struct cb_framebuffer *framebuffer;
 
-#if CONFIG_CHROMEOS
+#ifdef CONFIG_CHROMEOS
 	int num_gpios;
 	struct cb_gpio gpios[SYSINFO_MAX_GPIOS];
 #endif
@@ -87,7 +87,7 @@ struct sysinfo_t {
 	struct cb_header *header;
 	struct cb_mainboard *mainboard;
 
-#if CONFIG_CHROMEOS
+#ifdef CONFIG_CHROMEOS
 	void	*vdat_addr;
 	u32	vdat_size;
 #endif




More information about the coreboot mailing list