From 44da9e201c58faf94ad22ec0fe18b693fd9d1239 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Fri, 27 Sep 2019 15:02:32 +0300 Subject: cpu,device/: Remove some __SIMPLE_DEVICE__ and __ROMCC__ use MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I62d7450c8e83eec7bf4ad5d0709269a132fd0499 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/35649 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin --- src/arch/x86/include/arch/cpu.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/arch') diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h index 263b734529..ffa532b47e 100644 --- a/src/arch/x86/include/arch/cpu.h +++ b/src/arch/x86/include/arch/cpu.h @@ -214,7 +214,8 @@ static inline bool cpu_is_intel(void) return CONFIG(CPU_INTEL_COMMON) || CONFIG(SOC_INTEL_COMMON); } -#ifndef __SIMPLE_DEVICE__ +#ifndef __ROMCC__ +/* romcc does not support anonymous structs. */ struct device; @@ -258,9 +259,8 @@ static inline struct cpu_info *cpu_info(void) ); return ci; } -#endif -#ifndef __ROMCC__ // romcc is segfaulting in some cases +/* romcc is segfaulting in some cases. */ struct cpuinfo_x86 { uint8_t x86; /* CPU family */ uint8_t x86_vendor; /* CPU vendor */ -- cgit v1.2.3