From 88d51506d0f23af02f95b881c85a2aba204c1e23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Fri, 31 Oct 2014 16:24:24 +0100
Subject: [PATCH] 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.
---
 build/jam/MainBuildRules                                   | 7 ++++++-
 src/data/dts/{ => arch/arm}/bcm2835.dtsi                   | 0
 src/data/dts/{ => arch/arm}/omap3-beagle-xm.dts            | 0
 src/data/dts/{ => arch/arm}/omap3.dtsi                     | 0
 src/data/dts/{ => arch/arm}/omap34xx-omap36xx-clocks.dtsi  | 0
 .../arm}/omap36xx-am35xx-omap3430es2plus-clocks.dtsi       | 0
 src/data/dts/{ => arch/arm}/omap36xx-clocks.dtsi           | 0
 .../{ => arch/arm}/omap36xx-omap3430es2plus-clocks.dtsi    | 0
 src/data/dts/{ => arch/arm}/omap36xx.dtsi                  | 0
 src/data/dts/{ => arch/arm}/omap3xxx-clocks.dtsi           | 0
 src/data/dts/{ => arch/arm}/pxa27x.dtsi                    | 0
 src/data/dts/{ => arch/arm}/pxa2xx.dtsi                    | 0
 src/data/dts/{ => arch/arm}/rpi.dts                        | 0
 src/data/dts/{ => arch/arm}/skeleton.dtsi                  | 0
 src/data/dts/{ => arch/arm}/twl4030.dtsi                   | 0
 src/data/dts/{ => arch/arm}/twl4030_omap3.dtsi             | 0
 src/data/dts/{ => arch/arm}/verdex.dts                     | 0
 src/system/boot/platform/u-boot/Jamfile                    | 2 +-
 18 files changed, 7 insertions(+), 2 deletions(-)
 rename src/data/dts/{ => arch/arm}/bcm2835.dtsi (100%)
 rename src/data/dts/{ => arch/arm}/omap3-beagle-xm.dts (100%)
 rename src/data/dts/{ => arch/arm}/omap3.dtsi (100%)
 rename src/data/dts/{ => arch/arm}/omap34xx-omap36xx-clocks.dtsi (100%)
 rename src/data/dts/{ => arch/arm}/omap36xx-am35xx-omap3430es2plus-clocks.dtsi (100%)
 rename src/data/dts/{ => arch/arm}/omap36xx-clocks.dtsi (100%)
 rename src/data/dts/{ => arch/arm}/omap36xx-omap3430es2plus-clocks.dtsi (100%)
 rename src/data/dts/{ => arch/arm}/omap36xx.dtsi (100%)
 rename src/data/dts/{ => arch/arm}/omap3xxx-clocks.dtsi (100%)
 rename src/data/dts/{ => arch/arm}/pxa27x.dtsi (100%)
 rename src/data/dts/{ => arch/arm}/pxa2xx.dtsi (100%)
 rename src/data/dts/{ => arch/arm}/rpi.dts (100%)
 rename src/data/dts/{ => arch/arm}/skeleton.dtsi (100%)
 rename src/data/dts/{ => arch/arm}/twl4030.dtsi (100%)
 rename src/data/dts/{ => arch/arm}/twl4030_omap3.dtsi (100%)
 rename src/data/dts/{ => arch/arm}/verdex.dts (100%)

diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index 00a0c613c1..7fd8a76abd 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -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
diff --git a/src/data/dts/bcm2835.dtsi b/src/data/dts/arch/arm/bcm2835.dtsi
similarity index 100%
rename from src/data/dts/bcm2835.dtsi
rename to src/data/dts/arch/arm/bcm2835.dtsi
diff --git a/src/data/dts/omap3-beagle-xm.dts b/src/data/dts/arch/arm/omap3-beagle-xm.dts
similarity index 100%
rename from src/data/dts/omap3-beagle-xm.dts
rename to src/data/dts/arch/arm/omap3-beagle-xm.dts
diff --git a/src/data/dts/omap3.dtsi b/src/data/dts/arch/arm/omap3.dtsi
similarity index 100%
rename from src/data/dts/omap3.dtsi
rename to src/data/dts/arch/arm/omap3.dtsi
diff --git a/src/data/dts/omap34xx-omap36xx-clocks.dtsi b/src/data/dts/arch/arm/omap34xx-omap36xx-clocks.dtsi
similarity index 100%
rename from src/data/dts/omap34xx-omap36xx-clocks.dtsi
rename to src/data/dts/arch/arm/omap34xx-omap36xx-clocks.dtsi
diff --git a/src/data/dts/omap36xx-am35xx-omap3430es2plus-clocks.dtsi b/src/data/dts/arch/arm/omap36xx-am35xx-omap3430es2plus-clocks.dtsi
similarity index 100%
rename from src/data/dts/omap36xx-am35xx-omap3430es2plus-clocks.dtsi
rename to src/data/dts/arch/arm/omap36xx-am35xx-omap3430es2plus-clocks.dtsi
diff --git a/src/data/dts/omap36xx-clocks.dtsi b/src/data/dts/arch/arm/omap36xx-clocks.dtsi
similarity index 100%
rename from src/data/dts/omap36xx-clocks.dtsi
rename to src/data/dts/arch/arm/omap36xx-clocks.dtsi
diff --git a/src/data/dts/omap36xx-omap3430es2plus-clocks.dtsi b/src/data/dts/arch/arm/omap36xx-omap3430es2plus-clocks.dtsi
similarity index 100%
rename from src/data/dts/omap36xx-omap3430es2plus-clocks.dtsi
rename to src/data/dts/arch/arm/omap36xx-omap3430es2plus-clocks.dtsi
diff --git a/src/data/dts/omap36xx.dtsi b/src/data/dts/arch/arm/omap36xx.dtsi
similarity index 100%
rename from src/data/dts/omap36xx.dtsi
rename to src/data/dts/arch/arm/omap36xx.dtsi
diff --git a/src/data/dts/omap3xxx-clocks.dtsi b/src/data/dts/arch/arm/omap3xxx-clocks.dtsi
similarity index 100%
rename from src/data/dts/omap3xxx-clocks.dtsi
rename to src/data/dts/arch/arm/omap3xxx-clocks.dtsi
diff --git a/src/data/dts/pxa27x.dtsi b/src/data/dts/arch/arm/pxa27x.dtsi
similarity index 100%
rename from src/data/dts/pxa27x.dtsi
rename to src/data/dts/arch/arm/pxa27x.dtsi
diff --git a/src/data/dts/pxa2xx.dtsi b/src/data/dts/arch/arm/pxa2xx.dtsi
similarity index 100%
rename from src/data/dts/pxa2xx.dtsi
rename to src/data/dts/arch/arm/pxa2xx.dtsi
diff --git a/src/data/dts/rpi.dts b/src/data/dts/arch/arm/rpi.dts
similarity index 100%
rename from src/data/dts/rpi.dts
rename to src/data/dts/arch/arm/rpi.dts
diff --git a/src/data/dts/skeleton.dtsi b/src/data/dts/arch/arm/skeleton.dtsi
similarity index 100%
rename from src/data/dts/skeleton.dtsi
rename to src/data/dts/arch/arm/skeleton.dtsi
diff --git a/src/data/dts/twl4030.dtsi b/src/data/dts/arch/arm/twl4030.dtsi
similarity index 100%
rename from src/data/dts/twl4030.dtsi
rename to src/data/dts/arch/arm/twl4030.dtsi
diff --git a/src/data/dts/twl4030_omap3.dtsi b/src/data/dts/arch/arm/twl4030_omap3.dtsi
similarity index 100%
rename from src/data/dts/twl4030_omap3.dtsi
rename to src/data/dts/arch/arm/twl4030_omap3.dtsi
diff --git a/src/data/dts/verdex.dts b/src/data/dts/arch/arm/verdex.dts
similarity index 100%
rename from src/data/dts/verdex.dts
rename to src/data/dts/arch/arm/verdex.dts
diff --git a/src/system/boot/platform/u-boot/Jamfile b/src/system/boot/platform/u-boot/Jamfile
index 4462813eef..24bb9014ca 100644
--- a/src/system/boot/platform/u-boot/Jamfile
+++ b/src/system/boot/platform/u-boot/Jamfile
@@ -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