From 19b42424c652a6557a21ecdf655256ed2cd95a5b Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Sun, 6 May 2012 12:04:47 -0500
Subject: [PATCH] rpi: Remove need for first32k.bin

* Thanks go out to Simon Arlott for replacing
  the first32k.bin blob with assembly removing
  the need for first32k.bin hack.
* This assembly is a modified version removing
  the Linux kernel boot args.
* haiku_loader renamed to kernel.img will boot
  on Raspberry Pi directly.
---
 build/jam/board/raspberry_pi/first32k.bin     | Bin 32768 -> 0 bytes
 .../boot/platform/raspberrypi_arm/entry.S     |  19 ++++++++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)
 delete mode 100644 build/jam/board/raspberry_pi/first32k.bin

diff --git a/build/jam/board/raspberry_pi/first32k.bin b/build/jam/board/raspberry_pi/first32k.bin
deleted file mode 100644
index ebf74be8a1434d3e296b664136f9d51bc851647f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32768
zcmeIuu?@md3<S^%B8Y+_15jiYn1O-FBxE)8MUyHcV3eK#qG#!B$=$tEvLy5SPuhK$
z+vPg7jIU4DN|)qW*}?SHq08;@tCV3YbgXlzU!C*zu?Y|$K!5-N0t5&UAV7cs0RjXF
z5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk
z1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs
X0RjXF5FkK+009C72oNAZVDAE7+*cMv

diff --git a/src/system/boot/platform/raspberrypi_arm/entry.S b/src/system/boot/platform/raspberrypi_arm/entry.S
index 4d48aeba79..8e83693904 100644
--- a/src/system/boot/platform/raspberrypi_arm/entry.S
+++ b/src/system/boot/platform/raspberrypi_arm/entry.S
@@ -1,9 +1,24 @@
 .globl _start
 _start:
+	b boot
 
+.balign 0x20
+boot:
+	mov r0, #0
+	@ Machine ID 3138 (0xC42)
+	mov r1, #66
+	orr r1, r1, #3072
+
+	ldr pc, kern_addr
+
+kern_addr:
+	.word kern
+
+.balign 0x8000, 0
+kern:
 	/* Set up 1MB C Stack Space */
 	mov sp, #0x100000
+	mov r4, #0
 
-	mov r4,#0
-	/* Start loader */
+	/* Start Haiku loader */
 	b pi_start