From 67555ed8299817d01af0dbcb5fae15aff4d869dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Sat, 1 Nov 2014 20:34:38 +0100 Subject: [PATCH] ARM: beagle: Also use the linux entry point This way U-Boot is able to patch the FDT with the correct RAM size before we get to read it. --- build/jam/board/beagle/BoardSetup | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/build/jam/board/beagle/BoardSetup b/build/jam/board/beagle/BoardSetup index 2c22fe223f..7731f5dd3c 100644 --- a/build/jam/board/beagle/BoardSetup +++ b/build/jam/board/beagle/BoardSetup @@ -13,6 +13,7 @@ HAIKU_BOARD_LOADER_BASE = 0x80800000 ; # entry points (raw binary, and netbsd loader emulation) HAIKU_BOARD_LOADER_ENTRY_RAW = $(HAIKU_BOARD_LOADER_BASE) ; 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_LOADER_ENTRY = $(HAIKU_BOARD_LOADER_ENTRY_NBSD) ; HAIKU_BOARD_LOADER_FAKE_OS = netbsd ; @@ -57,14 +58,16 @@ ubootFile = [ DownloadFile $(HAIKU_BOARD_UBOOT_IMAGE) # it to the proper location. Our image is smaller than 2MB so this works. #HAIKU_BOARD_SDIMAGE_UBOOT_UENV_NAME = uEnv.txt ; HAIKU_BOARD_SDIMAGE_UBOOT_UENV = "uenvcmd=run loadImage; run mmcboot; \ - loadImage=fatload mmc0 0 $(HAIKU_BOARD_LOADER_UIBASE) haiku_loader_nbsd.ub \ - mmcboot=bootm $(HAIKU_BOARD_LOADER_UIBASE)" ; - + loadImage=fatload mmc0 0 $(HAIKU_BOARD_LOADER_UIBASE) haiku_loader_linux.ub; fatload mmc 0 0x80100000 $(HAIKU_BOARD_FDT_NAME).dtb; fatload mmc 0 0x81200000 haiku-floppyboot.tgz.ub; \ + mmcboot=bootm $(HAIKU_BOARD_LOADER_UIBASE) 0x81200000 0x80100000" ; HAIKU_BOARD_SDIMAGE_FILES = $(mloFile) $(ubootFile) haiku_loader_nbsd.ub + haiku_loader_linux.ub + haiku-floppyboot.tgz.ub + $(HAIKU_BOARD_FDT_NAME).dtb ;