Fix CompileDTS rule to locate the device tree blob properly

This avoids having to call it from the BoardSetup files.
This commit is contained in:
François Revol
2015-04-24 02:27:55 +02:00
parent 8361c0f11a
commit a2ddc1c06e
4 changed files with 11 additions and 14 deletions
+1
View File
@@ -187,6 +187,7 @@ actions AssembleNasm
rule CompileDTS
{
MakeLocate $(<) : $(HAIKU_OUTPUT_DIR) ;
Depends $(<) : $(>) ;
}
+1 -4
View File
@@ -53,9 +53,6 @@ mloFile = [ DownloadFile $(HAIKU_BOARD_MLO_IMAGE)
ubootFile = [ DownloadFile $(HAIKU_BOARD_UBOOT_IMAGE)
: $(HAIKU_BOARD_UBOOT_IMAGE_URL) ] ;
local fdtBinary = [ FDirName $(HAIKU_OUTPUT_DIR) $(HAIKU_BOARD_FDT_NAME).dtb ] ;
CompileDTS $(fdtBinary) : [ FDirName $(HAIKU_TOP) src data dts arch arm $(HAIKU_BOARD_FDT_NAME).dts ] ;
# U-Boot environment
# We load the uImage 2MB above its final destination, bootm will decode
# it to the proper location. Our image is smaller than 2MB so this works.
@@ -70,7 +67,7 @@ HAIKU_BOARD_SDIMAGE_FILES =
haiku_loader_nbsd.ub
haiku_loader_linux.ub
haiku-floppyboot.tgz.ub
$(fdtBinary)
$(HAIKU_BOARD_FDT_NAME).dtb
;
+1 -4
View File
@@ -27,9 +27,6 @@ bootcodeFile = [ DownloadFile bootcode.bin : $(HAIKU_BOARD_FIRMWARE_URL)/bootcod
startFile = [ DownloadFile start.elf : $(HAIKU_BOARD_FIRMWARE_URL)/start.elf ] ;
licenseFile = [ DownloadFile LICENCE.broadcom : $(HAIKU_BOARD_FIRMWARE_URL)/LICENCE.broadcom ] ;
local fdtBinary = [ FDirName $(HAIKU_OUTPUT_DIR) $(HAIKU_BOARD_FDT_NAME).dtb ] ;
CompileDTS $(fdtBinary) : [ FDirName $(HAIKU_TOP) src data dts arch arm $(HAIKU_BOARD_FDT_NAME).dts ] ;
HAIKU_BOARD_FIRMWARE_FILES =
$(bootcodeFile)
$(startFile)
@@ -48,7 +45,7 @@ HAIKU_BOARD_SDIMAGE_FAT_SIZE = 32 ;
HAIKU_BOARD_SDIMAGE_FILES =
$(HAIKU_BOARD_FIRMWARE_FILES)
$(configFile)
$(fdtBinary)
$(HAIKU_BOARD_FDT_NAME).dtb
$(ubootFile)
haiku_loader_linux.ub
haiku-floppyboot.tgz.ub