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.
This commit is contained in:
Alexander von Gluck IV
2012-11-24 07:49:04 -06:00
parent a540b98527
commit bbe04a83e0
3 changed files with 7 additions and 7 deletions
@@ -1,6 +1,6 @@
.section .init .section .init
.globl _start .globl _entry
_start: _entry:
b jmp_loader b jmp_loader
.section .text .section .text
@@ -14,12 +14,12 @@ jmp_loader:
/* For Thumb code? */ /* For Thumb code? */
/* /*
ldr r12, =pi_start ldr r12, =_start
mov lr, pc mov lr, pc
bx r12 bx r12
*/ */
b pi_start b _start
/* Cause exception if loader returns */ /* Cause exception if loader returns */
swi 0xFFFFFF swi 0xFFFFFF
@@ -15,7 +15,7 @@
#include <KernelExport.h> #include <KernelExport.h>
#include <boot/platform.h> #include <boot/platform.h>
#include <boot/heap.h> #include <boot/heap.h>
#include <boot/stage2.h> //#include <boot/stage2.h>
#include <arch/cpu.h> #include <arch/cpu.h>
#include <string.h> #include <string.h>
@@ -103,7 +103,7 @@ platform_exit(void)
void void
pi_start(void) _start(void)
{ {
stage2_args args; stage2_args args;
@@ -1,6 +1,6 @@
OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
OUTPUT_ARCH(arm) OUTPUT_ARCH(arm)
ENTRY(_start) ENTRY(_entry)
C_STACK_SIZE = 1048576; C_STACK_SIZE = 1048576;
IRQ_STACK_SIZE = 0; IRQ_STACK_SIZE = 0;