[haiku-commits] haiku: hrev44889 - in src/system: boot/platform/raspberrypi_arm ldscripts/arm
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sat, 24 Nov 2012 14:49:44 +0100 (CET)
hrev44889 adds 1 changeset to branch 'master'
old head: a540b9852773e048812d75a9e239bd7b5a43a822
new head: bbe04a83e0089df2db31115f04c2a8ebb26535a9
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=bbe04a8+%5Ea540b98
----------------------------------------------------------------------------
bbe04a8: Rpi: Fix build of Raspberry Pi.
* Raspberry Pi is broken now after
the other recent arm work... needs
more investigation.
* Comment out stage2 header as it
links to headers with c++ code.
Need to verify entry.s can call
c++ code (I think it's mangled to
the assembly or something)
* Fix naming of code entry to match
other arm code.
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev44889
Commit: bbe04a83e0089df2db31115f04c2a8ebb26535a9
URL: http://cgit.haiku-os.org/haiku/commit/?id=bbe04a8
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Sat Nov 24 13:48:40 2012 UTC
----------------------------------------------------------------------------
3 files changed, 7 insertions(+), 7 deletions(-)
src/system/boot/platform/raspberrypi_arm/entry.S | 8 ++++----
src/system/boot/platform/raspberrypi_arm/start.c | 4 ++--
src/system/ldscripts/arm/boot_loader_raspberrypi_arm.ld | 2 +-
----------------------------------------------------------------------------
diff --git a/src/system/boot/platform/raspberrypi_arm/entry.S
b/src/system/boot/platform/raspberrypi_arm/entry.S
index 632e8cf..d49b20a 100644
--- a/src/system/boot/platform/raspberrypi_arm/entry.S
+++ b/src/system/boot/platform/raspberrypi_arm/entry.S
@@ -1,6 +1,6 @@
.section .init
-.globl _start
-_start:
+.globl _entry
+_entry:
b jmp_loader
.section .text
@@ -14,12 +14,12 @@ jmp_loader:
/* For Thumb code? */
/*
- ldr r12, =pi_start
+ ldr r12, =_start
mov lr, pc
bx r12
*/
- b pi_start
+ b _start
/* Cause exception if loader returns */
swi 0xFFFFFF
diff --git a/src/system/boot/platform/raspberrypi_arm/start.c
b/src/system/boot/platform/raspberrypi_arm/start.c
index 7ac65ec..4bb8972 100644
--- a/src/system/boot/platform/raspberrypi_arm/start.c
+++ b/src/system/boot/platform/raspberrypi_arm/start.c
@@ -15,7 +15,7 @@
#include <KernelExport.h>
#include <boot/platform.h>
#include <boot/heap.h>
-#include <boot/stage2.h>
+//#include <boot/stage2.h>
#include <arch/cpu.h>
#include <string.h>
@@ -103,7 +103,7 @@ platform_exit(void)
void
-pi_start(void)
+_start(void)
{
stage2_args args;
diff --git a/src/system/ldscripts/arm/boot_loader_raspberrypi_arm.ld
b/src/system/ldscripts/arm/boot_loader_raspberrypi_arm.ld
index 19c64ac..ea8f7aa 100644
--- a/src/system/ldscripts/arm/boot_loader_raspberrypi_arm.ld
+++ b/src/system/ldscripts/arm/boot_loader_raspberrypi_arm.ld
@@ -1,6 +1,6 @@
OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
OUTPUT_ARCH(arm)
-ENTRY(_start)
+ENTRY(_entry)
C_STACK_SIZE = 1048576;
IRQ_STACK_SIZE = 0;
Other related posts:
- » [haiku-commits] haiku: hrev44889 - in src/system: boot/platform/raspberrypi_arm ldscripts/arm - kallisti5