From af4bd599ca84478c9109a4bdba43a790ec5bbc2f Mon Sep 17 00:00:00 2001 From: Alexandru Gagniuc Date: Sun, 12 Jan 2014 15:42:58 -0600 Subject: lib: Make log2() available in romstage on ARM, not just x86 On x86, log2() is defined as an inline function in arch/io.h. This is a remnant of ROMCC, and forced us to not include clog2.c in romstage. As a result, romstage on ARM has no log2(). Use the inline log2 only with ROMCC, but otherwise, use the one in clog2.c. Change-Id: Ifef2aa0a7b5a1db071a66f2eec0be421b8b2a56d Signed-off-by: Alexandru Gagniuc Reviewed-on: http://review.coreboot.org/4681 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich --- src/include/lib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/include/lib.h') diff --git a/src/include/lib.h b/src/include/lib.h index 5fc390a4a0..3a515332b1 100644 --- a/src/include/lib.h +++ b/src/include/lib.h @@ -23,7 +23,7 @@ #define __LIB_H__ #include -#ifndef __PRE_RAM__ /* Conflicts with inline function in arch/io.h */ +#if !defined(__ROMCC__) /* Conflicts with inline function in arch/io.h */ /* Defined in src/lib/clog2.c */ unsigned long log2(unsigned long x); #endif -- cgit v1.2.3