diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-22 22:53:12 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-22 23:24:00 +0200 |
| commit | b014487044161b83010a9cbe336dbc41d2c38a0b (patch) | |
| tree | eb680e8aaf280fbb6a434655bae5cfb5c76f8320 | |
| parent | Merge branch 'kirkwood/drivers' of git://git.infradead.org/users/jcooper/linu... (diff) | |
| download | linux-b014487044161b83010a9cbe336dbc41d2c38a0b.tar.xz linux-b014487044161b83010a9cbe336dbc41d2c38a0b.zip | |
ARM: kirkwood: move new dtbs to common Makefile
This moves a few of the newly introduced dtb targets to the common
dts/Makefile instead of the per-platform file.
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 6 | ||||
| -rw-r--r-- | arch/arm/mach-dove/Makefile.boot | 4 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/Makefile.boot | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index d302e6655e65..d4ad2df08920 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -17,6 +17,9 @@ dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb \ usb_a9263.dtb \ usb_a9g20.dtb dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb +dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \ + dove-cubox.dtb \ + dove-dove-db.dtb dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ exynos4210-smdkv310.dtb \ exynos5250-smdk5250.dtb @@ -32,10 +35,13 @@ dtb-$(CONFIG_SOC_IMX6Q) += imx6q-arm2.dtb \ dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ kirkwood-dns325.dtb \ + kirkwood-dockstar.dtb \ kirkwood-dreamplug.dtb \ kirkwood-goflexnet.dtb \ kirkwood-ib62x0.dtb \ kirkwood-iconnect.dtb \ + kirkwood-iomega_ix2_200.dtb \ + kirkwood-km_kirkwood.dtb \ kirkwood-lschlv2.dtb \ kirkwood-lsxhl.dtb \ kirkwood-ts219-6281.dtb \ diff --git a/arch/arm/mach-dove/Makefile.boot b/arch/arm/mach-dove/Makefile.boot index cfac9c5157cc..760a0efe7580 100644 --- a/arch/arm/mach-dove/Makefile.boot +++ b/arch/arm/mach-dove/Makefile.boot @@ -1,7 +1,3 @@ zreladdr-y += 0x00008000 params_phys-y := 0x00000100 initrd_phys-y := 0x00800000 - -dtb-$(CONFIG_MACH_DOVE_DT) += dove-dove-db.dtb -dtb-$(CONFIG_MACH_DOVE_DT) += dove-cm-a510.dtb -dtb-$(CONFIG_MACH_DOVE_DT) += dove-cubox.dtb diff --git a/arch/arm/mach-kirkwood/Makefile.boot b/arch/arm/mach-kirkwood/Makefile.boot index d90b3cb0209e..760a0efe7580 100644 --- a/arch/arm/mach-kirkwood/Makefile.boot +++ b/arch/arm/mach-kirkwood/Makefile.boot @@ -1,7 +1,3 @@ zreladdr-y += 0x00008000 params_phys-y := 0x00000100 initrd_phys-y := 0x00800000 - -dtb-$(CONFIG_MACH_IOMEGA_IX2_200_DT) += kirkwood-iomega_ix2_200.dtb -dtb-$(CONFIG_MACH_DOCKSTAR_DT) += kirkwood-dockstar.dtb -dtb-$(CONFIG_MACH_KM_KIRKWOOD_DT) += kirkwood-km_kirkwood.dtb |