From ecaa4c29900193ac7a77dce43a410b57750747ba Mon Sep 17 00:00:00 2001 From: "Ithamar R. Adema" Date: Fri, 15 Oct 2010 09:48:43 +0000 Subject: [PATCH] * Incorporate ARM board name in flash/mmc image names; Fixes ticket #5213. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38971 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/system/boot/platform/u-boot/Jamfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/system/boot/platform/u-boot/Jamfile b/src/system/boot/platform/u-boot/Jamfile index 9d001bc1ab..88a56450ae 100644 --- a/src/system/boot/platform/u-boot/Jamfile +++ b/src/system/boot/platform/u-boot/Jamfile @@ -141,6 +141,7 @@ actions BuildUImageScript1 # requires sfdisk and mtools packages on linux rule BuildUBootSDImage image : files { + echo '$(image) $(files) $(HAIKU_BOOT_BOARD)' Depends $(image) : $(files) ; SDIMAGE_BLOCK_SIZE on $(image) = 1M ; SDIMAGE_SIZE on $(image) = $(HAIKU_BOARD_SDIMAGE_SIZE) ; @@ -209,15 +210,15 @@ if $(HAIKU_BOARD_UBOOT_IMAGE) && $(HAIKU_BOARD_UBOOT_IMAGE_URL) { } # flash image targets -BuildUBootFlashImage haiku_flash_image_raw.img : haiku_loader : +BuildUBootFlashImage haiku-$(HAIKU_BOOT_BOARD)_flash_image_raw.img : haiku_loader : $(ubootFile) ; -#BuildUBootFlashImage haiku_flash_image_elf.img : boot_loader_u-boot : +#BuildUBootFlashImage haiku-$(HAIKU_BOOT_BOARD)_flash_image_elf.img : boot_loader_u-boot : # $(ubootFile) ; -BuildUBootFlashImage haiku_flash_image_uimage.img : haiku_loader.ub : +BuildUBootFlashImage haiku-$(HAIKU_BOOT_BOARD)_flash_image_uimage.img : haiku_loader.ub : $(ubootFile) ; # SD/mmc image targets -BuildUBootSDImage haiku.mmc : $(HAIKU_BOARD_SDIMAGE_FILES) ; +BuildUBootSDImage haiku-$(HAIKU_BOOT_BOARD).mmc : $(HAIKU_BOARD_SDIMAGE_FILES) ; SEARCH on [ FGristFiles shell.S ] = [ FDirName $(HAIKU_TOP) src system boot platform $(TARGET_BOOT_PLATFORM) arch $(TARGET_ARCH) ] ;