[coreboot-gerrit] Patch set updated for coreboot: 367a852 src/console/post.c: Sanitize headers from preprocessor abuse

Edward O'Callaghan (eocallaghan@alterapraxis.com) gerrit at coreboot.org
Tue Jun 24 07:13:38 CEST 2014


Edward O'Callaghan (eocallaghan at alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6091

-gerrit

commit 367a852a37af2901c254dbaaa2d68a79c7517778
Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date:   Sat Jun 21 21:42:25 2014 +1000

    src/console/post.c: Sanitize headers from preprocessor abuse
    
    Some headers could not be taken care of here yet due to deeper issues.
    
    Issues:
    
     1.)
     pc80/mc146818rtc.h: In function 'cmos_read':
     pc80/mc146818rtc.h:111:2: error: implicit declaration of function 'outb'
     pc80/mc146818rtc.h:112:2: error: implicit declaration of function 'inb'
    
     2.)
     include/device/device.h is incompatible with ROMCC
    
    Change-Id: I524713b21684f6fa99355614a1ab38aee9975790
    Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
---
 src/console/post.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/console/post.c b/src/console/post.c
index ef1a3a5..dfe2d09 100644
--- a/src/console/post.c
+++ b/src/console/post.c
@@ -20,15 +20,17 @@
  */
 
 #include <arch/io.h>
+#include <elog.h>
 #include <console/console.h>
+#include <smp/spinlock.h>
+
+/* FIXME: unwrapping these header guards breaks builds due to deeper issues */
 #if CONFIG_CMOS_POST
 #include <pc80/mc146818rtc.h>
-#include <smp/spinlock.h>
 #endif
-#if CONFIG_CMOS_POST_EXTRA
+#if !defined(__ROMCC__)
 #include <device/device.h>
-#endif
-#include <elog.h>
+#endif /* __ROMCC__ */
 
 /* Write POST information */
 



More information about the coreboot-gerrit mailing list