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:
@@ -192,7 +192,12 @@ rule CompileDTS
|
|||||||
|
|
||||||
actions 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
|
rule Ld
|
||||||
|
|||||||
@@ -212,7 +212,7 @@ BuildUImage haiku_loader_linux.ub : haiku_loader :
|
|||||||
-n 'haiku_loader $(TARGET_BOOT_BOARD)' ;
|
-n 'haiku_loader $(TARGET_BOOT_BOARD)' ;
|
||||||
|
|
||||||
local fdtBinary = [ FDirName $(HAIKU_OUTPUT_DIR) $(HAIKU_BOARD_FDT_NAME).dtb ] ;
|
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) :
|
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
|
||||||
|
|||||||
Reference in New Issue
Block a user