hrev48881 adds 1 changeset to branch 'master' old head: 9f76848ecae26b8db4cc24f5b4360397044fc579 new head: 1bd23f7213d272dec2fe407b96cfd87a16ee4c66 overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=1bd23f7213d2+%5E9f76848ecae2 ---------------------------------------------------------------------------- 1bd23f7213d2: rpi1/rpi2: fix linux bootloader entry point Looks like bad copy-paste :P [ François Revol <revol@xxxxxxx> ] ---------------------------------------------------------------------------- Revision: hrev48881 Commit: 1bd23f7213d272dec2fe407b96cfd87a16ee4c66 URL: http://cgit.haiku-os.org/haiku/commit/?id=1bd23f7213d2 Author: François Revol <revol@xxxxxxx> Date: Sat Mar 7 23:12:55 2015 UTC ---------------------------------------------------------------------------- 2 files changed, 2 insertions(+), 2 deletions(-) build/jam/board/rpi1/BoardSetup | 2 +- build/jam/board/rpi2/BoardSetup | 2 +- ---------------------------------------------------------------------------- diff --git a/build/jam/board/rpi1/BoardSetup b/build/jam/board/rpi1/BoardSetup index 05e1b69..3fd42cc 100644 --- a/build/jam/board/rpi1/BoardSetup +++ b/build/jam/board/rpi1/BoardSetup @@ -9,8 +9,8 @@ HAIKU_BOOT_PLATFORM = u-boot ; 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_LOADER_ENTRY_LINUX = `printf \"obase=16;ibase=16;10 + %x\\n\" $(HAIKU_BOARD_LOADER_BASE)|bc` ; HAIKU_BOARD_BOOT_ARCHIVE_BASE = 0x02100000 ; HAIKU_BOARD_BOOT_ARCHIVE_SIZE = 0x00400000 ; diff --git a/build/jam/board/rpi2/BoardSetup b/build/jam/board/rpi2/BoardSetup index 4e28fd5..d2f700f 100644 --- a/build/jam/board/rpi2/BoardSetup +++ b/build/jam/board/rpi2/BoardSetup @@ -9,8 +9,8 @@ HAIKU_BOOT_PLATFORM = u-boot ; 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_LOADER_ENTRY_LINUX = `printf \"obase=16;ibase=16;10 + %x\\n\" $(HAIKU_BOARD_LOADER_BASE)|bc` ; HAIKU_BOARD_BOOT_ARCHIVE_BASE = 0x02100000 ; HAIKU_BOARD_BOOT_ARCHIVE_SIZE = 0x00400000 ;