瀏覽代碼

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>
Masahiro Yamada 11 年之前
父節點
當前提交
5ab502cb89

+ 0 - 0
board/samsung/dts/exynos5250-arndale.dts → arch/arm/dts/exynos5250-arndale.dts


+ 0 - 0
board/samsung/dts/exynos5250-smdk5250.dts → arch/arm/dts/exynos5250-smdk5250.dts


+ 0 - 0
board/samsung/dts/exynos5250-snow.dts → arch/arm/dts/exynos5250-snow.dts


+ 0 - 0
board/samsung/dts/exynos5420-smdk5420.dts → arch/arm/dts/exynos5420-smdk5420.dts


+ 0 - 0
board/nvidia/dts/tegra114-dalmore.dts → arch/arm/dts/tegra114-dalmore.dts


+ 0 - 0
board/toradex/dts/tegra20-colibri_t20_iris.dts → arch/arm/dts/tegra20-colibri_t20_iris.dts


+ 0 - 0
board/nvidia/dts/tegra20-harmony.dts → arch/arm/dts/tegra20-harmony.dts


+ 0 - 0
board/avionic-design/dts/tegra20-medcom-wide.dts → arch/arm/dts/tegra20-medcom-wide.dts


+ 0 - 0
board/compal/dts/tegra20-paz00.dts → arch/arm/dts/tegra20-paz00.dts


+ 0 - 0
board/avionic-design/dts/tegra20-plutux.dts → arch/arm/dts/tegra20-plutux.dts


+ 0 - 0
board/nvidia/dts/tegra20-seaboard.dts → arch/arm/dts/tegra20-seaboard.dts


+ 0 - 0
board/avionic-design/dts/tegra20-tamonten.dtsi → arch/arm/dts/tegra20-tamonten.dtsi


+ 0 - 0
board/avionic-design/dts/tegra20-tec.dts → arch/arm/dts/tegra20-tec.dts


+ 0 - 0
board/compulab/dts/tegra20-trimslice.dts → arch/arm/dts/tegra20-trimslice.dts


+ 0 - 0
board/nvidia/dts/tegra20-ventana.dts → arch/arm/dts/tegra20-ventana.dts


+ 0 - 0
board/nvidia/dts/tegra20-whistler.dts → arch/arm/dts/tegra20-whistler.dts


+ 0 - 0
board/nvidia/dts/tegra30-beaver.dts → arch/arm/dts/tegra30-beaver.dts


+ 0 - 0
board/nvidia/dts/tegra30-cardhu.dts → arch/arm/dts/tegra30-cardhu.dts


+ 0 - 0
board/avionic-design/dts/tegra30-tamonten.dtsi → arch/arm/dts/tegra30-tamonten.dtsi


+ 0 - 0
board/avionic-design/dts/tegra30-tec-ng.dts → arch/arm/dts/tegra30-tec-ng.dts


+ 0 - 0
board/xilinx/dts/zynq-microzed.dts → arch/arm/dts/zynq-microzed.dts


+ 0 - 0
board/xilinx/dts/zynq-zc702.dts → arch/arm/dts/zynq-zc702.dts


+ 0 - 0
board/xilinx/dts/zynq-zc706.dts → arch/arm/dts/zynq-zc706.dts


+ 0 - 0
board/xilinx/dts/zynq-zc770-xm010.dts → arch/arm/dts/zynq-zc770-xm010.dts


+ 0 - 0
board/xilinx/dts/zynq-zc770-xm012.dts → arch/arm/dts/zynq-zc770-xm012.dts


+ 0 - 0
board/xilinx/dts/zynq-zc770-xm013.dts → arch/arm/dts/zynq-zc770-xm013.dts


+ 0 - 0
board/xilinx/dts/zynq-zed.dts → arch/arm/dts/zynq-zed.dts


+ 0 - 0
board/xilinx/dts/microblaze-generic.dts → arch/microblaze/dts/microblaze-generic.dts


+ 0 - 0
board/chromebook-x86/dts/alex.dts → arch/x86/dts/alex.dts


+ 0 - 0
board/chromebook-x86/dts/link.dts → arch/x86/dts/link.dts


+ 2 - 2
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)

+ 0 - 1
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__