Simplify dts/Makefile and support multiple DTBs generation
Subsystems (7)
v2 cover Simplify dts/Makefile and support multiple DTBs generation
1/3 re-writes dts/Makefile more simply.
It does not change the behavior except removal of ./u-boot.dts
2/3 moves *.dts from board/$(VENDOR)/dts to arch/$(ARCH)/dts
3/3 adds multipe DTBs generation
This patch uses my Kbuild series as a prerequisite. "Switch over to real Kbuild" series version 9 must be applied beforehand.
Changes in v2:
- Rebase on Kbuild series v9
- Add ';' which was missing in arch/arm/lib/board.c
- Add 2/3 and 3/3
Masahiro Yamada (3):
dts: re-write dts/Makefile more simply with Kbuild
dts: move device tree sources to arch/$(ARCH)/dts/
dts: generate multiple device tree blobs
.gitignore | 1 -
Makefile | 16 ++---
arch/arm/dts/.gitignore | 1 +
arch/arm/dts/Makefile | 37 ++++++++++
.../arm}/dts/exynos5250-arndale.dts | 0
.../arm}/dts/exynos5250-smdk5250.dts | 0
.../samsung => arch/arm}/dts/exynos5250-snow.dts | 0
.../arm}/dts/exynos5420-smdk5420.dts | 0
.../nvidia => arch/arm}/dts/tegra114-dalmore.dts | 0
.../arm}/dts/tegra20-colibri_t20_iris.dts | 0
{board/nvidia => arch/arm}/dts/tegra20-harmony.dts | 0
.../arm}/dts/tegra20-medcom-wide.dts | 0
{board/compal => arch/arm}/dts/tegra20-paz00.dts | 0
.../arm}/dts/tegra20-plutux.dts | 0
.../nvidia => arch/arm}/dts/tegra20-seaboard.dts | 0
.../arm}/dts/tegra20-tamonten.dtsi | 0
.../arm}/dts/tegra20-tec.dts | 0
.../arm}/dts/tegra20-trimslice.dts | 0
{board/nvidia => arch/arm}/dts/tegra20-ventana.dts | 0
.../nvidia => arch/arm}/dts/tegra20-whistler.dts | 0
{board/nvidia => arch/arm}/dts/tegra30-beaver.dts | 0
{board/nvidia => arch/arm}/dts/tegra30-cardhu.dts | 0
.../arm}/dts/tegra30-tamonten.dtsi | 0
.../arm}/dts/tegra30-tec-ng.dts | 0
{board/xilinx => arch/arm}/dts/zynq-microzed.dts | 0
{board/xilinx => arch/arm}/dts/zynq-zc702.dts | 0
{board/xilinx => arch/arm}/dts/zynq-zc706.dts | 0
.../xilinx => arch/arm}/dts/zynq-zc770-xm010.dts | 0
.../xilinx => arch/arm}/dts/zynq-zc770-xm012.dts | 0
.../xilinx => arch/arm}/dts/zynq-zc770-xm013.dts | 0
{board/xilinx => arch/arm}/dts/zynq-zed.dts | 0
arch/arm/lib/board.c | 2 +-
arch/microblaze/dts/.gitignore | 1 +
arch/microblaze/dts/Makefile | 11 +++
.../microblaze}/dts/microblaze-generic.dts | 0
arch/microblaze/lib/board.c | 2 +-
arch/x86/dts/.gitignore | 1 +
arch/x86/dts/Makefile | 12 ++++
{board/chromebook-x86 => arch/x86}/dts/alex.dts | 0
{board/chromebook-x86 => arch/x86}/dts/link.dts | 0
arch/x86/lib/init_helpers.c | 2 +-
common/board_f.c | 2 +-
dts/.gitignore | 2 +
dts/Makefile | 81 ++++++++--------------
include/common.h | 2 +-
scripts/Makefile.lib | 11 ++-
46 files changed, 112 insertions(+), 72 deletions(-)
create mode 100644 arch/arm/dts/.gitignore
create mode 100644 arch/arm/dts/Makefile
rename {board/samsung => arch/arm}/dts/exynos5250-arndale.dts (100%)
rename {board/samsung => arch/arm}/dts/exynos5250-smdk5250.dts (100%)
rename {board/samsung => arch/arm}/dts/exynos5250-snow.dts (100%)
rename {board/samsung => arch/arm}/dts/exynos5420-smdk5420.dts (100%)
rename {board/nvidia => arch/arm}/dts/tegra114-dalmore.dts (100%)
rename {board/toradex => arch/arm}/dts/tegra20-colibri_t20_iris.dts (100%)
rename {board/nvidia => arch/arm}/dts/tegra20-harmony.dts (100%)
rename {board/avionic-design => arch/arm}/dts/tegra20-medcom-wide.dts (100%)
rename {board/compal => arch/arm}/dts/tegra20-paz00.dts (100%)
rename {board/avionic-design => arch/arm}/dts/tegra20-plutux.dts (100%)
rename {board/nvidia => arch/arm}/dts/tegra20-seaboard.dts (100%)
rename {board/avionic-design => arch/arm}/dts/tegra20-tamonten.dtsi (100%)
rename {board/avionic-design => arch/arm}/dts/tegra20-tec.dts (100%)
rename {board/compulab => arch/arm}/dts/tegra20-trimslice.dts (100%)
rename {board/nvidia => arch/arm}/dts/tegra20-ventana.dts (100%)
rename {board/nvidia => arch/arm}/dts/tegra20-whistler.dts (100%)
rename {board/nvidia => arch/arm}/dts/tegra30-beaver.dts (100%)
rename {board/nvidia => arch/arm}/dts/tegra30-cardhu.dts (100%)
rename {board/avionic-design => arch/arm}/dts/tegra30-tamonten.dtsi (100%)
rename {board/avionic-design => arch/arm}/dts/tegra30-tec-ng.dts (100%)
rename {board/xilinx => arch/arm}/dts/zynq-microzed.dts (100%)
rename {board/xilinx => arch/arm}/dts/zynq-zc702.dts (100%)
rename {board/xilinx => arch/arm}/dts/zynq-zc706.dts (100%)
rename {board/xilinx => arch/arm}/dts/zynq-zc770-xm010.dts (100%)
rename {board/xilinx => arch/arm}/dts/zynq-zc770-xm012.dts (100%)
rename {board/xilinx => arch/arm}/dts/zynq-zc770-xm013.dts (100%)
rename {board/xilinx => arch/arm}/dts/zynq-zed.dts (100%)
create mode 100644 arch/microblaze/dts/.gitignore
create mode 100644 arch/microblaze/dts/Makefile
rename {board/xilinx => arch/microblaze}/dts/microblaze-generic.dts (100%)
create mode 100644 arch/x86/dts/.gitignore
create mode 100644 arch/x86/dts/Makefile
rename {board/chromebook-x86 => arch/x86}/dts/alex.dts (100%)
rename {board/chromebook-x86 => arch/x86}/dts/link.dts (100%)
create mode 100644 dts/.gitignoreSignature · 1 line
1.8.3.2
PATCH v2 1/3 dts: re-write dts/Makefile more simply with Kbuild
Useful rules in scripts/Makefile.lib allows us to easily generate a device tree blob and wrap it in assembly code.
We do not need to parse a linker script to get output format and arch.
This commit deletes ./u-boot.dtb since it is a copy of dts/dt.dtb
---
Changes in v2:
- Rebase on Kbuild series v9
- Add ';' which was missing in arch/arm/lib/board.c
.gitignore | 1 - Makefile | 16 +++++----- arch/arm/lib/board.c | 2 +- arch/microblaze/lib/board.c | 2 +- arch/x86/lib/init_helpers.c | 2 +- common/board_f.c | 2 +- dts/.gitignore | 2 ++ dts/Makefile | 72 +++++++++++++-------------------------------- include/common.h | 2 +- scripts/Makefile.lib | 12 ++++---- 10 files changed, 41 insertions(+), 72 deletions(-) create mode 100644 dts/.gitignore
.gitignore +0 -1
@@ -48,7 +48,6 @@ /u-boot.lds /u-boot.ubl /u-boot.ais -/u-boot.dtb /u-boot.sb #
Makefile +8 -8
@@ -722,7 +722,7 @@ ALL-$(CONFIG_RAMBOOT_PBL) += u-boot.pbl ALL-$(CONFIG_SPL) += spl/u-boot-spl.bin ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.img ALL-$(CONFIG_TPL) += tpl/u-boot-tpl.bin -ALL-$(CONFIG_OF_SEPARATE) += u-boot.dtb u-boot-dtb.bin +ALL-$(CONFIG_OF_SEPARATE) += u-boot-dtb.bin ifneq ($(CONFIG_SPL_TARGET),) ALL-$(CONFIG_SPL) += $(CONFIG_SPL_TARGET:"%"=%) endif
@@ -746,11 +746,11 @@ endif all: $(ALL-y) -u-boot.dtb: checkdtc u-boot - $(MAKE) $(build)=dts binary - mv dts/dt.dtb $@ +PHONY += dtbs +dtbs dts/dt.dtb: checkdtc u-boot + $(Q)$(MAKE) $(build)=dts dtbs -u-boot-dtb.bin: u-boot.bin u-boot.dtb +u-boot-dtb.bin: u-boot.bin dts/dt.dtb cat $^ >$@ u-boot.hex: u-boot
@@ -877,8 +877,8 @@ u-boot-nodtb-tegra.bin: spl/u-boot-spl.bin u-boot.bin rm spl/u-boot-spl-pad.bin ifeq ($(CONFIG_OF_SEPARATE),y) -u-boot-dtb-tegra.bin: u-boot-nodtb-tegra.bin u-boot.dtb - cat u-boot-nodtb-tegra.bin u-boot.dtb > $@ +u-boot-dtb-tegra.bin: u-boot-nodtb-tegra.bin dts/dt.dtb + cat $^ > $@ endif endif
@@ -1173,7 +1173,7 @@ include/license.h: tools/bin2header COPYING # Directories & files removed with 'make clean' CLEAN_DIRS += $(MODVERDIR) CLEAN_FILES += u-boot.lds include/bmp_logo.h include/bmp_logo_data.h \ - board/*/config.tmp board/*/*/config.tmp dts/*.tmp \ + board/*/config.tmp board/*/*/config.tmp \ include/autoconf.mk* include/spl-autoconf.mk \ include/tpl-autoconf.mk
arch/arm/lib/board.c +1 -1
@@ -280,7 +280,7 @@ void board_init_f(ulong bootflag) gd->mon_len = _bss_end_ofs;#ifdef CONFIG_OF_EMBED /* Get a pointer to the FDT */ - gd->fdt_blob = _binary_dt_dtb_start; + gd->fdt_blob = __dtb_db_begin;#elif definedCONFIG_OF_SEPARATE /* FDT is at end of image */ gd->fdt_blob = (void *)(_end_ofs + _TEXT_BASE);
arch/microblaze/lib/board.c +1 -1
@@ -76,7 +76,7 @@ void board_init_f(ulong not_used)#ifdef CONFIG_OF_EMBED /* Get a pointer to the FDT */ - gd->fdt_blob = _binary_dt_dtb_start; + gd->fdt_blob = __dtb_dt_begin;#elif definedCONFIG_OF_SEPARATE /* FDT is at end of image */ gd->fdt_blob = (void *)__end;
arch/x86/lib/init_helpers.c +1 -1
@@ -92,7 +92,7 @@ int find_fdt(void) {#ifdef CONFIG_OF_EMBED /* Get a pointer to the FDT */ - gd->fdt_blob = _binary_dt_dtb_start; + gd->fdt_blob = __dtb_dt_begin;#elif definedCONFIG_OF_SEPARATE /* FDT is at end of image */ gd->fdt_blob = (ulong *)&_end;
common/board_f.c +1 -1
@@ -360,7 +360,7 @@ static int setup_fdt(void) {#ifdef CONFIG_OF_EMBED /* Get a pointer to the FDT */ - gd->fdt_blob = _binary_dt_dtb_start; + gd->fdt_blob = __dtb_dt_begin;#elif definedCONFIG_OF_SEPARATE /* FDT is at end of image */ # ifdef CONFIG_SYS_SYM_OFFSETS
dts/.gitignore new file +2 -0
@@ -0,0 +1,2 @@ +*.dtb +*.dtb.S
dts/Makefile +20 -52
84 lines not on this page · raw message
include/common.h +1 -1
@@ -302,7 +302,7 @@ int checkdram (void);int last_stage_init (void );extern ulong monitor_flash_len;int mac_read_from_eeprom (void ); -extern u8 _binary_dt_dtb_start[];/* embedded device tree blob */ +extern u8 __dtb_dt_begin[];/* embedded device tree blob */ int set_cpu_clk_info (void );int print_cpuinfo (void );int update_flash_size (int flash_size);
scripts/Makefile.lib +6 -6
@@ -151,9 +151,10 @@ cpp_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(UBOOTINCLUDE) \ ld_flags = $(LDFLAGS) $(ldflags-y) +# Modified for U-Boot dtc_cpp_flags = -Wp,-MD,$(depfile).pre.tmp -nostdinc \ - -I$(srctree)/arch/$(SRCARCH)/boot/dts \ - -I$(srctree)/arch/$(SRCARCH)/boot/dts/include \ + -I$(srctree)/board/$(VENDOR)/dts/ \ + -I$(srctree)/arch/$(ARCH)/dts \ -undef -D__DTS__ # Finds the multi-part object the current object will be linked into
@@ -247,25 +248,24 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -n -f -9 > $@) || \ # Generate an assembly file to wrap the output of the device tree compiler quiet_cmd_dt_S_dtb= DTB $@ +# Modified for U-Boot cmd_dt_S_dtb= \ ( \ - echo '\#include <asm-generic/vmlinux.lds.h>'; \ echo '.section .dtb.init.rodata,"a"'; \ - echo '.balign STRUCT_ALIGNMENT'; \ echo '.global __dtb_$(*F)_begin'; \ echo '__dtb_$(*F)_begin:'; \ echo '.incbin "$<" '; \ echo '__dtb_$(*F)_end:'; \ echo '.global __dtb_$(*F)_end'; \ - echo '.balign STRUCT_ALIGNMENT'; \ ) > $@ $(obj)/%.dtb.S: $(obj)/%.dtb $(call cmd,dt_S_dtb) quiet_cmd_dtc = DTC $@ +# Modified for U-Boot cmd_dtc = $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) $< ; \ - $(objtree)/scripts/dtc/dtc -O dtb -o $@ -b 0 \ + dtc -O dtb -o $@ -b 0 \ -i $(dir $<) $(DTC_FLAGS) \ -d $(depfile).dtc.tmp $(dtc-tmp) ; \ cat $(depfile).pre.tmp $(depfile).dtc.tmp > $(depfile)
Signature · 1 line
1.8.3.2
PATCH v2 1/3 dts: re-write dts/Makefile more simply with Kbuild
Hi Masahiro,
Quoted 6 lines · Masahiro Yamada
Useful rules in
scripts/Makefile.liballows us to easily generate a device tree blob and wrap it in assembly code.We do not need to parse a linker script to get output format and arch.
This commit deletes ./u-boot.dtb since it is a copy of dts/dt.dtb
I'd rather have the former and delete the latter temporary file as part of the build. u-boot.dtb is currently a build output.
Regards,
Simon
PATCH v2 1/3 dts: re-write dts/Makefile more simply with Kbuild
Hello Simon,
Quoted 9 lines
Quoted 6 lines
Useful rules in
scripts/Makefile.liballows us to easily generate a device tree blob and wrap it in assembly code.We do not need to parse a linker script to get output format and arch.
This commit deletes ./u-boot.dtb since it is a copy of dts/dt.dtb
I'd rather have the former and delete the latter temporary file as part of the build. u-boot.dtb is currently a build output.
This is what I have said in the thread
Re: [PATCH] dts: re-write dts/Makefile more simply with Kbuild
We must keep dts/dt.dtb to suppress the re-generation of dts/dt.dtb.
Besides, dts/dt.dtb is a prerequisite of dts/dt.dtb.S when CONFIG_OF_EMBED is enabled.
I believe keeping dts/dt.dtb is reasonable enough.
Better to keep both?
Best Regards
Masahiro Yamada
PATCH v2 1/3 dts: re-write dts/Makefile more simply with Kbuild
Hi Masahiro,
Quoted 11 lines · Masahiro Yamada
Hello Simon,
Quoted 7 lines
Quoted 6 lines
Useful rules in
scripts/Makefile.liballows us to easily generate a device tree blob and wrap it in assembly code.We do not need to parse a linker script to get output format and arch.
This commit deletes ./u-boot.dtb since it is a copy of dts/dt.dtb
Quoted 8 lines
Quoted 2 lines
I'd rather have the former and delete the latter temporary file as part of the build. u-boot.dtb is currently a build output.
This is what I have said in the thread
Re: [PATCH] dts: re-write dts/Makefile more simply withKbuildWe must keep dts/dt.dtb to suppress the re-generation of dts/dt.dtb.
OK. From memory when I did this, it was just a temporary file which was used to create dts/dt.o. Make deleted it at the end of the build, I think. But I may remember wrong, and it doesn't matter anyway.
Quoted 7 lines
Besides, dts/dt.dtb is a prerequisite of
dts/dt.dtb.SwhenCONFIG_OF_EMBEDis enabled.I believe keeping dts/dt.dtb is reasonable enough.
Better to keep both?
Yes I think so.
Regards,
Simon
PATCH v2 1/3 dts: re-write dts/Makefile more simply with Kbuild
Hello Simon,
Quoted 18 lines · On Tue, 18 Feb 2014 21:45:12 -0800 Simon Glass <[email protected]> wrote:
Hi Masahiro,
Quoted 15 lines · Masahiro Yamada
Hello Simon,
Quoted 9 lines
Quoted 6 lines
Useful rules in
scripts/Makefile.liballows us to easily generate a device tree blob and wrap it in assembly code.We do not need to parse a linker script to get output format and arch.
This commit deletes ./u-boot.dtb since it is a copy of dts/dt.dtb
I'd rather have the former and delete the latter temporary file as part of the build. u-boot.dtb is currently a build output.
Quoted 8 lines
Quoted 4 lines
This is what I have said in the thread
Re: [PATCH] dts: re-write dts/Makefile more simply withKbuildWe must keep dts/dt.dtb to suppress the re-generation of dts/dt.dtb.
OK. From memory when I did this, it was just a temporary file which was used to create
dts/dt.o. Make deleted it at the end of the build, I think. But I may remember wrong, and it doesn't matter anyway.
I think dts/dt.o was deleted at the end
only when CONFIG_OF_SEPARATE=y
by the following rule.
$(obj)u-boot.dtb: checkdtc $(obj)u-boot
$(MAKE) $(build) dts binary
mv $(obj)dts/dt.dtb $@It moves, not copies dts/dt.dtb.
Quoted 9 lines
Quoted 7 lines
Besides, dts/dt.dtb is a prerequisite of
dts/dt.dtb.SwhenCONFIG_OF_EMBEDis enabled.I believe keeping dts/dt.dtb is reasonable enough.
Better to keep both?
Yes I think so.
OK.
I will revive ./u-boot.dtb and post a new version.
And I will send it as a single patch
dropping 2/3 and 3/3.
Do you think it's better?
Many kbuild-related patches are being stuck on patchwork and my local branch is getting messed up.
I don't want to delay this patch any more.
Best Regards
Masahiro Yamada
PATCH v2 1/3 dts: re-write dts/Makefile more simply with Kbuild
Hi Masahiro,
Quoted 58 lines · Masahiro Yamada
Hello Simon,
Quoted 18 lines · On Tue, 18 Feb 2014 21:45:12 -0800 Simon Glass <[email protected]> wrote:
Hi Masahiro,
Quoted 15 lines · Masahiro Yamada
Hello Simon,
Quoted 9 lines
Quoted 6 lines
Useful rules in
scripts/Makefile.liballows us to easily generate a device tree blob and wrap it in assembly code.We do not need to parse a linker script to get output format and arch.
This commit deletes ./u-boot.dtb since it is a copy of dts/dt.dtb
I'd rather have the former and delete the latter temporary file as part of the build. u-boot.dtb is currently a build output.
Quoted 8 lines
Quoted 4 lines
This is what I have said in the thread
Re: [PATCH] dts: re-write dts/Makefile more simply withKbuildWe must keep dts/dt.dtb to suppress the re-generation of dts/dt.dtb.
OK. From memory when I did this, it was just a temporary file which was used to create
dts/dt.o. Make deleted it at the end of the build, I think. But I may remember wrong, and it doesn't matter anyway.I think
dts/dt.owas deleted at the end
only whenCONFIG_OF_SEPARATE=y
by the following rule.$(obj)u-boot.dtb: checkdtc $(obj)u-boot $(MAKE) $(build) dts binary mv $(obj)dts/dt.dtb $@It moves, not copies dts/dt.dtb.
Quoted 9 lines
Quoted 7 lines
Besides, dts/dt.dtb is a prerequisite of
dts/dt.dtb.SwhenCONFIG_OF_EMBEDis enabled.I believe keeping dts/dt.dtb is reasonable enough.
Better to keep both?
Yes I think so.
OK.
I will revive ./u-boot.dtb and post a new version.
Quoted 7 lines
And I will send it as a single patch
dropping 2/3 and 3/3.
Do you think it's better?Many kbuild-related patches are being stuck on patchwork and my local branch is getting messed up.
I don't want to delay this patch any more.
Agreed, I look forward to all your series being merged, a bit step forward for U-Boot.
Regards,
Simon
PATCH v2 2/3 dts: move device tree sources to arch/$(ARCH)/dts/
In reply to Masahiro YamadaUnlike 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.
---
Changes in v2:
- Newly added
{board/samsung => arch/arm}/dts/exynos5250-arndale.dts | 0
{board/samsung => arch/arm}/dts/exynos5250-smdk5250.dts | 0
{board/samsung => arch/arm}/dts/exynos5250-snow.dts | 0
{board/samsung => arch/arm}/dts/exynos5420-smdk5420.dts | 0
{board/nvidia => arch/arm}/dts/tegra114-dalmore.dts | 0
{board/toradex => arch/arm}/dts/tegra20-colibri_t20_iris.dts | 0
{board/nvidia => arch/arm}/dts/tegra20-harmony.dts | 0
{board/avionic-design => arch/arm}/dts/tegra20-medcom-wide.dts | 0
{board/compal => arch/arm}/dts/tegra20-paz00.dts | 0
{board/avionic-design => arch/arm}/dts/tegra20-plutux.dts | 0
{board/nvidia => arch/arm}/dts/tegra20-seaboard.dts | 0
{board/avionic-design => arch/arm}/dts/tegra20-tamonten.dtsi | 0
{board/avionic-design => arch/arm}/dts/tegra20-tec.dts | 0
{board/compulab => arch/arm}/dts/tegra20-trimslice.dts | 0
{board/nvidia => arch/arm}/dts/tegra20-ventana.dts | 0
{board/nvidia => arch/arm}/dts/tegra20-whistler.dts | 0
{board/nvidia => arch/arm}/dts/tegra30-beaver.dts | 0
{board/nvidia => arch/arm}/dts/tegra30-cardhu.dts | 0
{board/avionic-design => arch/arm}/dts/tegra30-tamonten.dtsi | 0
{board/avionic-design => arch/arm}/dts/tegra30-tec-ng.dts | 0
{board/xilinx => arch/arm}/dts/zynq-microzed.dts | 0
{board/xilinx => arch/arm}/dts/zynq-zc702.dts | 0
{board/xilinx => arch/arm}/dts/zynq-zc706.dts | 0
{board/xilinx => arch/arm}/dts/zynq-zc770-xm010.dts | 0
{board/xilinx => arch/arm}/dts/zynq-zc770-xm012.dts | 0
{board/xilinx => arch/arm}/dts/zynq-zc770-xm013.dts | 0
{board/xilinx => arch/arm}/dts/zynq-zed.dts | 0
{board/xilinx => arch/microblaze}/dts/microblaze-generic.dts | 0
{board/chromebook-x86 => arch/x86}/dts/alex.dts | 0
{board/chromebook-x86 => arch/x86}/dts/link.dts | 0
dts/Makefile | 4 ++--
scripts/Makefile.lib | 1 -
32 files changed, 2 insertions(+), 3 deletions(-)
rename {board/samsung => arch/arm}/dts/exynos5250-arndale.dts (100%)
rename {board/samsung => arch/arm}/dts/exynos5250-smdk5250.dts (100%)
rename {board/samsung => arch/arm}/dts/exynos5250-snow.dts (100%)
rename {board/samsung => arch/arm}/dts/exynos5420-smdk5420.dts (100%)
rename {board/nvidia => arch/arm}/dts/tegra114-dalmore.dts (100%)
rename {board/toradex => arch/arm}/dts/tegra20-colibri_t20_iris.dts (100%)
rename {board/nvidia => arch/arm}/dts/tegra20-harmony.dts (100%)
rename {board/avionic-design => arch/arm}/dts/tegra20-medcom-wide.dts (100%)
rename {board/compal => arch/arm}/dts/tegra20-paz00.dts (100%)
rename {board/avionic-design => arch/arm}/dts/tegra20-plutux.dts (100%)
rename {board/nvidia => arch/arm}/dts/tegra20-seaboard.dts (100%)
rename {board/avionic-design => arch/arm}/dts/tegra20-tamonten.dtsi (100%)
rename {board/avionic-design => arch/arm}/dts/tegra20-tec.dts (100%)
rename {board/compulab => arch/arm}/dts/tegra20-trimslice.dts (100%)
rename {board/nvidia => arch/arm}/dts/tegra20-ventana.dts (100%)
rename {board/nvidia => arch/arm}/dts/tegra20-whistler.dts (100%)
rename {board/nvidia => arch/arm}/dts/tegra30-beaver.dts (100%)
rename {board/nvidia => arch/arm}/dts/tegra30-cardhu.dts (100%)
rename {board/avionic-design => arch/arm}/dts/tegra30-tamonten.dtsi (100%)
rename {board/avionic-design => arch/arm}/dts/tegra30-tec-ng.dts (100%)
rename {board/xilinx => arch/arm}/dts/zynq-microzed.dts (100%)
rename {board/xilinx => arch/arm}/dts/zynq-zc702.dts (100%)
rename {board/xilinx => arch/arm}/dts/zynq-zc706.dts (100%)
rename {board/xilinx => arch/arm}/dts/zynq-zc770-xm010.dts (100%)
rename {board/xilinx => arch/arm}/dts/zynq-zc770-xm012.dts (100%)
rename {board/xilinx => arch/arm}/dts/zynq-zc770-xm013.dts (100%)
rename {board/xilinx => arch/arm}/dts/zynq-zed.dts (100%)
rename {board/xilinx => arch/microblaze}/dts/microblaze-generic.dts (100%)
rename {board/chromebook-x86 => arch/x86}/dts/alex.dts (100%)
rename {board/chromebook-x86 => arch/x86}/dts/link.dts (100%)arch/arm/dts/exynos5250-arndale.dts renamed from board/samsung/dts/exynos5250-arndale.dts +0 -0
arch/arm/dts/exynos5250-smdk5250.dts renamed from board/samsung/dts/exynos5250-smdk5250.dts +0 -0
arch/arm/dts/exynos5250-snow.dts renamed from board/samsung/dts/exynos5250-snow.dts +0 -0
arch/arm/dts/exynos5420-smdk5420.dts renamed from board/samsung/dts/exynos5420-smdk5420.dts +0 -0
arch/arm/dts/tegra114-dalmore.dts renamed from board/nvidia/dts/tegra114-dalmore.dts +0 -0
arch/arm/dts/tegra20-colibri_t20_iris.dts renamed from board/toradex/dts/tegra20-colibri_t20_iris.dts +0 -0
arch/arm/dts/tegra20-harmony.dts renamed from board/nvidia/dts/tegra20-harmony.dts +0 -0
arch/arm/dts/tegra20-medcom-wide.dts renamed from board/avionic-design/dts/tegra20-medcom-wide.dts +0 -0
arch/arm/dts/tegra20-paz00.dts renamed from board/compal/dts/tegra20-paz00.dts +0 -0
arch/arm/dts/tegra20-plutux.dts renamed from board/avionic-design/dts/tegra20-plutux.dts +0 -0
arch/arm/dts/tegra20-seaboard.dts renamed from board/nvidia/dts/tegra20-seaboard.dts +0 -0
arch/arm/dts/tegra20-tamonten.dtsi renamed from board/avionic-design/dts/tegra20-tamonten.dtsi +0 -0
arch/arm/dts/tegra20-tec.dts renamed from board/avionic-design/dts/tegra20-tec.dts +0 -0
arch/arm/dts/tegra20-trimslice.dts renamed from board/compulab/dts/tegra20-trimslice.dts +0 -0
arch/arm/dts/tegra20-ventana.dts renamed from board/nvidia/dts/tegra20-ventana.dts +0 -0
arch/arm/dts/tegra20-whistler.dts renamed from board/nvidia/dts/tegra20-whistler.dts +0 -0
arch/arm/dts/tegra30-beaver.dts renamed from board/nvidia/dts/tegra30-beaver.dts +0 -0
arch/arm/dts/tegra30-cardhu.dts renamed from board/nvidia/dts/tegra30-cardhu.dts +0 -0
arch/arm/dts/tegra30-tamonten.dtsi renamed from board/avionic-design/dts/tegra30-tamonten.dtsi +0 -0
arch/arm/dts/tegra30-tec-ng.dts renamed from board/avionic-design/dts/tegra30-tec-ng.dts +0 -0
arch/arm/dts/zynq-microzed.dts renamed from board/xilinx/dts/zynq-microzed.dts +0 -0
arch/arm/dts/zynq-zc702.dts renamed from board/xilinx/dts/zynq-zc702.dts +0 -0
arch/arm/dts/zynq-zc706.dts renamed from board/xilinx/dts/zynq-zc706.dts +0 -0
arch/arm/dts/zynq-zc770-xm010.dts renamed from board/xilinx/dts/zynq-zc770-xm010.dts +0 -0
arch/arm/dts/zynq-zc770-xm012.dts renamed from board/xilinx/dts/zynq-zc770-xm012.dts +0 -0
arch/arm/dts/zynq-zc770-xm013.dts renamed from board/xilinx/dts/zynq-zc770-xm013.dts +0 -0
arch/arm/dts/zynq-zed.dts renamed from board/xilinx/dts/zynq-zed.dts +0 -0
arch/microblaze/dts/microblaze-generic.dts renamed from board/xilinx/dts/microblaze-generic.dts +0 -0
arch/x86/dts/alex.dts renamed from board/chromebook-x86/dts/alex.dts +0 -0
arch/x86/dts/link.dts renamed from board/chromebook-x86/dts/link.dts +0 -0
dts/Makefile +2 -2
@@ -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)
scripts/Makefile.lib +0 -1
@@ -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__
Signature · 1 line
1.8.3.2
PATCH v2 2/3 dts: move device tree sources to arch/$(ARCH)/dts/
Hi Masahiro,
Quoted 6 lines · Masahiro Yamada
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.
Quoted 6 lines
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.
What is the motivation for this? I worry that we might end up with a lot of files in one directory. One benefit of the current approach is that .dts files are split up by vendor. Even if we put the SoC .dtsi files in arch/arm, perhaps there is a benefit in leaving the board .dts files in board/<vendor>?
I don't have strong feelings, just questing this...
Regards,
Simon
Quoted 222 lines
Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2:
- Newly added{board/samsung => arch/arm}/dts/exynos5250-arndale.dts | 0 {board/samsung => arch/arm}/dts/exynos5250-smdk5250.dts | 0 {board/samsung => arch/arm}/dts/exynos5250-snow.dts | 0 {board/samsung => arch/arm}/dts/exynos5420-smdk5420.dts | 0 {board/nvidia => arch/arm}/dts/tegra114-dalmore.dts | 0 {board/toradex => arch/arm}/dts/tegra20-colibri_t20_iris.dts | 0 {board/nvidia => arch/arm}/dts/tegra20-harmony.dts | 0 {board/avionic-design => arch/arm}/dts/tegra20-medcom-wide.dts | 0 {board/compal => arch/arm}/dts/tegra20-paz00.dts | 0 {board/avionic-design => arch/arm}/dts/tegra20-plutux.dts | 0 {board/nvidia => arch/arm}/dts/tegra20-seaboard.dts | 0 {board/avionic-design => arch/arm}/dts/tegra20-tamonten.dtsi | 0 {board/avionic-design => arch/arm}/dts/tegra20-tec.dts | 0 {board/compulab => arch/arm}/dts/tegra20-trimslice.dts | 0 {board/nvidia => arch/arm}/dts/tegra20-ventana.dts | 0 {board/nvidia => arch/arm}/dts/tegra20-whistler.dts | 0 {board/nvidia => arch/arm}/dts/tegra30-beaver.dts | 0 {board/nvidia => arch/arm}/dts/tegra30-cardhu.dts | 0 {board/avionic-design => arch/arm}/dts/tegra30-tamonten.dtsi | 0 {board/avionic-design => arch/arm}/dts/tegra30-tec-ng.dts | 0 {board/xilinx => arch/arm}/dts/zynq-microzed.dts | 0 {board/xilinx => arch/arm}/dts/zynq-zc702.dts | 0 {board/xilinx => arch/arm}/dts/zynq-zc706.dts | 0 {board/xilinx => arch/arm}/dts/zynq-zc770-xm010.dts | 0 {board/xilinx => arch/arm}/dts/zynq-zc770-xm012.dts | 0 {board/xilinx => arch/arm}/dts/zynq-zc770-xm013.dts | 0 {board/xilinx => arch/arm}/dts/zynq-zed.dts | 0 {board/xilinx => arch/microblaze}/dts/microblaze-generic.dts | 0 {board/chromebook-x86 => arch/x86}/dts/alex.dts | 0 {board/chromebook-x86 => arch/x86}/dts/link.dts | 0 dts/Makefile | 4 ++-- scripts/Makefile.lib | 1 - 32 files changed, 2 insertions(+), 3 deletions(-) rename {board/samsung => arch/arm}/dts/exynos5250-arndale.dts (100%) rename {board/samsung => arch/arm}/dts/exynos5250-smdk5250.dts (100%) rename {board/samsung => arch/arm}/dts/exynos5250-snow.dts (100%) rename {board/samsung => arch/arm}/dts/exynos5420-smdk5420.dts (100%) rename {board/nvidia => arch/arm}/dts/tegra114-dalmore.dts (100%) rename {board/toradex => arch/arm}/dts/tegra20-colibri_t20_iris.dts (100%) rename {board/nvidia => arch/arm}/dts/tegra20-harmony.dts (100%) rename {board/avionic-design => arch/arm}/dts/tegra20-medcom-wide.dts (100%) rename {board/compal => arch/arm}/dts/tegra20-paz00.dts (100%) rename {board/avionic-design => arch/arm}/dts/tegra20-plutux.dts (100%) rename {board/nvidia => arch/arm}/dts/tegra20-seaboard.dts (100%) rename {board/avionic-design => arch/arm}/dts/tegra20-tamonten.dtsi (100%) rename {board/avionic-design => arch/arm}/dts/tegra20-tec.dts (100%) rename {board/compulab => arch/arm}/dts/tegra20-trimslice.dts (100%) rename {board/nvidia => arch/arm}/dts/tegra20-ventana.dts (100%) rename {board/nvidia => arch/arm}/dts/tegra20-whistler.dts (100%) rename {board/nvidia => arch/arm}/dts/tegra30-beaver.dts (100%) rename {board/nvidia => arch/arm}/dts/tegra30-cardhu.dts (100%) rename {board/avionic-design => arch/arm}/dts/tegra30-tamonten.dtsi (100%) rename {board/avionic-design => arch/arm}/dts/tegra30-tec-ng.dts (100%) rename {board/xilinx => arch/arm}/dts/zynq-microzed.dts (100%) rename {board/xilinx => arch/arm}/dts/zynq-zc702.dts (100%) rename {board/xilinx => arch/arm}/dts/zynq-zc706.dts (100%) rename {board/xilinx => arch/arm}/dts/zynq-zc770-xm010.dts (100%) rename {board/xilinx => arch/arm}/dts/zynq-zc770-xm012.dts (100%) rename {board/xilinx => arch/arm}/dts/zynq-zc770-xm013.dts (100%) rename {board/xilinx => arch/arm}/dts/zynq-zed.dts (100%) rename {board/xilinx => arch/microblaze}/dts/microblaze-generic.dts (100%) rename {board/chromebook-x86 => arch/x86}/dts/alex.dts (100%) rename {board/chromebook-x86 => arch/x86}/dts/link.dts (100%)arch/arm/dts/exynos5250-arndale.dts renamed from board/samsung/dts/exynos5250-arndale.dts +0
-0arch/arm/dts/exynos5250-smdk5250.dts renamed from board/samsung/dts/exynos5250-smdk5250.dts +0
-0arch/arm/dts/exynos5250-snow.dts renamed from board/samsung/dts/exynos5250-snow.dts +0
-0arch/arm/dts/exynos5420-smdk5420.dts renamed from board/samsung/dts/exynos5420-smdk5420.dts +0
-0arch/arm/dts/tegra114-dalmore.dts renamed from board/nvidia/dts/tegra114-dalmore.dts +0
-0arch/arm/dts/tegra20-colibri_t20_iris.dts renamed from board/toradex/dts/tegra20-colibri_t20_iris.dts +0
-0arch/arm/dts/tegra20-harmony.dts renamed from board/nvidia/dts/tegra20-harmony.dts +0
-0arch/arm/dts/tegra20-medcom-wide.dts renamed from board/avionic-design/dts/tegra20-medcom-wide.dts +0
-0arch/arm/dts/tegra20-paz00.dts renamed from board/compal/dts/tegra20-paz00.dts +0
-0arch/arm/dts/tegra20-plutux.dts renamed from board/avionic-design/dts/tegra20-plutux.dts +0
-0arch/arm/dts/tegra20-seaboard.dts renamed from board/nvidia/dts/tegra20-seaboard.dts +0
-0arch/arm/dts/tegra20-tamonten.dtsi renamed from board/avionic-design/dts/tegra20-tamonten.dtsi +0
-0arch/arm/dts/tegra20-tec.dts renamed from board/avionic-design/dts/tegra20-tec.dts +0
-0arch/arm/dts/tegra20-trimslice.dts renamed from board/compulab/dts/tegra20-trimslice.dts +0
-0arch/arm/dts/tegra20-ventana.dts renamed from board/nvidia/dts/tegra20-ventana.dts +0
-0arch/arm/dts/tegra20-whistler.dts renamed from board/nvidia/dts/tegra20-whistler.dts +0
-0arch/arm/dts/tegra30-beaver.dts renamed from board/nvidia/dts/tegra30-beaver.dts +0
-0arch/arm/dts/tegra30-cardhu.dts renamed from board/nvidia/dts/tegra30-cardhu.dts +0
-0arch/arm/dts/tegra30-tamonten.dtsi renamed from board/avionic-design/dts/tegra30-tamonten.dtsi +0
-0arch/arm/dts/tegra30-tec-ng.dts renamed from board/avionic-design/dts/tegra30-tec-ng.dts +0
-0arch/arm/dts/zynq-microzed.dts renamed from board/xilinx/dts/zynq-microzed.dts +0
-0arch/arm/dts/zynq-zc702.dts renamed from board/xilinx/dts/zynq-zc702.dts +0
-0arch/arm/dts/zynq-zc706.dts renamed from board/xilinx/dts/zynq-zc706.dts +0
-0arch/arm/dts/zynq-zc770-xm010.dts renamed from board/xilinx/dts/zynq-zc770-xm010.dts +0
-0arch/arm/dts/zynq-zc770-xm012.dts renamed from board/xilinx/dts/zynq-zc770-xm012.dts +0
-0arch/arm/dts/zynq-zc770-xm013.dts renamed from board/xilinx/dts/zynq-zc770-xm013.dts +0
-0arch/arm/dts/zynq-zed.dts renamed from board/xilinx/dts/zynq-zed.dts +0
-0arch/microblaze/dts/microblaze-generic.dts renamed from board/xilinx/dts/microblaze-generic.dts +0
-0arch/x86/dts/alex.dts renamed from board/chromebook-x86/dts/alex.dts +0
-0arch/x86/dts/link.dts renamed from board/chromebook-x86/dts/link.dts +0
-0dts/Makefile +2
-2@@ -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)scripts/Makefile.lib +0
-2@@ -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__ --1.8.3.2
PATCH v2 2/3 dts: move device tree sources to arch/$(ARCH)/dts/
Hello Simon,
Quoted 13 lines
Hi Masahiro,
Quoted 10 lines · Masahiro Yamada
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.
Quoted 5 lines
Quoted 2 lines
This commit moves *.dts to arch/$(ARCH)/dts/ directories, allowing us to describe nicely mutiple DTBs generation in the next commit.
What is the motivation for this? I worry that we might end up with a lot of files in one directory.
We have only 35 .dtsi and .dts for ARM.
I think it will be OK at least until we have 500.
Linux v3.13 has 500 .dtsi and .dts files in arch/arm/boot/dts/ and they are still adding device trees to that directory.
I have no idea if they will keep going, or someone will scream and turn around.
Anyway, when Linux guys someday invents a nice idea to work arond increasing device trees, we can import it to U-Boot.
It should be easy for us because we already have a similar build system.
Quoted 4 lines
One benefit of the current approach is
that .dts files are split up by vendor. Even if we put the SoC .dtsi files inarch/arm, perhaps there is a benefit in leaving the board .dts files in board/<vendor>?
I don't like the idea to split up by vendor.
Now Xilinx has device trees both for ARM and Microblaze, resulting in totally unrelated device trees in one directory.
What if Freescale decided to adopt device tree? They support various boards on ARM, PowerPC, M68K.
Renesus is the same. They have ARM and SuperH boards.
On the other hand, different vendors can produce similar boards. For example avionic design, which develops Tegra boards, are using nVidia's sources.
When I saw board/nvidia/common/common.mk
and board/avionic-design/*/Makefile, etc., I think we're screwed up with <vendor> directory.
Best Regards
Masahiro Yamada
PATCH v2 2/3 dts: move device tree sources to arch/$(ARCH)/dts/
Hi Masahiro,
Quoted 28 lines · Masahiro Yamada
Hello Simon,
Quoted 13 lines
Hi Masahiro,
Quoted 10 lines · Masahiro Yamada
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.Quoted 5 lines
Quoted 2 lines
This commit moves *.dts to arch/$(ARCH)/dts/ directories, allowing us to describe nicely mutiple DTBs generation in the next commit.
What is the motivation for this? I worry that we might end up with a lot of files in one directory.
We have only 35 .dtsi and .dts for ARM.
I think it will be OK at least until we have 500.Linux v3.13 has 500 .dtsi and .dts files in
arch/arm/boot/dts/and they are still adding device trees to that directory.
Quoted 6 lines
I have no idea if they will keep going, or someone will scream and turn around.
Anyway, when Linux guys someday invents a nice idea to work arond increasing device trees, we can import it to U-Boot.
It should be easy for us because we already have a similar build system.
Hmm, but would it be such a big problem to keep the general ARM and SOC stuff in arch/arm/dts and the board-specific stuff in board/ ?
One of the problems with Linux is that their board-specific code is spread all over the place, and I'm not sure we want to emulate it?
Quoted 10 lines
Quoted 5 lines
One benefit of the current approach is
that .dts files are split up by vendor. Even if we put the SoC .dtsi files inarch/arm, perhaps there is a benefit in leaving the board .dts files in board/<vendor>?I don't like the idea to split up by vendor.
Now Xilinx has device trees both for ARM and Microblaze, resulting in totally unrelated device trees in one directory.
Shouldn't the SoC part go in arch/arm and arch/microblaze? Then just the board-specific stuff can go in board/
Quoted 5 lines
What if Freescale decided to adopt device tree? They support various boards on ARM, PowerPC, M68K.
Renesus is the same. They have ARM and SuperH boards.
I'm not convinced yet. I think maybe you have forgotten about the .dtsi files for SoCs. They are common, but no one is going to include a board .dts file (nor can they), so putting them in a common area does not seem like a win to me.
Quoted 9 lines
On the other hand, different vendors can produce similar boards. For example avionic design, which develops Tegra boards, are using nVidia's sources.
When I saw
board/nvidia/common/common.mk
and board/avionic-design/*/Makefile, etc., I think we're screwed up with <vendor> directory.
Well the probably as I see it is that board/nvidia has some SoC code that other boards want to use. The solution to that might be to move the code to arch/arm/cpu/armv7/tegra... instead?
Quoted 4 lines
Best Regards
Masahiro Yamada
Regards,
Simon
PATCH v2 2/3 dts: move device tree sources to arch/$(ARCH)/dts/
Hello Simon,
Quoted 27 lines
Quoted 27 lines
Quoted 12 lines · Masahiro Yamada
Quoted 10 lines
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.Quoted 5 lines
Quoted 2 lines
This commit moves *.dts to arch/$(ARCH)/dts/ directories, allowing us to describe nicely mutiple DTBs generation in the next commit.
What is the motivation for this? I worry that we might end up with a lot of files in one directory.
We have only 35 .dtsi and .dts for ARM.
I think it will be OK at least until we have 500.Linux v3.13 has 500 .dtsi and .dts files in
arch/arm/boot/dts/and they are still adding device trees to that directory.I have no idea if they will keep going, or someone will scream and turn around.
Quoted 8 lines
Quoted 3 lines
Anyway, when Linux guys someday invents a nice idea to work arond increasing device trees, we can import it to U-Boot.
It should be easy for us because we already have a similar build system.Hmm, but would it be such a big problem to keep the general ARM and SOC stuff in
arch/arm/dtsand the board-specific stuff in board/ ? One of the problems with Linux is that their board-specific code is spread all over the place, and I'm not sure we want to emulate it?
Opposite.
Board-specific code mostly resides underarch/arm/mach-* or arch/arm/plat-*.
And what else is arch/arm/configs and arch/arm/boot/dts. That's it.
We have board-specific part
- entries in boards.cfg
- include/configs/<board_config>.h
- board/<vendor>/<board> or board/<board>
- arch/<ARCH>/include/am/arch-<soc> includes sometimes board-specific headers as well as SoC specific headers. (Because there is no other place to store board-specific header files)
Various stuff under include/, for exmple
- include/xilinx.h: vendor specific?
- include/sandboxblockdev.h: arch specific?
And we often missed to remove remainders of dead boards.
U-Boot has more troublesome directory structure.
Quoted 5 lines
Quoted 5 lines
Quoted 4 lines
One benefit of the current approach is
that .dts files are split up by vendor. Even if we put the SoC .dtsi files inarch/arm, perhaps there is a benefit in leaving the board .dts files in board/<vendor>?
Quoted 7 lines
Quoted 4 lines
I don't like the idea to split up by vendor.
Now Xilinx has device trees both for ARM and Microblaze, resulting in totally unrelated device trees in one directory.
Shouldn't the SoC part go in
arch/armandarch/microblaze? Then just the board-specific stuff can go in board/
What is SoC part? What is Board part?
Quoted 10 lines
Quoted 5 lines
What if Freescale decided to adopt device tree? They support various boards on ARM, PowerPC, M68K.
Renesus is the same. They have ARM and SuperH boards.
I'm not convinced yet. I think maybe you have forgotten about the .dtsi files for SoCs. They are common, but no one is going to include a board .dts file (nor can they), so putting them in a common area does not seem like a win to me.
I do know that *.dtsi files are included from others, while *.dts files are not included from anywhere.
And I understand your policy, *.dtsi to arch dir and *.dts to vendor dir. (No that I care, we have two exceptions:./board/avionic-design/dts/tegra20-tamonten.dtsi ./board/avionic-design/dts/tegra30-tamonten.dtsi)
If I have to mention a win,
we can save makefiles by not putting almost same ones in vendor directories.
Anyway, we have 3 structures proposed so far.
[1] board/$(VENDOR)/dts/ (current structure)
[2] arch/$(ARCH)/dts/ (suggested by me)
[3] dts/ for all architectures (suggested by Scott)
In my option, [2] and [3] seem to be reasonable enough.
If we cannot reach an agreement,
shall we postpone 2/3 and 3/3 and apply only 1/3?
Quoted 11 lines
Quoted 7 lines
On the other hand, different vendors can produce similar boards. For example avionic design, which develops Tegra boards, are using nVidia's sources.
When I saw
board/nvidia/common/common.mk
and board/avionic-design/*/Makefile, etc., I think we're screwed up with <vendor> directory.Well the probably as I see it is that board/nvidia has some SoC code that other boards want to use. The solution to that might be to move the code to
arch/arm/cpu/armv7/tegra... instead?
Concerning the result, board/nvidia/common turned out to be SoC-specific code, not Vendor-specific (board-specific) code.
But I guess the difference between SoC-specific code and board-specific code was not clear when nVidia develpers posted that code first.
Maybe I am digressing, but it also happens to me quite often. It is difficult for me to decide whether each code should go to board/panasonic or arch/arm/cpu/armv7/uniphier.
I'd say, vendor (and board) directories are harmful.
Best Regards
Masahiro Yamada
PATCH v2 2/3 dts: move device tree sources to arch/$(ARCH)/dts/
Hi Masahiro,
Quoted 53 lines · Masahiro Yamada
Hello Simon,
Quoted 27 lines
Quoted 27 lines
Quoted 12 lines · Masahiro Yamada
Quoted 10 lines
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.Quoted 5 lines
Quoted 2 lines
This commit moves *.dts to arch/$(ARCH)/dts/ directories, allowing us to describe nicely mutiple DTBs generation in the next commit.
What is the motivation for this? I worry that we might end up with a lot of files in one directory.
We have only 35 .dtsi and .dts for ARM.
I think it will be OK at least until we have 500.Linux v3.13 has 500 .dtsi and .dts files in
arch/arm/boot/dts/and they are still adding device trees to that directory.I have no idea if they will keep going, or someone will scream and turn around.
Quoted 8 lines
Quoted 3 lines
Anyway, when Linux guys someday invents a nice idea to work arond increasing device trees, we can import it to U-Boot.
It should be easy for us because we already have a similar build system.Hmm, but would it be such a big problem to keep the general ARM and SOC stuff in
arch/arm/dtsand the board-specific stuff in board/ ? One of the problems with Linux is that their board-specific code is spread all over the place, and I'm not sure we want to emulate it?Opposite.
Board-specific code mostly resides underarch/arm/mach-*orarch/arm/plat-*.
And what else isarch/arm/configsandarch/arm/boot/dts. That's it.We have board-specific part
- entries in boards.cfg
- include/configs/<board_config>.h
- board/<vendor>/<board> or board/<board>
- arch/<ARCH>/include/am/arch-<soc> includes sometimes board-specific headers as well as SoC specific headers. (Because there is no other place to store board-specific header files)
Quoted 7 lines
Various stuff under
include/, for exmple
-include/xilinx.h: vendor specific?
-include/sandboxblockdev.h: arch specific?And we often missed to remove remainders of dead boards.
U-Boot has more troublesome directory structure.
Well Linux got board-specific directories and systems only relatively recently I suppose. U-Boot has the benefit of many years of legacy :-)
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 6 lines
One benefit of the current approach is
that .dts files are split up by vendor. Even if we put the SoC .dtsi files inarch/arm, perhaps there is a benefit in leaving the board .dts files in board/<vendor>?I don't like the idea to split up by vendor.
Quoted 7 lines
Quoted 5 lines
Quoted 2 lines
Now Xilinx has device trees both for ARM and Microblaze, resulting in totally unrelated device trees in one directory.
Shouldn't the SoC part go in
arch/armandarch/microblaze? Then just the board-specific stuff can go in board/What is SoC part? What is Board part?
Well SoC is the chip from a vendor like Nvidia. Normally they would provide a set of .dtsi files, say for example tegra20.dtsi, tegra30.dtsi, etc. It makes sense to have a common SoC directory that all boards can use.
Then a board that uses say a Tegra SoC on it can just include those files and connect things up as required.
Quoted 26 lines
Quoted 11 lines
Quoted 6 lines
What if Freescale decided to adopt device tree? They support various boards on ARM, PowerPC, M68K.
Renesus is the same. They have ARM and SuperH boards.
I'm not convinced yet. I think maybe you have forgotten about the .dtsi files for SoCs. They are common, but no one is going to include a board .dts file (nor can they), so putting them in a common area does not seem like a win to me.
I do know that *.dtsi files are included from others, while *.dts files are not included from anywhere.
And I understand your policy, *.dtsi to arch dir and *.dts to vendor dir. (No that I care, we have two exceptions:./board/avionic-design/dts/tegra20-tamonten.dtsi./board/avionic-design/dts/tegra30-tamonten.dtsi)If I have to mention a win,
we can save makefiles by not putting almost same ones in vendor directories.Anyway, we have 3 structures proposed so far.
Quoted 9 lines
[1] board/$(VENDOR)/dts/ (current structure)
[2] arch/$(ARCH)/dts/ (suggested by me)
[3] dts/ for all architectures (suggested by Scott)In my option, [2] and [3] seem to be reasonable enough.
If we cannot reach an agreement,
shall we postpone 2/3 and 3/3 and apply only 1/3?
I don't want to hold up progress, but I am not sure that the Linux approach is a great idea. I prefer this:
arch/$(ARCH)/dts - SoC .dtsi files
board/$(VENDOR)/dts - Board-specific .dts files (which include the above)
but as you say we don't have a lot of files so it is not a huge deal.
Quoted 9 lines
Quoted 9 lines
Quoted 8 lines
On the other hand, different vendors can produce similar boards. For example avionic design, which develops Tegra boards, are using nVidia's sources.
When I saw
board/nvidia/common/common.mk
and board/avionic-design/*/Makefile, etc., I think we're screwed up with <vendor> directory.
Quoted 7 lines
Quoted 3 lines
Well the probably as I see it is that board/nvidia has some SoC code that other boards want to use. The solution to that might be to move the code to
arch/arm/cpu/armv7/tegra... instead?Concerning the result, board/nvidia/common turned out to be SoC-specific code, not Vendor-specific (board-specific) code.
Agreed, but we don't put .dtsi files in there, so that is a different problem.
Quoted 8 lines
But I guess the difference between SoC-specific code and board-specific code was not clear when nVidia develpers posted that code first.
Maybe I am digressing, but it also happens to me quite often. It is difficult for me to decide whether each code should go to board/panasonic or
arch/arm/cpu/armv7/uniphier.I'd say, vendor (and board) directories are harmful.
Interesting...the idea with board files I think is that it is for code specific to a board. My hope is that there would be less of that with device tree, but it is early days.
You are right about the common directory in board/<vendor>. But this is probably worth a wider discussion than just device tree files.
Regards,
Simon
PATCH v2 2/3 dts: move device tree sources to arch/$(ARCH)/dts/
In reply to Masahiro YamadaQuoted 19 lines · Masahiro Yamada
Hello Simon,
Quoted 16 lines
Hi Masahiro,
Quoted 12 lines · Masahiro Yamada
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.
Quoted 8 lines
Quoted 2 lines
What is the motivation for this? I worry that we might end up with a lot of files in one directory.
We have only 35 .dtsi and .dts for ARM.
I think it will be OK at least until we have 500.Linux v3.13 has 500 .dtsi and .dts files in
arch/arm/boot/dts/and they are still adding device trees to that directory.
Last I saw the plan, still, is to remove them from the kernel "someday". Hopefully when that happens we can also leverage what comes next.
Quoted 6 lines
I have no idea if they will keep going, or someone will scream and turn around.
Anyway, when Linux guys someday invents a nice idea to work arond increasing device trees, we can import it to U-Boot.
It should be easy for us because we already have a similar build system.
True.
Quoted 9 lines
Quoted 4 lines
One benefit of the current approach is
that .dts files are split up by vendor. Even if we put the SoC .dtsi files inarch/arm, perhaps there is a benefit in leaving the board .dts files in board/<vendor>?I don't like the idea to split up by vendor.
Now Xilinx has device trees both for ARM and Microblaze, resulting in totally unrelated device trees in one directory.
This, I think is backwards. Xilinx has (and Freescale and others are or will be joining them) a lot of things shared between them as IP blocks get reused from non-ARM to ARM CPUs. So there's a level of DT sharing for these blocks between the CPUs. The kernel is going to start having this problem as vendors start dropping their arm IP blocks into ARMv8 SoCs, and those would be in arch/arm64/. The question is, will people care enough about the duplication, or just live with it.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140218/e0470c45/attachment.pgp>
Michal Simek
maintainerPATCH v2 2/3 dts: move device tree sources to arch/$(ARCH)/dts/
Quoted 51 lines · Tom Rini
Quoted 19 lines · Masahiro Yamada
Hello Simon,
Quoted 16 lines
Hi Masahiro,
Quoted 12 lines · Masahiro Yamada
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.
Quoted 8 lines
Quoted 2 lines
What is the motivation for this? I worry that we might end up with a lot of files in one directory.
We have only 35 .dtsi and .dts for ARM.
I think it will be OK at least until we have 500.Linux v3.13 has 500 .dtsi and .dts files in
arch/arm/boot/dts/and they are still adding device trees to that directory.Last I saw the plan, still, is to remove them from the kernel "someday". Hopefully when that happens we can also leverage what comes next.
Quoted 6 lines
I have no idea if they will keep going, or someone will scream and turn around.
Anyway, when Linux guys someday invents a nice idea to work arond increasing device trees, we can import it to U-Boot.
It should be easy for us because we already have a similar build system.True.
Quoted 9 lines
Quoted 4 lines
One benefit of the current approach is
that .dts files are split up by vendor. Even if we put the SoC .dtsi files inarch/arm, perhaps there is a benefit in leaving the board .dts files in board/<vendor>?I don't like the idea to split up by vendor.
Now Xilinx has device trees both for ARM and Microblaze, resulting in totally unrelated device trees in one directory.
Quoted 7 lines
This, I think is backwards. Xilinx has (and Freescale and others are or will be joining them) a lot of things shared between them as IP blocks get reused from non-ARM to ARM CPUs. So there's a level of DT sharing for these blocks between the CPUs. The kernel is going to start having this problem as vendors start dropping their arm IP blocks into ARMv8 SoCs, and those would be in
arch/arm64/. The question is, will people care enough about the duplication, or just live with it.
We share all soft IP drivers between ARM and Microblaze and we will continue in this style. The point is to have the same binding which we have. We are using device-tree generator to get the latest binding which is in sync with kernel. When we adopt u-boot configured by device-tree (when variable handling in u-boot is fixed) we will use the same binding in uboot too.
I personally don't care where DTS files will be placed because we will generate them as we are doing now.
Thanks,
Michal
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 263 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140218/b0dc8f72/attachment.pgp>
PATCH v2 2/3 dts: move device tree sources to arch/$(ARCH)/dts/
In reply to Simon GlassQuoted 16 lines · Simon Glass
Hi Masahiro,
Quoted 6 lines · Masahiro Yamada
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.
Quoted 6 lines
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.
Quoted 7 lines
What is the motivation for this? I worry that we might end up with a lot of files in one directory. One benefit of the current approach is that .dts files are split up by vendor. Even if we put the SoC .dtsi files in
arch/arm, perhaps there is a benefit in leaving the board .dts files in board/<vendor>?I don't have strong feelings, just questing this...
Having all the device trees in one place (I don't even see why it should be split by arch; some common dtsi files may be shared by multiple arches) is nice for grepping and maintenance. If it gets too large it can grow an internal hierarchy.
Just like net drivers go under drivers/net regardless of arch, etc.
-Scott
PATCH v2 3/3 dts: generate multiple device tree blobs
In reply to Masahiro YamadaIt is convenient to have all device trees on the same SoC compiled. It allows for later easy repackaging without the need to re-run the make file.
- Build device trees with the same SoC under arch/$(ARCH)/dts
- Copy the one specified by CONFIG_DEFAULT_DEVICE_TREE or DEVICE_TREE=... to dts/dt.dtb
---
Changes in v2:
- Newly added
arch/arm/dts/.gitignore | 1 + arch/arm/dts/Makefile | 37 +++++++++++++++++++++++++++++++++++++ arch/microblaze/dts/.gitignore | 1 + arch/microblaze/dts/Makefile | 11 +++++++++++ arch/x86/dts/.gitignore | 1 + arch/x86/dts/Makefile | 12 ++++++++++++ dts/Makefile | 31 ++++++++++++++++++++----------- 7 files changed, 83 insertions(+), 11 deletions(-) create mode 100644 arch/arm/dts/.gitignore create mode 100644 arch/arm/dts/Makefile create mode 100644 arch/microblaze/dts/.gitignore create mode 100644 arch/microblaze/dts/Makefile create mode 100644 arch/x86/dts/.gitignore create mode 100644 arch/x86/dts/Makefile
arch/arm/dts/.gitignore new file +1 -0
@@ -0,0 +1 @@ +*.dtb
arch/arm/dts/Makefile new file +37 -0
@@ -0,0 +1,37 @@ +dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \ + exynos5250-snow.dtb \ + exynos5250-smdk5250.dtb \ + exynos5420-smdk5420.dtb + +dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \ + tegra20-medcom-wide.dtb \ + tegra20-paz00.dtb \ + tegra20-plutux.dtb \ + tegra20-seaboard.dtb \ + tegra20-tec.dtb \ + tegra20-trimslice.dtb \ + tegra20-ventana.dtb \ + tegra20-whistler.dtb \ + tegra20-colibri_t20_iris.dtb \ + tegra30-beaver.dtb \ + tegra30-cardhu.dtb \ + tegra30-tec-ng.dtb \ + tegra114-dalmore.dtb + +dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \ + zynq-zc706.dtb \ + zynq-zed.dtb \ + zynq-microzed.dtb \ + zynq-zc770-xm010.dtb \ + zynq-zc770-xm012.dtb \ + zynq-zc770-xm013.dtb + +targets += $(dtb-y) + +DTC_FLAGS += -R 4 -p 0x1000 + +PHONY += dtbs +dtbs: $(addprefix $(obj)/, $(dtb-y)) + @: + +clean-files := *.dtb
arch/microblaze/dts/.gitignore new file +1 -0
@@ -0,0 +1 @@ +*.dtb
arch/microblaze/dts/Makefile new file +11 -0
@@ -0,0 +1,11 @@ +dtb-y += microblaze-generic.dtb + +targets += $(dtb-y) + +DTC_FLAGS += -R 4 -p 0x1000 + +PHONY += dtbs +dtbs: $(addprefix $(obj)/, $(dtb-y)) + @: + +clean-files := *.dtb
arch/x86/dts/.gitignore new file +1 -0
@@ -0,0 +1 @@ +*.dtb
arch/x86/dts/Makefile new file +12 -0
@@ -0,0 +1,12 @@ +dtb-y += link.dts \ + alex.dts + +targets += $(dtb-y) + +DTC_FLAGS += -R 4 -p 0x1000 + +PHONY += dtbs +dtbs: $(addprefix $(obj)/, $(dtb-y)) + @: + +clean-files := *.dtb
dts/Makefile +20 -11
@@ -9,24 +9,30 @@ DEVICE_TREE ?= $(CONFIG_DEFAULT_DEVICE_TREE:"%"=%) ifeq ($(DEVICE_TREE),) -DEVICE_TREE := notfound +DEVICE_TREE := unset endif -DTS := $(srctree)/arch/$(ARCH)/dts/$(DEVICE_TREE).dts +DTB := arch/$(ARCH)/dts/$(DEVICE_TREE).dtb -DTC_FLAGS += -R 4 -p 0x1000 +quiet_cmd_cp = CP $@ +cmd_cp = cp $< $@ -$(obj)/dt.dtb: $(DTS) FORCE - $(call if_changed_dep,dtc) +$(obj)/dt.dtb: $(DTB) FORCE + $(call if_changed,cp) targets += dt.dtb -$(DTS): - @echo >&2 - @echo >&2 "Device Tree Source is not specified." - @echo >&2 "Please define 'CONFIG_DEFAULT_DEVICE_TREE'" - @echo >&2 "or build with 'DEVICE_TREE=<dts-file-name>' argument" - @/bin/false +$(DTB): arch-dtbs + $(Q)test -e $@ || ( \ + echo >&2; \ + echo >&2 "Device Tree Source is not correctly specified."; \ + echo >&2 "Please define 'CONFIG_DEFAULT_DEVICE_TREE'"; \ + echo >&2 "or build with 'DEVICE_TREE=<dts-file>' argument"; \ + echo >&2; \ + /bin/false) + +arch-dtbs: + $(Q)$(MAKE) $(build)=arch/$(ARCH)/dts dtbs .SECONDARY: $(obj)/dt.dtb.S
@@ -36,3 +42,6 @@ dtbs: $(obj)/dt.dtb @: clean-files := dt.dtb.S + +# Let clean descend into dts directories +subdir- += ../arch/*/dts
Signature · 1 line
1.8.3.2
PATCH v2 3/3 dts: generate multiple device tree blobs
Hi Masahiro,
Quoted 59 lines · Masahiro Yamada
It is convenient to have all device trees on the same SoC compiled. It allows for later easy repackaging without the need to re-run the make file.
- Build device trees with the same SoC under arch/$(ARCH)/dts
- Copy the one specified byCONFIG_DEFAULT_DEVICE_TREEor DEVICE_TREE=... to dts/dt.dtbSigned-off-by Masahiro Yamada <[email protected]>---
Changes in v2:
- Newly addedarch/arm/dts/.gitignore | 1 + arch/arm/dts/Makefile | 37 +++++++++++++++++++++++++++++++++++++ arch/microblaze/dts/.gitignore | 1 + arch/microblaze/dts/Makefile | 11 +++++++++++ arch/x86/dts/.gitignore | 1 + arch/x86/dts/Makefile | 12 ++++++++++++ dts/Makefile | 31 ++++++++++++++++++++----------- 7 files changed, 83 insertions(+), 11 deletions(-) create mode 100644 arch/arm/dts/.gitignore create mode 100644 arch/arm/dts/Makefile create mode 100644 arch/microblaze/dts/.gitignore create mode 100644 arch/microblaze/dts/Makefile create mode 100644 arch/x86/dts/.gitignore create mode 100644 arch/x86/dts/Makefilearch/arm/dts/.gitignore new file +1
-0@@ -0,0 +1 @@ +*.dtbarch/arm/dts/Makefile new file +17
-0@@ -0,0 +1,37 @@ +dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \ + exynos5250-snow.dtb \ + exynos5250-smdk5250.dtb \ + exynos5420-smdk5420.dtb + +dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \ + tegra20-medcom-wide.dtb \ + tegra20-paz00.dtb \ + tegra20-plutux.dtb \ + tegra20-seaboard.dtb \ + tegra20-tec.dtb \ + tegra20-trimslice.dtb \ + tegra20-ventana.dtb \ + tegra20-whistler.dtb \ + tegra20-colibri_t20_iris.dtb \ + tegra30-beaver.dtb \ + tegra30-cardhu.dtb \
arch/arm/dts/Makefile line 27
Quoted 10 lines
arch/arm/dts/Makefile new file +10
-0+ tegra30-tec-ng.dtb \ + tegra114-dalmore.dtb + +dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \ + zynq-zc706.dtb \ + zynq-zed.dtb \ + zynq-microzed.dtb \ + zynq-zc770-xm010.dtb \ + zynq-zc770-xm012.dtb \ + zynq-zc770-xm013.dtb
This better matches what the kernel does, but I'm not 100% comfortable about putting all these files in arch/arm. Granted the vendor directory may not correspond to a particular SoC, but we can put tegra20.dtsi in arch/arm/dts so that all tegra boards can use it, for example.
Regards,
Simon