[haiku-commits] haiku: hrev44942 - in src/system/boot: platform/u-boot platform/raspberrypi_arm arch/arm
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 1 Dec 2012 23:56:35 +0100 (CET)
hrev44942 adds 2 changesets to branch 'master'
old head: f2e7bd18c10c630e4c48855eefbc57c5744452a0
new head: c9bb94092f958ba5f2b002c656ddced90e6221af
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=c9bb940+%5Ef2e7bd1
----------------------------------------------------------------------------
218af29: 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.
c9bb940: U-Boot: cleanup
Remove commented asm code. We should use the U-Boot API later on.
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 9 insertions(+), 15 deletions(-)
src/system/boot/arch/arm/kernel_stubs.cpp | 6 ------
src/system/boot/platform/raspberrypi_arm/cpu.cpp | 8 ++++++++
src/system/boot/platform/u-boot/cpu.cpp | 10 +---------
############################################################################
Commit: 218af294af68bbe1c1691ede6e439e976d9a89e3
URL: http://cgit.haiku-os.org/haiku/commit/?id=218af29
Author: François Revol <revol@xxxxxxx>
Date: Sat Dec 1 22:52:59 2012 UTC
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.
----------------------------------------------------------------------------
diff --git a/src/system/boot/arch/arm/kernel_stubs.cpp
b/src/system/boot/arch/arm/kernel_stubs.cpp
index d26ce80..6d1d60c 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 ed690b6..0f6f604 100644
--- a/src/system/boot/platform/raspberrypi_arm/cpu.cpp
+++ b/src/system/boot/platform/raspberrypi_arm/cpu.cpp
@@ -7,6 +7,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()
{
boot_arch_cpu_init();
############################################################################
Revision: hrev44942
Commit: c9bb94092f958ba5f2b002c656ddced90e6221af
URL: http://cgit.haiku-os.org/haiku/commit/?id=c9bb940
Author: François Revol <revol@xxxxxxx>
Date: Sat Dec 1 22:54:43 2012 UTC
U-Boot: cleanup
Remove commented asm code. We should use the U-Boot API later on.
----------------------------------------------------------------------------
diff --git a/src/system/boot/platform/u-boot/cpu.cpp
b/src/system/boot/platform/u-boot/cpu.cpp
index 672d027..5df276f 100644
--- a/src/system/boot/platform/u-boot/cpu.cpp
+++ b/src/system/boot/platform/u-boot/cpu.cpp
@@ -35,16 +35,8 @@ spin(bigtime_t microseconds)
#warning U-Boot:TODO!!
// TODO: use API if available
- for(bigtime_t i=0;i<microseconds;i=i+1)
- {
- /*
- asm volatile ("mov r0,r0");
- asm volatile ("mov r0,r0");
- */
- }
-
// fallback to arch-specific code
- //arch_spin(microseconds);
+ arch_spin(microseconds);
}
Other related posts:
- » [haiku-commits] haiku: hrev44942 - in src/system/boot: platform/u-boot platform/raspberrypi_arm arch/arm - revol
