From: Stephen Warren <swar...@nvidia.com>
Aside from microblaze, all other SoCs/boards/vendors store their DT files
in board/$vendor/dts/$soc-$board.dts. Move microblaze-generic.dts to this
location for consistency.
Signed-off-by: Stephen Warren <swar...@nvidia.com>
Acked-by: Simon Glass <s...@chromium.org>
Acked-by: Michal Simek <mon...@monstr.eu>
---
board/xilinx/dts/microblaze-generic.dts | 7 +++++++
board/xilinx/dts/microblaze.dts | 1 -
board/xilinx/microblaze-generic/dts/microblaze.dts | 7 -------
include/configs/microblaze-generic.h | 2 +-
4 files changed, 8 insertions(+), 9 deletions(-)
create mode 100644 board/xilinx/dts/microblaze-generic.dts
delete mode 100644 board/xilinx/dts/microblaze.dts
delete mode 100644 board/xilinx/microblaze-generic/dts/microblaze.dts
diff --git a/board/xilinx/dts/microblaze-generic.dts
b/board/xilinx/dts/microblaze-generic.dts
new file mode 100644
index 0000000..2033309
--- /dev/null
+++ b/board/xilinx/dts/microblaze-generic.dts
@@ -0,0 +1,7 @@
+/dts-v1/;
+/ {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ aliases {
+ } ;
+} ;
diff --git a/board/xilinx/dts/microblaze.dts b/board/xilinx/dts/microblaze.dts
deleted file mode 100644
index bf984b0..0000000
--- a/board/xilinx/dts/microblaze.dts
+++ /dev/null
@@ -1 +0,0 @@
-/include/ BOARD_DTS
diff --git a/board/xilinx/microblaze-generic/dts/microblaze.dts
b/board/xilinx/microblaze-generic/dts/microblaze.dts
deleted file mode 100644
index 2033309..0000000
--- a/board/xilinx/microblaze-generic/dts/microblaze.dts
+++ /dev/null
@@ -1,7 +0,0 @@
-/dts-v1/;
-/ {
- #address-cells = <1>;
- #size-cells = <1>;
- aliases {
- } ;
-} ;
diff --git a/include/configs/microblaze-generic.h
b/include/configs/microblaze-generic.h
index 17f53ba..ad91d21 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -34,7 +34,7 @@
/* Open Firmware DTS */
#define CONFIG_OF_CONTROL 1
#define CONFIG_OF_EMBED 1
-#define CONFIG_DEFAULT_DEVICE_TREE microblaze
+#define CONFIG_DEFAULT_DEVICE_TREE microblaze-generic
/* linear and spi flash memory */
#ifdef XILINX_FLASH_START
--
1.7.10.4
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
