Ronald G. Minnich (rminnich@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1954
-gerrit
commit 294bcfe9872c072b943ffd23f4fc4cfc0a4a5f66 Author: Ronald G. Minnich rminnich@gmail.com Date: Fri Nov 30 10:54:13 2012 -0800
Make set_boot_successful depend on ARCH_X86
Set_boot_successful depends on CMOS parts that non-x86 platforms do not have. For now, make the current path depend on ARCH_X86, and make the alternative empty.
While this might argue for Another Config Variable I'm not sure it's warranted.
Change-Id: I68cf63367c8054d09a7a22303e7c04fb35ad0153 Signed-off-by: Ronald G. Minnich rminnich@gmail.com --- src/include/fallback.h | 1 - src/lib/fallback_boot.c | 8 ++++++-- 2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/include/fallback.h b/src/include/fallback.h index ffcbafb..7f3c823 100644 --- a/src/include/fallback.h +++ b/src/include/fallback.h @@ -3,7 +3,6 @@
#if !defined(__ASSEMBLER__) && !defined(__PRE_RAM__)
-void set_boot_successful(void); void boot_successful(void);
#endif /* __ASSEMBLER__ */ diff --git a/src/lib/fallback_boot.c b/src/lib/fallback_boot.c index b5ec6c3..27408fe 100644 --- a/src/lib/fallback_boot.c +++ b/src/lib/fallback_boot.c @@ -1,11 +1,12 @@ #include <console/console.h> #include <fallback.h> #include <watchdog.h> -#include <pc80/mc146818rtc.h> #include <arch/io.h>
+#if IS_ENABLED(CONFIG_ARCH_X86) +#include <pc80/mc146818rtc.h>
-void set_boot_successful(void) +static inline void set_boot_successful(void) { /* Remember I succesfully booted by setting * the initial boot direction @@ -25,6 +26,9 @@ void set_boot_successful(void) byte &= 0x0f; outb(byte, RTC_PORT(1)); } +#else +static inline void set_boot_successful(void) {} +#endif
void boot_successful(void) {