From a4e8fb2afd6ff92e84bd03c55668708e0c5d17df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Sat, 17 Aug 2019 04:33:00 +0300
Subject: arch/non-x86: Remove use of __PRE_RAM__
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Id8918f40572497b068509b5d5a490de0435ad50b
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34921
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
---
 src/arch/arm/include/armv7/arch/cpu.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'src/arch/arm')

diff --git a/src/arch/arm/include/armv7/arch/cpu.h b/src/arch/arm/include/armv7/arch/cpu.h
index 22b3fb443d..55ac5ea8b3 100644
--- a/src/arch/arm/include/armv7/arch/cpu.h
+++ b/src/arch/arm/include/armv7/arch/cpu.h
@@ -17,12 +17,10 @@
 #define __ARCH_CPU_H__
 
 #include <stdint.h>
+#include <device/device.h>
 
 #define asmlinkage
 
-#if !defined(__PRE_RAM__)
-#include <device/device.h>
-
 struct cpu_driver {
 	struct device_operations *ops;
 	const struct cpu_device_id *id_table;
@@ -34,8 +32,6 @@ struct cpuinfo_arm {
 	uint8_t    arm_model;
 };
 
-#endif
-
 /* Primitives for CPU and MP cores. */
 
 /* read Main Id register (MIDR) */
-- 
cgit v1.2.3