From bbe04a83e0089df2db31115f04c2a8ebb26535a9 Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sat, 24 Nov 2012 07:48:40 -0600
Subject: [PATCH] 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.
---
 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 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/system/boot/platform/raspberrypi_arm/entry.S b/src/system/boot/platform/raspberrypi_arm/entry.S
index 632e8cf619..d49b20a51a 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 7ac65ec955..4bb89729b1 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 19c64ac7c8..ea8f7aa1c3 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;