From db24244df1a159f149f49dc6cb68c4d926413245 Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Sat, 7 Mar 2015 13:00:56 -0600 Subject: [PATCH] rpi1/rpi2: More sane board loader bases --- build/jam/board/rpi1/BoardSetup | 4 ++-- build/jam/board/rpi2/BoardSetup | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/jam/board/rpi1/BoardSetup b/build/jam/board/rpi1/BoardSetup index d553063385..05e1b69265 100644 --- a/build/jam/board/rpi1/BoardSetup +++ b/build/jam/board/rpi1/BoardSetup @@ -7,12 +7,12 @@ HAIKU_BOOT_PLATFORM = u-boot ; # Various hardcoded addresses # -HAIKU_BOARD_LOADER_BASE = 0x0c180000 ; +HAIKU_BOARD_LOADER_BASE = 0x00080000 ; HAIKU_BOARD_LOADER_ENTRY_RAW = $(HAIKU_BOARD_LOADER_BASE) ; HAIKU_BOARD_LOADER_ENTRY_LINUX = `printf \"obase=16;ibase=16;8 + %x\\n\" $(HAIKU_BOARD_LOADER_BASE)|bc` ; HAIKU_BOARD_LOADER_ENTRY_NBSD = `printf \"obase=16;ibase=16;8 + %x\\n\" $(HAIKU_BOARD_LOADER_BASE)|bc` ; -HAIKU_BOARD_BOOT_ARCHIVE_BASE = 0x04000000 ; +HAIKU_BOARD_BOOT_ARCHIVE_BASE = 0x02100000 ; HAIKU_BOARD_BOOT_ARCHIVE_SIZE = 0x00400000 ; # TODO: needs to be configured in the config.txt # ramfsfile=haiku-floppyboot.tgz and ramfsaddr=x diff --git a/build/jam/board/rpi2/BoardSetup b/build/jam/board/rpi2/BoardSetup index 0b5822687a..da8965711c 100644 --- a/build/jam/board/rpi2/BoardSetup +++ b/build/jam/board/rpi2/BoardSetup @@ -7,12 +7,12 @@ HAIKU_BOOT_PLATFORM = u-boot ; # Various hardcoded addresses # -HAIKU_BOARD_LOADER_BASE = 0x0c180000 ; +HAIKU_BOARD_LOADER_BASE = 0x00080000 ; HAIKU_BOARD_LOADER_ENTRY_RAW = $(HAIKU_BOARD_LOADER_BASE) ; HAIKU_BOARD_LOADER_ENTRY_LINUX = `printf \"obase=16;ibase=16;8 + %x\\n\" $(HAIKU_BOARD_LOADER_BASE)|bc` ; HAIKU_BOARD_LOADER_ENTRY_NBSD = `printf \"obase=16;ibase=16;8 + %x\\n\" $(HAIKU_BOARD_LOADER_BASE)|bc` ; -HAIKU_BOARD_BOOT_ARCHIVE_BASE = 0x04000000 ; +HAIKU_BOARD_BOOT_ARCHIVE_BASE = 0x02100000 ; HAIKU_BOARD_BOOT_ARCHIVE_SIZE = 0x00400000 ; # TODO: needs to be configured in the config.txt # ramfsfile=haiku-floppyboot.tgz and ramfsaddr=x