From f125673c3fec820f92e4352f505858ef05ebb42b Mon Sep 17 00:00:00 2001
From: Alexander von Gluck IV <kallisti5@unixzen.com>
Date: Wed, 28 Nov 2012 14:09:51 -0600
Subject: [PATCH] Rpi: Update instructions based on mmlr's recent work

---
 build/jam/board/raspberry_pi/config.txt | 37 ++++++++-----------------
 build/jam/board/raspberry_pi/info.txt   | 27 +++++++++---------
 2 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/build/jam/board/raspberry_pi/config.txt b/build/jam/board/raspberry_pi/config.txt
index 47cabbf8b9..d7e54cf586 100644
--- a/build/jam/board/raspberry_pi/config.txt
+++ b/build/jam/board/raspberry_pi/config.txt
@@ -1,37 +1,24 @@
-##### Overclocking
-# WARNING: Don't adjust unless you know what you are doing!
-#arm_freq=800
-#gpu_freq=350
-#core_freq=250
-#h264_freq=250
-#isp_freq=250
-#v3d_freq=250
-#sdram_freq=250
-#over_voltage=0
-#over_voltage_sdram=0
-#over_voltage_sdram_c=0
-#over_voltage_sdram_i=0
-#over_voltage_sdram_p=0
+##### CPU Speed
+#arm_freq 700
 
+##### Memory layout
+#gpu_mem 64
 
-##### Video
-#sdtv_mode=0
-#sdtv_aspect=1
-#hdmi_mode=19
-#hdmi_drive=
-#test_mode=0
-#disable_overscan=0
-enable_l2cache=1
-
+# Memory based on model.. overrides gpu_mem
+#gpu_mem_256 64
+#gpu_mem_512 64
 
 ##### Low level
+kernel=haiku_loader
+kernel_address=0x0
+ramfsfile=haiku-floppyboot.tgz
+ramfsaddr=0x04000000
+
 # Skip boot tags for non-linux platforms
 disable_commandline_tags=1
-#kernel_address=
 #device_tree=bcm2835.dtb
 #device_tree_address=0x100
 
-
 ##### UART Settings
 # Default is 115200
 #init_uart_baud=9600
diff --git a/build/jam/board/raspberry_pi/info.txt b/build/jam/board/raspberry_pi/info.txt
index c8651971c2..5b7ed7a60a 100644
--- a/build/jam/board/raspberry_pi/info.txt
+++ b/build/jam/board/raspberry_pi/info.txt
@@ -1,33 +1,34 @@
 Setting up the Haiku boot partition
 -------------------------------------
-
 partition 1 -- FAT32, bootable flag, type 'c'
 partition 2 -- BeFS, Haiku filesystem, type 'eb'
 
 The boot partition must contain the following files to boot Haiku:
-* bootcode.bin : 2nd stage bootloader, starts with SDRAM disabled
-* loader.bin : 3rd stage bootloader, starts with SDRAM enabled
-* start.elf: The GPU binary firmware image, provided by the foundation.
+* bootcode.bin : 2nd stage bootloader
+* start.elf: The GPU binary firmware image
 * haiku_loader: Haiku Loader
+* haiku-floppyboot.tgz: Compressed image with Haiku kernel
 * config.txt: A configuration file read by the GPU.
 
 Optional files:
 * vlls directory: Additional GPU code, e.g. extra codecs.
 
-Additional GPU firmware images, rename over start.elf to use them:
-* arm128_start.elf : 128M ARM, 128M GPU split
-  - use this for heavy 3D work, possibly also required for some video decoding)
-* arm192_start.elf : 192M ARM, 64M GPU split
-  - this is the default
-* arm224_start.elf : 224M ARM, 32M GPU split
-  - (use this for Linux only with no 3D or video processing.
-	Enough for the 1080p framebuffer, but not much else)
-
 Building
 -------------------------------------
 jam -q -sHAIKU_BOOT_BOARD=raspberry_pi -sHAIKU_BOOT_PLATFORM=raspberrypi_arm haiku_loader
+jam -q -sHAIKU_BOOT_BOARD=raspberry_pi -sHAIKU_BOOT_PLATFORM=raspberrypi_arm haiku-floppyboot.tgz
 
 config.txt options
 -------------------------------------
 kernel=haiku_loader
+kernel_address=0x0
 disable_commandline_tags=1
+ramfsfile=haiku-floppyboot.tgz
+ramfsaddr=0x04000000
+
+Additional information
+-------------------------------------
+* Latest Raspberry Pi firmware:
+	http://github.com/raspberrypi/firmware/tree/master/boot
+* config.txt options:
+	http://www.elinux.org/RPiconfig