diff options
author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-02-05 11:28:26 +0900 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-02-19 11:10:05 -0500 |
commit | 5ab502cb8900aee483dfba28700640672e0b060e (patch) | |
tree | 55cdefd0d3db1f47bbe0292cfbd571eed0dd76b1 | |
parent | 6ab6b2afa091dbceb37719b8a81637a00834be19 (diff) |
dts: move device tree sources to arch/$(ARCH)/dts/
Unlike Linux Kernel, U-Boot historically had *.dts files under
board/$(VENDOR)/dts/ and *.dtsi files under arch/$(ARCH)/dts/.
I think arch/$(ARCH)/dts dicretory is a better location
to store both *.dts and *.dtsi files.
For example, before this commit, board/xilinx/dts directory
had both Microblaze dts (microblaze-generic.dts) and
ARM dts (zynq-*.dts), which are totally unrelated.
This commit moves *.dts to arch/$(ARCH)/dts/ directories,
allowing us to describe nicely mutiple DTBs generation in the next commit.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r-- | arch/arm/dts/exynos5250-arndale.dts (renamed from board/samsung/dts/exynos5250-arndale.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/exynos5250-smdk5250.dts (renamed from board/samsung/dts/exynos5250-smdk5250.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/exynos5250-snow.dts (renamed from board/samsung/dts/exynos5250-snow.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/exynos5420-smdk5420.dts (renamed from board/samsung/dts/exynos5420-smdk5420.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra114-dalmore.dts (renamed from board/nvidia/dts/tegra114-dalmore.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra20-colibri_t20_iris.dts (renamed from board/toradex/dts/tegra20-colibri_t20_iris.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra20-harmony.dts (renamed from board/nvidia/dts/tegra20-harmony.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra20-medcom-wide.dts (renamed from board/avionic-design/dts/tegra20-medcom-wide.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra20-paz00.dts (renamed from board/compal/dts/tegra20-paz00.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra20-plutux.dts (renamed from board/avionic-design/dts/tegra20-plutux.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra20-seaboard.dts (renamed from board/nvidia/dts/tegra20-seaboard.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra20-tamonten.dtsi (renamed from board/avionic-design/dts/tegra20-tamonten.dtsi) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra20-tec.dts (renamed from board/avionic-design/dts/tegra20-tec.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra20-trimslice.dts (renamed from board/compulab/dts/tegra20-trimslice.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra20-ventana.dts (renamed from board/nvidia/dts/tegra20-ventana.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra20-whistler.dts (renamed from board/nvidia/dts/tegra20-whistler.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra30-beaver.dts (renamed from board/nvidia/dts/tegra30-beaver.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra30-cardhu.dts (renamed from board/nvidia/dts/tegra30-cardhu.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra30-tamonten.dtsi (renamed from board/avionic-design/dts/tegra30-tamonten.dtsi) | 0 | ||||
-rw-r--r-- | arch/arm/dts/tegra30-tec-ng.dts (renamed from board/avionic-design/dts/tegra30-tec-ng.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/zynq-microzed.dts (renamed from board/xilinx/dts/zynq-microzed.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/zynq-zc702.dts (renamed from board/xilinx/dts/zynq-zc702.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/zynq-zc706.dts (renamed from board/xilinx/dts/zynq-zc706.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/zynq-zc770-xm010.dts (renamed from board/xilinx/dts/zynq-zc770-xm010.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/zynq-zc770-xm012.dts (renamed from board/xilinx/dts/zynq-zc770-xm012.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/zynq-zc770-xm013.dts (renamed from board/xilinx/dts/zynq-zc770-xm013.dts) | 0 | ||||
-rw-r--r-- | arch/arm/dts/zynq-zed.dts (renamed from board/xilinx/dts/zynq-zed.dts) | 0 | ||||
-rw-r--r-- | arch/microblaze/dts/microblaze-generic.dts (renamed from board/xilinx/dts/microblaze-generic.dts) | 0 | ||||
-rw-r--r-- | arch/x86/dts/alex.dts (renamed from board/chromebook-x86/dts/alex.dts) | 0 | ||||
-rw-r--r-- | arch/x86/dts/link.dts (renamed from board/chromebook-x86/dts/link.dts) | 0 | ||||
-rw-r--r-- | dts/Makefile | 4 | ||||
-rw-r--r-- | scripts/Makefile.lib | 1 |
32 files changed, 2 insertions, 3 deletions
diff --git a/board/samsung/dts/exynos5250-arndale.dts b/arch/arm/dts/exynos5250-arndale.dts index 202f2ea6ed9..202f2ea6ed9 100644 --- a/board/samsung/dts/exynos5250-arndale.dts +++ b/arch/arm/dts/exynos5250-arndale.dts diff --git a/board/samsung/dts/exynos5250-smdk5250.dts b/arch/arm/dts/exynos5250-smdk5250.dts index 9020382d97c..9020382d97c 100644 --- a/board/samsung/dts/exynos5250-smdk5250.dts +++ b/arch/arm/dts/exynos5250-smdk5250.dts diff --git a/board/samsung/dts/exynos5250-snow.dts b/arch/arm/dts/exynos5250-snow.dts index 9b48a0ccd85..9b48a0ccd85 100644 --- a/board/samsung/dts/exynos5250-snow.dts +++ b/arch/arm/dts/exynos5250-snow.dts diff --git a/board/samsung/dts/exynos5420-smdk5420.dts b/arch/arm/dts/exynos5420-smdk5420.dts index d73976356d3..d73976356d3 100644 --- a/board/samsung/dts/exynos5420-smdk5420.dts +++ b/arch/arm/dts/exynos5420-smdk5420.dts diff --git a/board/nvidia/dts/tegra114-dalmore.dts b/arch/arm/dts/tegra114-dalmore.dts index 435c01e9f66..435c01e9f66 100644 --- a/board/nvidia/dts/tegra114-dalmore.dts +++ b/arch/arm/dts/tegra114-dalmore.dts diff --git a/board/toradex/dts/tegra20-colibri_t20_iris.dts b/arch/arm/dts/tegra20-colibri_t20_iris.dts index c0e54af8868..c0e54af8868 100644 --- a/board/toradex/dts/tegra20-colibri_t20_iris.dts +++ b/arch/arm/dts/tegra20-colibri_t20_iris.dts diff --git a/board/nvidia/dts/tegra20-harmony.dts b/arch/arm/dts/tegra20-harmony.dts index b115f87821d..b115f87821d 100644 --- a/board/nvidia/dts/tegra20-harmony.dts +++ b/arch/arm/dts/tegra20-harmony.dts diff --git a/board/avionic-design/dts/tegra20-medcom-wide.dts b/arch/arm/dts/tegra20-medcom-wide.dts index a9a07f9bcd7..a9a07f9bcd7 100644 --- a/board/avionic-design/dts/tegra20-medcom-wide.dts +++ b/arch/arm/dts/tegra20-medcom-wide.dts diff --git a/board/compal/dts/tegra20-paz00.dts b/arch/arm/dts/tegra20-paz00.dts index 780203cfb3a..780203cfb3a 100644 --- a/board/compal/dts/tegra20-paz00.dts +++ b/arch/arm/dts/tegra20-paz00.dts diff --git a/board/avionic-design/dts/tegra20-plutux.dts b/arch/arm/dts/tegra20-plutux.dts index 20016f29bb3..20016f29bb3 100644 --- a/board/avionic-design/dts/tegra20-plutux.dts +++ b/arch/arm/dts/tegra20-plutux.dts diff --git a/board/nvidia/dts/tegra20-seaboard.dts b/arch/arm/dts/tegra20-seaboard.dts index c0e2e1e5fdb..c0e2e1e5fdb 100644 --- a/board/nvidia/dts/tegra20-seaboard.dts +++ b/arch/arm/dts/tegra20-seaboard.dts diff --git a/board/avionic-design/dts/tegra20-tamonten.dtsi b/arch/arm/dts/tegra20-tamonten.dtsi index f379622c944..f379622c944 100644 --- a/board/avionic-design/dts/tegra20-tamonten.dtsi +++ b/arch/arm/dts/tegra20-tamonten.dtsi diff --git a/board/avionic-design/dts/tegra20-tec.dts b/arch/arm/dts/tegra20-tec.dts index 4c1b08d7684..4c1b08d7684 100644 --- a/board/avionic-design/dts/tegra20-tec.dts +++ b/arch/arm/dts/tegra20-tec.dts diff --git a/board/compulab/dts/tegra20-trimslice.dts b/arch/arm/dts/tegra20-trimslice.dts index ee31476c1eb..ee31476c1eb 100644 --- a/board/compulab/dts/tegra20-trimslice.dts +++ b/arch/arm/dts/tegra20-trimslice.dts diff --git a/board/nvidia/dts/tegra20-ventana.dts b/arch/arm/dts/tegra20-ventana.dts index 1a526bab641..1a526bab641 100644 --- a/board/nvidia/dts/tegra20-ventana.dts +++ b/arch/arm/dts/tegra20-ventana.dts diff --git a/board/nvidia/dts/tegra20-whistler.dts b/arch/arm/dts/tegra20-whistler.dts index eb92264f9d6..eb92264f9d6 100644 --- a/board/nvidia/dts/tegra20-whistler.dts +++ b/arch/arm/dts/tegra20-whistler.dts diff --git a/board/nvidia/dts/tegra30-beaver.dts b/arch/arm/dts/tegra30-beaver.dts index a7cc93e93fb..a7cc93e93fb 100644 --- a/board/nvidia/dts/tegra30-beaver.dts +++ b/arch/arm/dts/tegra30-beaver.dts diff --git a/board/nvidia/dts/tegra30-cardhu.dts b/arch/arm/dts/tegra30-cardhu.dts index ea2cf76ff3a..ea2cf76ff3a 100644 --- a/board/nvidia/dts/tegra30-cardhu.dts +++ b/arch/arm/dts/tegra30-cardhu.dts diff --git a/board/avionic-design/dts/tegra30-tamonten.dtsi b/arch/arm/dts/tegra30-tamonten.dtsi index 50d5762311e..50d5762311e 100644 --- a/board/avionic-design/dts/tegra30-tamonten.dtsi +++ b/arch/arm/dts/tegra30-tamonten.dtsi diff --git a/board/avionic-design/dts/tegra30-tec-ng.dts b/arch/arm/dts/tegra30-tec-ng.dts index 8a69e818ca3..8a69e818ca3 100644 --- a/board/avionic-design/dts/tegra30-tec-ng.dts +++ b/arch/arm/dts/tegra30-tec-ng.dts diff --git a/board/xilinx/dts/zynq-microzed.dts b/arch/arm/dts/zynq-microzed.dts index 6da71c116d0..6da71c116d0 100644 --- a/board/xilinx/dts/zynq-microzed.dts +++ b/arch/arm/dts/zynq-microzed.dts diff --git a/board/xilinx/dts/zynq-zc702.dts b/arch/arm/dts/zynq-zc702.dts index 667dc282563..667dc282563 100644 --- a/board/xilinx/dts/zynq-zc702.dts +++ b/arch/arm/dts/zynq-zc702.dts diff --git a/board/xilinx/dts/zynq-zc706.dts b/arch/arm/dts/zynq-zc706.dts index 526fc8888ba..526fc8888ba 100644 --- a/board/xilinx/dts/zynq-zc706.dts +++ b/arch/arm/dts/zynq-zc706.dts diff --git a/board/xilinx/dts/zynq-zc770-xm010.dts b/arch/arm/dts/zynq-zc770-xm010.dts index 8b542a109be..8b542a109be 100644 --- a/board/xilinx/dts/zynq-zc770-xm010.dts +++ b/arch/arm/dts/zynq-zc770-xm010.dts diff --git a/board/xilinx/dts/zynq-zc770-xm012.dts b/arch/arm/dts/zynq-zc770-xm012.dts index 0379a070681..0379a070681 100644 --- a/board/xilinx/dts/zynq-zc770-xm012.dts +++ b/arch/arm/dts/zynq-zc770-xm012.dts diff --git a/board/xilinx/dts/zynq-zc770-xm013.dts b/arch/arm/dts/zynq-zc770-xm013.dts index a4f9e05fc0e..a4f9e05fc0e 100644 --- a/board/xilinx/dts/zynq-zc770-xm013.dts +++ b/arch/arm/dts/zynq-zc770-xm013.dts diff --git a/board/xilinx/dts/zynq-zed.dts b/arch/arm/dts/zynq-zed.dts index 91a5deba4a9..91a5deba4a9 100644 --- a/board/xilinx/dts/zynq-zed.dts +++ b/arch/arm/dts/zynq-zed.dts diff --git a/board/xilinx/dts/microblaze-generic.dts b/arch/microblaze/dts/microblaze-generic.dts index 203330987bd..203330987bd 100644 --- a/board/xilinx/dts/microblaze-generic.dts +++ b/arch/microblaze/dts/microblaze-generic.dts diff --git a/board/chromebook-x86/dts/alex.dts b/arch/x86/dts/alex.dts index 2f13544612f..2f13544612f 100644 --- a/board/chromebook-x86/dts/alex.dts +++ b/arch/x86/dts/alex.dts diff --git a/board/chromebook-x86/dts/link.dts b/arch/x86/dts/link.dts index 4a37dac4ea9..4a37dac4ea9 100644 --- a/board/chromebook-x86/dts/link.dts +++ b/arch/x86/dts/link.dts diff --git a/dts/Makefile b/dts/Makefile index c47fba787cc..5d2abd9f5c3 100644 --- a/dts/Makefile +++ b/dts/Makefile @@ -12,9 +12,9 @@ ifeq ($(DEVICE_TREE),) DEVICE_TREE := notfound endif -DTS := $(srctree)/board/$(VENDOR)/dts/$(DEVICE_TREE).dts +DTS := $(srctree)/arch/$(ARCH)/dts/$(DEVICE_TREE).dts -DTC_FLAGS += -i $(srctree)/arch/$(ARCH)/dts -R 4 -p 0x1000 +DTC_FLAGS += -R 4 -p 0x1000 $(obj)/dt.dtb: $(DTS) FORCE $(call if_changed_dep,dtc) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index ee3ceac7d13..02b17b10579 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -153,7 +153,6 @@ ld_flags = $(LDFLAGS) $(ldflags-y) # Modified for U-Boot dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ - -I$(srctree)/board/$(VENDOR)/dts/ \ -I$(srctree)/arch/$(ARCH)/dts \ -undef -D__DTS__ |