From 218af294af68bbe1c1691ede6e439e976d9a89e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Sat, 1 Dec 2012 23:52:59 +0100
Subject: [PATCH] arm: Move spin() stub to the raspberry_pi cpu.cpp

This unbreaks the U-Boot build, since we already have spin()
in cpu.cpp there, for future implementation using the U-Boot API.
---
 src/system/boot/arch/arm/kernel_stubs.cpp        | 6 ------
 src/system/boot/platform/raspberrypi_arm/cpu.cpp | 8 ++++++++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/system/boot/arch/arm/kernel_stubs.cpp b/src/system/boot/arch/arm/kernel_stubs.cpp
index d26ce80a27..6d1d60c2f8 100644
--- a/src/system/boot/arch/arm/kernel_stubs.cpp
+++ b/src/system/boot/arch/arm/kernel_stubs.cpp
@@ -33,12 +33,6 @@ kgetc()
 }
 
 
-extern "C" void
-spin(bigtime_t time)
-{
-}
-
-
 extern "C" status_t
 _mutex_lock(mutex*, bool)
 {
diff --git a/src/system/boot/platform/raspberrypi_arm/cpu.cpp b/src/system/boot/platform/raspberrypi_arm/cpu.cpp
index ed690b6921..0f6f60406c 100644
--- a/src/system/boot/platform/raspberrypi_arm/cpu.cpp
+++ b/src/system/boot/platform/raspberrypi_arm/cpu.cpp
@@ -6,6 +6,14 @@
 
 #include "arch_cpu.h"
 
+extern "C" void
+spin(bigtime_t microseconds)
+{
+	// fallback to arch-specific code
+	arch_spin(microseconds);
+}
+
+
 extern "C" void
 cpu_init()
 {