From 6697d558623d2a3d28c9fc5a0b104ade39c51832 Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Wed, 24 Jul 2013 10:09:17 -0700 Subject: xilinx: move microblaze-generic .dts to standard location 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 Acked-by: Simon Glass Acked-by: Michal Simek --- 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 0000000000..203330987b --- /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 bf984b0cfd..0000000000 --- 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 203330987b..0000000000 --- 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 87f3d132a8..0e3de777b2 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -18,7 +18,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 -- cgit v1.2.1