Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 19fbd6b2961ccbdba73c6c731ef27da29063e094

Authored by Stephen Warren
Committed by Rob Herring
1 parent 70f915a299
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

openrisc: use new common dtc rule 

The current rules have the .dtb files build in a different directory
from the .dts files. This patch changes openrisc to use the generic dtb
rule which builds .dtb files in the same directory as the source .dts.

This requires renaming arch/openrisc/boot/Makefile to
arch/openrisc/boot/dts/Makefile, and updating arch/openrisc/Makefile to
call the new Makefile.

Cc: Jonas Bonn <jonas@southpole.se>
Cc: linux@lists.openrisc.net
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>

Showing 3 changed files with 11 additions and 16 deletions Side-by-side Diff

arch/openrisc/Makefile
Diff comments   View file @ 19fbd6b
... ... @@ -50,7 +50,7 @@
50 50 else
51 51 BUILTIN_DTB := n
52 52 endif
53   -core-$(BUILTIN_DTB) += arch/openrisc/boot/
  53 +core-$(BUILTIN_DTB) += arch/openrisc/boot/dts/
54 54  
55 55 all: vmlinux
arch/openrisc/boot/Makefile
View file @ 19fbd6b
1   -
2   -
3   -ifneq '$(CONFIG_OPENRISC_BUILTIN_DTB)' '""'
4   -BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_OPENRISC_BUILTIN_DTB)).dtb.o
5   -else
6   -BUILTIN_DTB :=
7   -endif
8   -obj-y += $(BUILTIN_DTB)
9   -
10   -clean-files := *.dtb.S
11   -
12   -#DTC_FLAGS ?= -p 1024
13   -
14   -$(obj)/%.dtb: $(src)/dts/%.dts FORCE
15   - $(call if_changed_dep,dtc)
arch/openrisc/boot/dts/Makefile
Diff comments   View file @ 19fbd6b
  1 +ifneq '$(CONFIG_OPENRISC_BUILTIN_DTB)' '""'
  2 +BUILTIN_DTB := $(patsubst "%",%,$(CONFIG_OPENRISC_BUILTIN_DTB)).dtb.o
  3 +else
  4 +BUILTIN_DTB :=
  5 +endif
  6 +obj-y += $(BUILTIN_DTB)
  7 +
  8 +clean-files := *.dtb.S
  9 +
  10 +#DTC_FLAGS ?= -p 1024