diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-20 07:25:59 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-20 07:25:59 +0100 |
| commit | 3fcdc0555f5043eded6312efce14cd8dd66f30f8 (patch) | |
| tree | 20edf24f0d94bef87f17963db921c8e8ac894bbd | |
| parent | Merge tag 'davinci-for-v3.8/dt' of git://gitorious.org/linux-davinci/linux-da... (diff) | |
| download | linux-3fcdc0555f5043eded6312efce14cd8dd66f30f8.tar.xz linux-3fcdc0555f5043eded6312efce14cd8dd66f30f8.zip | |
ARM: davinci: move dtb targets to common location
The dtb targets belong in arch/arm/boot/dts/Makefile now, so move the
newly added davinci targets there.
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/Makefile.boot | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 7fd1336da891..a008e63f79ed 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -17,6 +17,8 @@ dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb \ usb_a9263.dtb \ usb_a9g20.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb +dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \ + da850-evm.dtb dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \ dove-cubox.dtb \ dove-dove-db.dtb diff --git a/arch/arm/mach-davinci/Makefile.boot b/arch/arm/mach-davinci/Makefile.boot index 5c5a95a9d7d2..04a6c4e67b14 100644 --- a/arch/arm/mach-davinci/Makefile.boot +++ b/arch/arm/mach-davinci/Makefile.boot @@ -11,5 +11,3 @@ else params_phys-y := 0x80000100 initrd_phys-y := 0x80800000 endif - -dtb-$(CONFIG_MACH_DA8XX_DT) += da850-enbw-cmc.dtb da850-evm.dtb |