[haiku-commits] haiku: hrev44172 - src/system/boot/platform/u-boot
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Thu, 17 May 2012 18:45:29 +0200 (CEST)
hrev44172 adds 2 changesets to branch 'master'
old head: 1f675a7fcbc9a2a6177d22c279e6c923d763a6ee
new head: f5759f2e9969bf4753fe8064619fd64a8134b739
----------------------------------------------------------------------------
f4bd3cd: U-Boot: Fix comments and ppc build
* those are not ARM-specific.
* this asm code doesn't build for ppc, and is not really useful for ARM
either.
f5759f2: U-Boot: Add a Linux-type loader target
* those should be cleaned up. BoardSetup should tell which OS type to emulate.
[ François Revol <revol@xxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 11 insertions(+), 3 deletions(-)
src/system/boot/platform/u-boot/Jamfile | 6 ++++++
src/system/boot/platform/u-boot/cpu.cpp | 8 +++++---
############################################################################
Commit: f4bd3cda321dce859975e6232ebac7e8eaad6958
URL: http://cgit.haiku-os.org/haiku/commit/?id=f4bd3cd
Author: François Revol <revol@xxxxxxx>
Date: Thu May 17 16:07:56 2012 UTC
U-Boot: Fix comments and ppc build
* those are not ARM-specific.
* this asm code doesn't build for ppc, and is not really useful for ARM either.
----------------------------------------------------------------------------
diff --git a/src/system/boot/platform/u-boot/cpu.cpp
b/src/system/boot/platform/u-boot/cpu.cpp
index 189cda4..9868f01 100644
--- a/src/system/boot/platform/u-boot/cpu.cpp
+++ b/src/system/boot/platform/u-boot/cpu.cpp
@@ -34,7 +34,7 @@
static void
calculate_cpu_conversion_factor()
{
- #warning ARM:TODO!
+ #warning U-Boot:TODO!
}
@@ -42,7 +42,7 @@ static status_t
check_cpu_features()
{
- #warning ARM:TODO!
+ #warning U-Boot:TODO!
return B_OK;
}
@@ -55,10 +55,12 @@ spin(bigtime_t microseconds)
{
for(bigtime_t i=0;i<microseconds;i=i+1)
{
+ /*
asm volatile ("mov r0,r0");
asm volatile ("mov r0,r0");
+ */
}
- #warning ARM/UBOOT:TODO!!
+ #warning U-Boot:TODO!!
}
############################################################################
Revision: hrev44172
Commit: f5759f2e9969bf4753fe8064619fd64a8134b739
URL: http://cgit.haiku-os.org/haiku/commit/?id=f5759f2
Author: François Revol <revol@xxxxxxx>
Date: Thu May 17 16:44:11 2012 UTC
U-Boot: Add a Linux-type loader target
* those should be cleaned up. BoardSetup should tell which OS type to emulate.
----------------------------------------------------------------------------
diff --git a/src/system/boot/platform/u-boot/Jamfile
b/src/system/boot/platform/u-boot/Jamfile
index fa025c8..52a9284 100644
--- a/src/system/boot/platform/u-boot/Jamfile
+++ b/src/system/boot/platform/u-boot/Jamfile
@@ -185,6 +185,12 @@ BuildUImage haiku_loader.ub : haiku_loader :
-n 'haiku_loader' ;
local tgzArchive = haiku-floppyboot.tgz ;
+
+BuildUImage haiku_loader_linux.ub : haiku_loader :
+ -A $(TARGET_ARCH) -O linux -T kernel -C none
+ -a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_LINUX)
+ -n 'haiku_loader' ;
+
BuildUImage haiku_loader_nbsd.ub : haiku_loader $(tgzArchive) :
-A $(TARGET_ARCH) -O $(uImageFakeOS) -T multi -C none
-a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_NBSD)
Other related posts:
- » [haiku-commits] haiku: hrev44172 - src/system/boot/platform/u-boot - revol
