i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix CompileDTS rule to locate the device tree blob properly

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/MainBuildRules
+1
View File
@@ -187,6 +187,7 @@ actions AssembleNasm
rule CompileDTS rule CompileDTS
{ {
MakeLocate $(<) : $(HAIKU_OUTPUT_DIR) ;
Depends $(<) : $(>) ; Depends $(<) : $(>) ;
} }
build/jam/board/beagle/BoardSetup
+1 -4
View File
@@ -53,9 +53,6 @@ mloFile = [ DownloadFile $(HAIKU_BOARD_MLO_IMAGE)
ubootFile = [ DownloadFile $(HAIKU_BOARD_UBOOT_IMAGE) ubootFile = [ DownloadFile $(HAIKU_BOARD_UBOOT_IMAGE)
: $(HAIKU_BOARD_UBOOT_IMAGE_URL) ] ; : $(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 # U-Boot environment
# We load the uImage 2MB above its final destination, bootm will decode # 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. # 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_nbsd.ub
haiku_loader_linux.ub haiku_loader_linux.ub
haiku-floppyboot.tgz.ub haiku-floppyboot.tgz.ub
$(fdtBinary) $(HAIKU_BOARD_FDT_NAME).dtb
; ;
build/jam/board/rpi2/BoardSetup
+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 ] ; startFile = [ DownloadFile start.elf : $(HAIKU_BOARD_FIRMWARE_URL)/start.elf ] ;
licenseFile = [ DownloadFile LICENCE.broadcom : $(HAIKU_BOARD_FIRMWARE_URL)/LICENCE.broadcom ] ; 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 = HAIKU_BOARD_FIRMWARE_FILES =
$(bootcodeFile) $(bootcodeFile)
$(startFile) $(startFile)
@@ -48,7 +45,7 @@ HAIKU_BOARD_SDIMAGE_FAT_SIZE = 32 ;
HAIKU_BOARD_SDIMAGE_FILES = HAIKU_BOARD_SDIMAGE_FILES =
$(HAIKU_BOARD_FIRMWARE_FILES) $(HAIKU_BOARD_FIRMWARE_FILES)
$(configFile) $(configFile)
$(fdtBinary) $(HAIKU_BOARD_FDT_NAME).dtb
$(ubootFile) $(ubootFile)
haiku_loader_linux.ub haiku_loader_linux.ub
haiku-floppyboot.tgz.ub haiku-floppyboot.tgz.ub
src/system/boot/platform/u-boot/Jamfile
+8 -6
View File
@@ -248,13 +248,15 @@ BuildUImage haiku_loader_linux.ub : haiku_loader :
-a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_LINUX) -a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_LINUX)
-n 'haiku_loader $(TARGET_BOOT_BOARD)' ; -n 'haiku_loader $(TARGET_BOOT_BOARD)' ;
local fdtBinary = [ FDirName $(HAIKU_OUTPUT_DIR) $(HAIKU_BOARD_FDT_NAME).dtb ] ; if $(HAIKU_BOARD_FDT_NAME) {
CompileDTS $(fdtBinary) : [ FDirName $(HAIKU_TOP) src data dts arch $(TARGET_ARCH) $(HAIKU_BOARD_FDT_NAME).dts ] ; local fdtBinary = $(HAIKU_BOARD_FDT_NAME).dtb ;
CompileDTS $(fdtBinary) : [ FDirName $(HAIKU_TOP) src data dts arch $(TARGET_ARCH) $(HAIKU_BOARD_FDT_NAME).dts ] ;
BuildUImage haiku_loader_nbsd.ub : haiku_loader $(tgzArchive) $(fdtBinary) : BuildUImage haiku_loader_nbsd.ub : haiku_loader $(tgzArchive) $(fdtBinary) :
-A $(TARGET_ARCH) -O $(uImageFakeOS) -T multi -C none -A $(TARGET_ARCH) -O $(uImageFakeOS) -T multi -C none
-a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_NBSD) -a $(HAIKU_BOARD_LOADER_BASE) -e $(HAIKU_BOARD_LOADER_ENTRY_NBSD)
-n 'haiku_loader $(TARGET_BOOT_BOARD)' ; -n 'haiku_loader $(TARGET_BOOT_BOARD)' ;
}
if $(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME) { if $(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME) {
BuildUImageScript $(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME) : BuildUImageScript $(HAIKU_BOARD_SDIMAGE_UBOOT_SCRIPT_NAME) :