Move ARM device tree files to an arch-specific subfolder

FDT are also used on PPC at least, and at least skeleton.dtsi
might clash since there is a different one for PPC.
This commit is contained in:
François Revol 2014-10-31 16:24:24 +01:00
parent 6a80e6889a
commit 88d51506d0
18 changed files with 7 additions and 2 deletions

View File

@ -192,7 +192,12 @@ rule CompileDTS
actions CompileDTS
{
cpp -P -xassembler-with-cpp -I$(HAIKU_TOP)/src/data/dts/ $(2) | dtc -O dtb -o $(1) -i $(HAIKU_TOP)/src/data/dts ;
cpp -P -xassembler-with-cpp \
-I$(HAIKU_TOP)/src/data/dts/arch/$(TARGET_ARCH) \
-I$(HAIKU_TOP)/src/data/dts $(2) \
| dtc -O dtb -o $(1) \
-i $(HAIKU_TOP)/src/data/dts/arch/$(TARGET_ARCH) \
-i $(HAIKU_TOP)/src/data/dts ;
}
rule Ld

View File

@ -212,7 +212,7 @@ BuildUImage haiku_loader_linux.ub : haiku_loader :
-n 'haiku_loader $(TARGET_BOOT_BOARD)' ;
local fdtBinary = [ FDirName $(HAIKU_OUTPUT_DIR) $(HAIKU_BOARD_FDT_NAME).dtb ] ;
CompileDTS $(fdtBinary) : [ FDirName $(HAIKU_TOP) src data dts $(HAIKU_BOARD_FDT_NAME).dts ] ;
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) :
-A $(TARGET_ARCH) -O $(uImageFakeOS) -T multi -C none