From d1460ff57b0d23d93eecb44e53ef3fc06e8b10f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Mon, 21 Nov 2011 01:28:44 +0100 Subject: [PATCH] ARM: Rename flash and mmc base generic targets They are not so much arm-specific, really. We now have haiku-flash-*image variations, and haiku-mmc-image. --- src/system/boot/platform/u-boot/Jamfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/system/boot/platform/u-boot/Jamfile b/src/system/boot/platform/u-boot/Jamfile index f1e8948c5c..d708deb601 100644 --- a/src/system/boot/platform/u-boot/Jamfile +++ b/src/system/boot/platform/u-boot/Jamfile @@ -212,23 +212,23 @@ if $(HAIKU_BOARD_UBOOT_IMAGE) && $(HAIKU_BOARD_UBOOT_IMAGE_URL) { # flash image targets BuildUBootFlashImage haiku-$(HAIKU_BOOT_BOARD)_flash_image_raw.img : haiku_loader : $(ubootFile) ; -NotFile haiku-arm-image ; -Depends haiku-arm-image : haiku-$(HAIKU_BOOT_BOARD)_flash_image_raw.img ; +NotFile haiku-flash-image ; +Depends haiku-flash-image : haiku-$(HAIKU_BOOT_BOARD)_flash_image_raw.img ; #BuildUBootFlashImage haiku-$(HAIKU_BOOT_BOARD)_flash_image_elf.img : boot_loader_u-boot : # $(ubootFile) ; -#NotFile haiku-arm-elf-image ; -#Depends haiku-arm-elf-image : haiku-$(HAIKU_BOOT_BOARD)_flash_image_elf.img ; +#NotFile haiku-flash-elf-image ; +#Depends haiku-flash-elf-image : haiku-$(HAIKU_BOOT_BOARD)_flash_image_elf.img ; BuildUBootFlashImage haiku-$(HAIKU_BOOT_BOARD)_flash_image_uimage.img : haiku_loader.ub : $(ubootFile) ; -NotFile haiku-arm-uimage ; -Depends haiku-arm-uimage : haiku-$(HAIKU_BOOT_BOARD)_flash_image_uimage.img ; +NotFile haiku-flash-uimage ; +Depends haiku-flash-uimage : haiku-$(HAIKU_BOOT_BOARD)_flash_image_uimage.img ; # SD/mmc image targets BuildUBootSDImage haiku-$(HAIKU_BOOT_BOARD).mmc : $(HAIKU_BOARD_SDIMAGE_FILES) ; -NotFile haiku-arm-mmc ; -Depends haiku-arm-mmc : haiku-$(HAIKU_BOOT_BOARD).mmc ; +NotFile haiku-mmc-image ; +Depends haiku-mmc-image : haiku-$(HAIKU_BOOT_BOARD).mmc ; # TODO: move to arch/arm SEARCH on [ FGristFiles shell.S arch_start_kernel.S ]