[PATCH v1 5/5] nitrogen6x: move board specific files to nitrogen6x directory

[Troy Kisky]

This makes it clearer which board uses a file.

Signed-off-by: Troy Kisky <troy.kisky at boundarydevices.com>
---
 arch/arm/dts/Makefile                               |  3 ---
 board/boundary/nitrogen6x/MAINTAINERS               | 13 -------------
 board/boundary/nitrogen6x/Makefile                  | 13 +++++++++++++
 .../boundary/nitrogen6x}/imx6dl-nitrogen6x.dts      |  0
 .../boundary/nitrogen6x}/imx6q-nitrogen6x.dts       |  0
 .../boundary/nitrogen6x}/imx6q-sabrelite.dts        |  0
 .../boundary/nitrogen6x}/imx6qdl-nitrogen6x.dtsi    |  0
 .../boundary/nitrogen6x}/imx6qdl-sabrelite.dtsi     |  0
 .../boundary/nitrogen6x}/mx6qsabrelite_defconfig    |  0
 .../boundary/nitrogen6x}/nitrogen6dl2g_defconfig    |  0
 .../boundary/nitrogen6x}/nitrogen6dl_defconfig      |  0
 .../boundary/nitrogen6x}/nitrogen6q2g_defconfig     |  0
 .../boundary/nitrogen6x}/nitrogen6q_defconfig       |  0
 .../boundary/nitrogen6x}/nitrogen6s1g_defconfig     |  0
 .../boundary/nitrogen6x}/nitrogen6s_defconfig       |  0
 .../boundary/nitrogen6x}/nitrogen6x.h               |  2 +-
 16 files changed, 14 insertions(+), 17 deletions(-)
 rename {arch/arm/dts => board/boundary/nitrogen6x}/imx6dl-nitrogen6x.dts (100%)
 rename {arch/arm/dts => board/boundary/nitrogen6x}/imx6q-nitrogen6x.dts (100%)
 rename {arch/arm/dts => board/boundary/nitrogen6x}/imx6q-sabrelite.dts (100%)
 rename {arch/arm/dts => board/boundary/nitrogen6x}/imx6qdl-nitrogen6x.dtsi (100%)
 rename {arch/arm/dts => board/boundary/nitrogen6x}/imx6qdl-sabrelite.dtsi (100%)
 rename {configs => board/boundary/nitrogen6x}/mx6qsabrelite_defconfig (100%)
 rename {configs => board/boundary/nitrogen6x}/nitrogen6dl2g_defconfig (100%)
 rename {configs => board/boundary/nitrogen6x}/nitrogen6dl_defconfig (100%)
 rename {configs => board/boundary/nitrogen6x}/nitrogen6q2g_defconfig (100%)
 rename {configs => board/boundary/nitrogen6x}/nitrogen6q_defconfig (100%)
 rename {configs => board/boundary/nitrogen6x}/nitrogen6s1g_defconfig (100%)
 rename {configs => board/boundary/nitrogen6x}/nitrogen6s_defconfig (100%)
 rename {include/configs => board/boundary/nitrogen6x}/nitrogen6x.h (98%)

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 7f622fedbda..a864a6dd4b8 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -744,7 +744,6 @@ dtb-y += \
 	imx6dl-mba6a.dtb \
 	imx6dl-mba6b.dtb \
 	imx6dl-mamoj.dtb \
-	imx6dl-nitrogen6x.dtb \
 	imx6dl-pico.dtb \
 	imx6dl-udoo.dtb \
 	imx6dl-riotboard.dtb \
@@ -792,13 +791,11 @@ dtb-y += \
 	imx6q-mba6a.dtb \
 	imx6q-mba6b.dtb \
 	imx6q-mccmon6.dtb\
-	imx6q-nitrogen6x.dtb \
 	imx6q-novena.dtb \
 	imx6q-pico.dtb \
 	imx6q-phytec-mira-rdk-nand.dtb \
 	imx6q-udoo.dtb \
 	imx6q-sabreauto.dtb \
-	imx6q-sabrelite.dtb \
 	imx6q-sabresd.dtb \
 	imx6q-tbs2910.dtb \
 	imx6q-wandboard-revd1.dtb \
diff --git a/board/boundary/nitrogen6x/MAINTAINERS b/board/boundary/nitrogen6x/MAINTAINERS
index 17018d69f64..b11bc1f20d1 100644
--- a/board/boundary/nitrogen6x/MAINTAINERS
+++ b/board/boundary/nitrogen6x/MAINTAINERS
@@ -1,17 +1,4 @@
 NITROGEN6X BOARD
 M:	Troy Kisky <troy.kisky at boundarydevices.com>
 S:	Maintained
-F:	arch/arm/dts/imx6dl-nitrogen6x.dts
-F:	arch/arm/dts/imx6q-nitrogen6x.dts
-F:	arch/arm/dts/imx6q-sabrelite.dts
-F:	arch/arm/dts/imx6qdl-nitrogen6x.dtsi
-F:	arch/arm/dts/imx6qdl-sabrelite.dtsi
 F:	board/boundary/nitrogen6x/
-F:	include/configs/nitrogen6x.h
-F:	configs/mx6qsabrelite_defconfig
-F:	configs/nitrogen6dl_defconfig
-F:	configs/nitrogen6dl2g_defconfig
-F:	configs/nitrogen6q_defconfig
-F:	configs/nitrogen6q2g_defconfig
-F:	configs/nitrogen6s_defconfig
-F:	configs/nitrogen6s1g_defconfig
diff --git a/board/boundary/nitrogen6x/Makefile b/board/boundary/nitrogen6x/Makefile
index c8433bd7488..dd627411fa9 100644
--- a/board/boundary/nitrogen6x/Makefile
+++ b/board/boundary/nitrogen6x/Makefile
@@ -5,3 +5,16 @@
 # Copyright (C) 2013, Boundary Devices <info at boundarydevices.com>
 
 obj-y  := nitrogen6x.o
+
+dtb-y += imx6dl-nitrogen6x.dtb \
+	imx6q-nitrogen6x.dtb \
+	imx6q-sabrelite.dtb \
+
+# Add any required device tree compiler flags here
+DTC_FLAGS += -a 0x8
+
+PHONY += dtbs
+dtbs: $(addprefix $(obj)/, $(dtb-y))
+	@:
+
+clean-files := $(dtb-y)
diff --git a/arch/arm/dts/imx6dl-nitrogen6x.dts b/board/boundary/nitrogen6x/imx6dl-nitrogen6x.dts
similarity index 100%
rename from arch/arm/dts/imx6dl-nitrogen6x.dts
rename to board/boundary/nitrogen6x/imx6dl-nitrogen6x.dts
diff --git a/arch/arm/dts/imx6q-nitrogen6x.dts b/board/boundary/nitrogen6x/imx6q-nitrogen6x.dts
similarity index 100%
rename from arch/arm/dts/imx6q-nitrogen6x.dts
rename to board/boundary/nitrogen6x/imx6q-nitrogen6x.dts
diff --git a/arch/arm/dts/imx6q-sabrelite.dts b/board/boundary/nitrogen6x/imx6q-sabrelite.dts
similarity index 100%
rename from arch/arm/dts/imx6q-sabrelite.dts
rename to board/boundary/nitrogen6x/imx6q-sabrelite.dts
diff --git a/arch/arm/dts/imx6qdl-nitrogen6x.dtsi b/board/boundary/nitrogen6x/imx6qdl-nitrogen6x.dtsi
similarity index 100%
rename from arch/arm/dts/imx6qdl-nitrogen6x.dtsi
rename to board/boundary/nitrogen6x/imx6qdl-nitrogen6x.dtsi
diff --git a/arch/arm/dts/imx6qdl-sabrelite.dtsi b/board/boundary/nitrogen6x/imx6qdl-sabrelite.dtsi
similarity index 100%
rename from arch/arm/dts/imx6qdl-sabrelite.dtsi
rename to board/boundary/nitrogen6x/imx6qdl-sabrelite.dtsi
diff --git a/configs/mx6qsabrelite_defconfig b/board/boundary/nitrogen6x/mx6qsabrelite_defconfig
similarity index 100%
rename from configs/mx6qsabrelite_defconfig
rename to board/boundary/nitrogen6x/mx6qsabrelite_defconfig
diff --git a/configs/nitrogen6dl2g_defconfig b/board/boundary/nitrogen6x/nitrogen6dl2g_defconfig
similarity index 100%
rename from configs/nitrogen6dl2g_defconfig
rename to board/boundary/nitrogen6x/nitrogen6dl2g_defconfig
diff --git a/configs/nitrogen6dl_defconfig b/board/boundary/nitrogen6x/nitrogen6dl_defconfig
similarity index 100%
rename from configs/nitrogen6dl_defconfig
rename to board/boundary/nitrogen6x/nitrogen6dl_defconfig
diff --git a/configs/nitrogen6q2g_defconfig b/board/boundary/nitrogen6x/nitrogen6q2g_defconfig
similarity index 100%
rename from configs/nitrogen6q2g_defconfig
rename to board/boundary/nitrogen6x/nitrogen6q2g_defconfig
diff --git a/configs/nitrogen6q_defconfig b/board/boundary/nitrogen6x/nitrogen6q_defconfig
similarity index 100%
rename from configs/nitrogen6q_defconfig
rename to board/boundary/nitrogen6x/nitrogen6q_defconfig
diff --git a/configs/nitrogen6s1g_defconfig b/board/boundary/nitrogen6x/nitrogen6s1g_defconfig
similarity index 100%
rename from configs/nitrogen6s1g_defconfig
rename to board/boundary/nitrogen6x/nitrogen6s1g_defconfig
diff --git a/configs/nitrogen6s_defconfig b/board/boundary/nitrogen6x/nitrogen6s_defconfig
similarity index 100%
rename from configs/nitrogen6s_defconfig
rename to board/boundary/nitrogen6x/nitrogen6s_defconfig
diff --git a/include/configs/nitrogen6x.h b/board/boundary/nitrogen6x/nitrogen6x.h
similarity index 98%
rename from include/configs/nitrogen6x.h
rename to board/boundary/nitrogen6x/nitrogen6x.h
index 1a1c08bd308..2c86a2a99d0 100644
--- a/include/configs/nitrogen6x.h
+++ b/board/boundary/nitrogen6x/nitrogen6x.h
@@ -9,7 +9,7 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include "mx6_common.h"
+#include <configs/mx6_common.h>
 
 #define CONFIG_USBD_HS
 
-- 
2.32.0