machine/boards: Fix-up naming of common dtsi files

* Common dtsi's did not match the expected naming convention, renamed
  them to match.
* zynq-7-base.dtsi -> zynq7-base.dtsi
* zynq-7-mainline-gem.dtsi -> zynq7-mainline-gem.dtsi
* Updated all inclusions of renamed files

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>

10 files changed, 15 insertions, 15 deletions

diff --git a/conf/machine/boards/common/zynq-7-base.dtsi b/conf/machine/boards/common/zynq7-base.dtsi
index d79f23e4..ab109355 100644
--- a/conf/machine/boards/common/zynq-7-base.dtsi
+++ b/conf/machine/boards/common/zynq7-base.dtsi
@@ -3,7 +3,7 @@
  *
  * To use this base include it in the dts/dtsi which relies on it.
  *     /dts-v1/;
- *     /include/ "zynq-7-base.dtsi"
+ *     /include/ "zynq7-base.dtsi"
  *     / {
  *     ...
  *
diff --git a/conf/machine/boards/common/zynq-7-mainline-gem.dtsi b/conf/machine/boards/common/zynq7-mainline-gem.dtsi
index e3a331c5..c18e2691 100644
--- a/conf/machine/boards/common/zynq-7-mainline-gem.dtsi
+++ b/conf/machine/boards/common/zynq7-mainline-gem.dtsi
@@ -6,8 +6,8 @@
  *
  * To use this dtsi, include it after the base include. e.g.
  *     ...
- *     /include/ "zynq-7-base.dtsi"
- *     /include/ "zynq-7-mainline-gem.dtsi"
+ *     /include/ "zynq7-base.dtsi"
+ *     /include/ "zynq7-mainline-gem.dtsi"
  *     / {
  *     ...
  */
diff --git a/conf/machine/boards/qemu/qemuzynq-yocto.dts b/conf/machine/boards/qemu/qemuzynq-yocto.dts
index 6beedf0f..e265f1ec 100644
--- a/conf/machine/boards/qemu/qemuzynq-yocto.dts
+++ b/conf/machine/boards/qemu/qemuzynq-yocto.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
-/include/ "zynq-7-base.dtsi"
-/include/ "zynq-7-mainline-gem.dtsi"
+/include/ "zynq7-base.dtsi"
+/include/ "zynq7-mainline-gem.dtsi"
 /include/ "qemuzynq-base.dtsi"
 / {
 } ;
diff --git a/conf/machine/boards/qemu/qemuzynq.dts b/conf/machine/boards/qemu/qemuzynq.dts
index d5f75b41..cf74d499 100644
--- a/conf/machine/boards/qemu/qemuzynq.dts
+++ b/conf/machine/boards/qemu/qemuzynq.dts
@@ -1,5 +1,5 @@
 /dts-v1/;
-/include/ "zynq-7-base.dtsi"
+/include/ "zynq7-base.dtsi"
 /include/ "qemuzynq-base.dtsi"
 / {
 } ;
diff --git a/conf/machine/boards/zc702/zc702-zynq7-yocto.dts b/conf/machine/boards/zc702/zc702-zynq7-yocto.dts
index 44bb3fb3..9a74ad52 100644
--- a/conf/machine/boards/zc702/zc702-zynq7-yocto.dts
+++ b/conf/machine/boards/zc702/zc702-zynq7-yocto.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
-/include/ "zynq-7-base.dtsi"
-/include/ "zynq-7-mainline-gem.dtsi"
+/include/ "zynq7-base.dtsi"
+/include/ "zynq7-mainline-gem.dtsi"
 /include/ "zc702-zynq7-board.dtsi"
 / {
 } ;
\ No newline at end of file
diff --git a/conf/machine/boards/zc702/zc702-zynq7.dts b/conf/machine/boards/zc702/zc702-zynq7.dts
index dd179e98..8c5f197a 100644
--- a/conf/machine/boards/zc702/zc702-zynq7.dts
+++ b/conf/machine/boards/zc702/zc702-zynq7.dts
@@ -1,5 +1,5 @@
 /dts-v1/;
-/include/ "zynq-7-base.dtsi"
+/include/ "zynq7-base.dtsi"
 /include/ "zc702-zynq7-board.dtsi"
 / {
 } ;
\ No newline at end of file
diff --git a/conf/machine/boards/zc706/zc706-zynq7-yocto.dts b/conf/machine/boards/zc706/zc706-zynq7-yocto.dts
index 38eedc29..3b7f9c6c 100644
--- a/conf/machine/boards/zc706/zc706-zynq7-yocto.dts
+++ b/conf/machine/boards/zc706/zc706-zynq7-yocto.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
-/include/ "zynq-7-base.dtsi"
-/include/ "zynq-7-mainline-gem.dtsi"
+/include/ "zynq7-base.dtsi"
+/include/ "zynq7-mainline-gem.dtsi"
 /include/ "zc706-zynq7-board.dtsi"
 / {
 } ;
\ No newline at end of file
diff --git a/conf/machine/boards/zc706/zc706-zynq7.dts b/conf/machine/boards/zc706/zc706-zynq7.dts
index 3dfd136c..654986e4 100644
--- a/conf/machine/boards/zc706/zc706-zynq7.dts
+++ b/conf/machine/boards/zc706/zc706-zynq7.dts
@@ -1,5 +1,5 @@
 /dts-v1/;
-/include/ "zynq-7-base.dtsi"
+/include/ "zynq7-base.dtsi"
 /include/ "zc706-zynq7-board.dtsi"
 / {
 } ;
\ No newline at end of file
diff --git a/conf/machine/boards/zedboard/zedboard-zynq7-yocto.dts b/conf/machine/boards/zedboard/zedboard-zynq7-yocto.dts
index f025bbd9..b347c23b 100644
--- a/conf/machine/boards/zedboard/zedboard-zynq7-yocto.dts
+++ b/conf/machine/boards/zedboard/zedboard-zynq7-yocto.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
-/include/ "zynq-7-base.dtsi"
-/include/ "zynq-7-mainline-gem.dtsi"
+/include/ "zynq7-base.dtsi"
+/include/ "zynq7-mainline-gem.dtsi"
 /include/ "zedboard-zynq7-board.dtsi"
 / {
 } ;
\ No newline at end of file
diff --git a/conf/machine/boards/zedboard/zedboard-zynq7.dts b/conf/machine/boards/zedboard/zedboard-zynq7.dts
index de37b687..e16e15ba 100644
--- a/conf/machine/boards/zedboard/zedboard-zynq7.dts
+++ b/conf/machine/boards/zedboard/zedboard-zynq7.dts
@@ -1,5 +1,5 @@
 /dts-v1/;
-/include/ "zynq-7-base.dtsi"
+/include/ "zynq7-base.dtsi"
 /include/ "zedboard-zynq7-board.dtsi"
 / {
 } ;
\ No newline at end of file