[coreboot-gerrit] Patch set updated for coreboot: d4cb533 pc80/mc146818rtc.h: Has X86 specific inlines without guards

Edward O'Callaghan (eocallaghan@alterapraxis.com) gerrit at coreboot.org
Tue Jun 24 09:21:54 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/6101

-gerrit

commit d4cb53384c2a4d42d9fe6482e45104d1033d6d05
Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date:   Tue Jun 24 16:29:12 2014 +1000

    pc80/mc146818rtc.h: Has X86 specific inlines without guards
    
    PC80 header components are winding up in ARM builds with static inline
    X86 specific code.
    
    Change-Id: Ib23e70a34c478dc099b84b59a5234539cc2482e3
    Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
---
 src/include/pc80/i8254.h       | 3 ++-
 src/include/pc80/mc146818rtc.h | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/include/pc80/i8254.h b/src/include/pc80/i8254.h
index f4f0dca..964cc97 100644
--- a/src/include/pc80/i8254.h
+++ b/src/include/pc80/i8254.h
@@ -59,4 +59,5 @@
 #define PPCB_T2GATE     0x01    /* Bit 0 */
 
 void setup_i8254(void);
-#endif
+
+#endif /* PC80_I8254_H */
diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h
index 46dbd73..56f8caf 100644
--- a/src/include/pc80/mc146818rtc.h
+++ b/src/include/pc80/mc146818rtc.h
@@ -1,6 +1,8 @@
 #ifndef PC80_MC146818RTC_H
 #define PC80_MC146818RTC_H
 
+#if CONFIG_ARCH_X86
+
 #include <arch/io.h>
 #include <types.h>
 
@@ -224,4 +226,6 @@ void cmos_post_log(void);
 static inline void cmos_post_log(void) {}
 #endif /* CONFIG_CMOS_POST */
 
+#endif /* CONFIG_ARCH_X86 */
+
 #endif /*  PC80_MC146818RTC_H */



More information about the coreboot-gerrit mailing list