diff --git a/build/jam/board/raspberry_pi/BoardSetup b/build/jam/board/raspberry_pi/BoardSetup index 00675a16fe..801af618e3 100644 --- a/build/jam/board/raspberry_pi/BoardSetup +++ b/build/jam/board/raspberry_pi/BoardSetup @@ -1,66 +1,41 @@ # Raspberry Pi board-specific definitions HAIKU_BOARD_DESCRIPTION = "Raspberry Pi" ; - -# must force both since they are set before this file is read. HAIKU_BOOT_PLATFORM = raspberrypi_arm ; # # Various hardcoded addresses # -# load address for haiku_loader HAIKU_BOARD_LOADER_BASE = 0x32000000 ; -# entry points (raw binary, and netbsd loader emulation) -HAIKU_BOARD_LOADER_ENTRY_RAW = 0x32000000 ; -HAIKU_BOARD_LOADER_ENTRY_NBSD = 0x32000008 ; - -# load address for haiku_loader uimage -# (must be different than real load address) -HAIKU_BOARD_LOADER_UIBASE = 0x34000000 ; - -HAIKU_BOARD_LOADER_STACK_BASE = 0x34000000 ; # # Flash image # -# u-boot binary image filename, to build the flash image -# XXX: Locate it somehow (for now just put it in generated/) -#HAIKU_BOARD_UBOOT_IMAGE ?= u-boot-verdex-400-r1604.bin ; -#HAIKU_BOARD_UBOOT_IMAGE_URL = -# http://www.gumstix.net/feeds/u-boot/u-boot-verdex-400-r1604.bin ; - +# N/A for Raspberry Pi # # mmc/SD image # -# in MB -HAIKU_BOARD_SDIMAGE_SIZE = 256 ; +HAIKU_BOARD_FIRMWARE_URL = http://github.com/raspberrypi/firmware/raw/master/boot/ ; +HAIKU_BOARD_FIRMWARE_FILES = + bootcode.bin + loader.bin + arm224_start.elf # start.elf + LICENSE.broadcom +; # in MB HAIKU_BOARD_SDIMAGE_FAT_SIZE = 32 ; - -# offset in blocks XXX: FIXME -# (autodetect from sfdisk or use cylinder count for fat size) -#HAIKU_BOARD_SDIMAGE_BFS_OFFSET = ; - -# autoboot script -HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME = uImage.bin ; - -HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT = "\ -if mmcinit; then \ - neo backlight off; \ - fatload mmc 0 $(HAIKU_BOARD_LOADER_UIBASE) haiku_loader_nbsd.ub; \ - neo backlight on; \ - bootm $(HAIKU_BOARD_LOADER_UIBASE); \ -fi" ; - -HAIKU_BOARD_SDIMAGE_FILES = +HAIKU_BOARD_SDIMAGE_FAT_FILES = + $(HAIKU_BOARD_FIRMWARE_FILES) haiku_loader ; +# in MB +HAIKU_BOARD_SDIMAGE_SIZE = 256 ; # # gcc flags for the specific cpu diff --git a/build/jam/board/raspberry_pi/arm128_start.elf b/build/jam/board/raspberry_pi/arm128_start.elf deleted file mode 100755 index 0e1f3ff2de..0000000000 Binary files a/build/jam/board/raspberry_pi/arm128_start.elf and /dev/null differ diff --git a/build/jam/board/raspberry_pi/arm192_start.elf b/build/jam/board/raspberry_pi/arm192_start.elf deleted file mode 100755 index 2686fae9d3..0000000000 Binary files a/build/jam/board/raspberry_pi/arm192_start.elf and /dev/null differ diff --git a/build/jam/board/raspberry_pi/arm224_start.elf b/build/jam/board/raspberry_pi/arm224_start.elf deleted file mode 100755 index 731f79093c..0000000000 Binary files a/build/jam/board/raspberry_pi/arm224_start.elf and /dev/null differ diff --git a/build/jam/board/raspberry_pi/beta_start.elf b/build/jam/board/raspberry_pi/beta_start.elf deleted file mode 100644 index 1e78b23823..0000000000 Binary files a/build/jam/board/raspberry_pi/beta_start.elf and /dev/null differ diff --git a/build/jam/board/raspberry_pi/bootcode.bin b/build/jam/board/raspberry_pi/bootcode.bin deleted file mode 100755 index 209d1196a7..0000000000 Binary files a/build/jam/board/raspberry_pi/bootcode.bin and /dev/null differ diff --git a/build/jam/board/raspberry_pi/cmdline.txt b/build/jam/board/raspberry_pi/cmdline.txt deleted file mode 100755 index bf19ae64be..0000000000 --- a/build/jam/board/raspberry_pi/cmdline.txt +++ /dev/null @@ -1,2 +0,0 @@ -dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 rootwait - diff --git a/build/jam/board/raspberry_pi/info.txt b/build/jam/board/raspberry_pi/info.txt index 38f3715475..41e912ac7f 100644 --- a/build/jam/board/raspberry_pi/info.txt +++ b/build/jam/board/raspberry_pi/info.txt @@ -1,27 +1,17 @@ -Some early bootloader information from Raspberry Pi foundation... - -Setting up the boot partition +Setting up the Haiku boot partition partition 1 -- FAT32, bootable flag, type 'c' -partition 2 -- os, whatever - -The boot partition must contain the following files, -get them from one of the official images: +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. - * For now, use beta_start.elf -* kernel.img: The OS kernel to load on the ARM processor. - Normally this is Linux - see instructions for compiling a kernel. -* cmdline.txt: Parameters passed to the kernel on boot. +* kernel.img: Haiku Loader (haiku_loader) +* config.txt: A configuration file read by the GPU. Optional files: -* config.txt: A configuration file read by the GPU. - Use this to override set the video mode, alter system clock speeds, - voltages, etc. * vlls directory: Additional GPU code, e.g. extra codecs. - Not present in the initial release. Additional GPU firmware images, rename over start.elf to use them: * arm128_start.elf : 128M ARM, 128M GPU split diff --git a/build/jam/board/raspberry_pi/license.txt b/build/jam/board/raspberry_pi/license.txt deleted file mode 100644 index b7d6e3352d..0000000000 --- a/build/jam/board/raspberry_pi/license.txt +++ /dev/null @@ -1,25 +0,0 @@ --------- Original Message -------- -Subject: Re: What is the arm224_start.elf license info? -Date: 05.03.2012 14:18 -From: Eben Upton -To: Alexander von Gluck - -Hi Alex -The stuff in the boot partition is released under an extremely -permissive license - it's freely redistributable for any purpose -related to Raspberry Pi (such as yours). - -Cheers -Eben Upton -Executive Director, Raspberry Pi Foundation - -On Sun, Mar 4, 2012 at 2:13 PM, Alexander von Gluck - wrote: -> What is the license for the arm224_start.elf and friends GPU first stage -> stuff? -> -> I am toying with a Haiku port and thought it would be nice to add these to -> our repository. -> -> Thanks! -> -- Alex diff --git a/build/jam/board/raspberry_pi/loader.bin b/build/jam/board/raspberry_pi/loader.bin deleted file mode 100755 index 3f7dc9087c..0000000000 Binary files a/build/jam/board/raspberry_pi/loader.bin and /dev/null differ