a93178a13d
conflict with the fb code, few timer warnings, and longer term regressions for tfp410 and omap h4 ethernet. Also included is a GPIO mode fix for the legacy mux code. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJQz2hxAAoJEBvUPslcq6VzIHMP/i6QowlZm742prpsyeOemU+a NZa+bfA58Pps+96zGHuCOfpPsJ8MqvYdwtOyH9NiY648A44LrKCsaqGdEzuXo04T wlgNsnMWaOBNzk5pQuUO+IlCorJpv0GXwSW4DO61UVt1A3AdLo1RSl2mq32xM6Qt 0ZHEhXbbL14QidwmKRo1zubn+nEQKiWRD2+Bj+ccDq3A2lsn6itd+YNnHB0QNwUQ +nibTleSV1QecCl0UDIwA4cTyZkeDafoAHaUH1jhIAQ30lZx1r7XbmEk6YJ51v+f f02i8tUZoX97Pr82FJnA/T28dkFXWlsliJEQ6pUYW7Y2vMjyLXgBIDQytyS5sD1H Eifk6WVuBGTd/mYhcNr7Q/MueIl/aT+c5tzZL3lVnxHZj7CUlt5li2SJQZZBlHN0 Ix1rtu1YVPdrAqZxn4GV4jqc9e+ULYvP7GZhrJuiBOgHsPzHynOYWZNLN5IVBrbZ 2zKvk1vHGMKbfEm/oFvjudBm4VRpcgp+W1Xp84YTmKPf/ZlhvjpbZK5whb15LsDM N9ufVvNxq6JNo3+8AtQIsch9t0CONXwyRB48lSYte55QgMpHUOMKQZv5NcBsj4RK AlvrqZ0PIJrFSRPwKPgWpC5VLP7hwdCMWAAB4nPAxTgjwrT35qoxZgLKiVNQCYrJ 9NfIbnESzxXKHUFc0NFJ =8+P4 -----END PGP SIGNATURE----- Merge tag 'omap-for-v3.8/fixes-for-merge-window-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes From Tony Lindgren: These patches fixes a build error caused by a merge conflict with the fb code, few timer warnings, and longer term regressions for tfp410 and omap h4 ethernet. Also included is a GPIO mode fix for the legacy mux code. * tag 'omap-for-v3.8/fixes-for-merge-window-v4-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: common: remove use of vram ARM: OMAP: Move plat/omap-serial.h to include/linux/platform_data/serial-omap.h ARM: dts: Add build target for omap4-panda-a4 ARM: dts: OMAP2420: Correct H4 board memory size mfd: omap-usb-host: get rid of cpu_is_omap..() macros ARM: OMAP: Remove debug-devices.c ARM: OMAP2420: Fix ethernet support for OMAP2420 H4 OMAP2+: mux: Fixed gpio mux mode analysis OMAP: board-files: fix i2c_bus for tfp410 ARM: OMAP2+: Fix sparse warnings in timer.c ARM: AM335x: Fix warning in timer.c ARM: OMAP2+: Fix realtime_counter_init warning in timer.c
167 lines
4.6 KiB
Makefile
167 lines
4.6 KiB
Makefile
ifeq ($(CONFIG_OF),y)
|
|
|
|
# Keep at91 dtb files sorted alphabetically for each SoC
|
|
# rm9200
|
|
dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb
|
|
# sam9260
|
|
dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += ethernut5.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += evk-pro3.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += tny_a9260.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += usb_a9260.dtb
|
|
# sam9263
|
|
dtb-$(CONFIG_ARCH_AT91) += at91sam9263ek.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += tny_a9263.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += usb_a9263.dtb
|
|
# sam9g20
|
|
dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek_2mmc.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += kizbox.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += tny_a9g20.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += usb_a9g20.dtb
|
|
# sam9g45
|
|
dtb-$(CONFIG_ARCH_AT91) += at91sam9m10g45ek.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += pm9g45.dtb
|
|
# sam9n12
|
|
dtb-$(CONFIG_ARCH_AT91) += at91sam9n12ek.dtb
|
|
# sam9x5
|
|
dtb-$(CONFIG_ARCH_AT91) += at91sam9g15ek.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb
|
|
dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb
|
|
|
|
dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
|
|
dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.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
|
|
dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
|
|
exynos4210-smdkv310.dtb \
|
|
exynos4210-trats.dtb \
|
|
exynos5250-smdk5250.dtb \
|
|
exynos5440-ssdk5440.dtb \
|
|
exynos4412-smdk4412.dtb \
|
|
exynos5250-smdk5250.dtb \
|
|
exynos5250-snow.dtb
|
|
dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
|
|
ecx-2000.dtb
|
|
dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
|
|
integratorcp.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-is2.dtb \
|
|
kirkwood-km_kirkwood.dtb \
|
|
kirkwood-lschlv2.dtb \
|
|
kirkwood-lsxhl.dtb \
|
|
kirkwood-mplcec4.dtb \
|
|
kirkwood-ns2.dtb \
|
|
kirkwood-ns2lite.dtb \
|
|
kirkwood-ns2max.dtb \
|
|
kirkwood-ns2mini.dtb \
|
|
kirkwood-nsa310.dtb \
|
|
kirkwood-topkick.dtb \
|
|
kirkwood-ts219-6281.dtb \
|
|
kirkwood-ts219-6282.dtb \
|
|
kirkwood-openblocks_a6.dtb
|
|
dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
|
|
msm8960-cdp.dtb
|
|
dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
|
|
armada-370-mirabox.dtb \
|
|
armada-xp-db.dtb \
|
|
armada-xp-openblocks-ax3-4.dtb
|
|
dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
|
|
imx53-ard.dtb \
|
|
imx53-evk.dtb \
|
|
imx53-qsb.dtb \
|
|
imx53-smd.dtb \
|
|
imx6q-arm2.dtb \
|
|
imx6q-sabreauto.dtb \
|
|
imx6q-sabrelite.dtb \
|
|
imx6q-sabresd.dtb
|
|
dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
|
|
imx23-olinuxino.dtb \
|
|
imx23-stmp378x_devb.dtb \
|
|
imx28-apf28.dtb \
|
|
imx28-apf28dev.dtb \
|
|
imx28-apx4devkit.dtb \
|
|
imx28-cfa10036.dtb \
|
|
imx28-cfa10049.dtb \
|
|
imx28-evk.dtb \
|
|
imx28-m28evk.dtb \
|
|
imx28-sps1.dtb \
|
|
imx28-tx28.dtb
|
|
dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
|
|
omap3-beagle.dtb \
|
|
omap3-beagle-xm.dtb \
|
|
omap3-evm.dtb \
|
|
omap3-tobi.dtb \
|
|
omap4-panda.dtb \
|
|
omap4-panda-a4.dtb \
|
|
omap4-panda-es.dtb \
|
|
omap4-var-som.dtb \
|
|
omap4-sdp.dtb \
|
|
omap5-evm.dtb \
|
|
am335x-evm.dtb \
|
|
am335x-evmsk.dtb \
|
|
am335x-bone.dtb
|
|
dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
|
|
dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
|
|
dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \
|
|
hrefprev60.dtb \
|
|
hrefv60plus.dtb \
|
|
ccu9540.dtb
|
|
dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
|
|
r8a7740-armadillo800eva.dtb \
|
|
sh73a0-kzm9g.dtb \
|
|
sh7372-mackerel.dtb
|
|
dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
|
|
spear1340-evb.dtb
|
|
dtb-$(CONFIG_ARCH_SPEAR3XX)+= spear300-evb.dtb \
|
|
spear310-evb.dtb \
|
|
spear320-evb.dtb \
|
|
spear320-hmi.dtb
|
|
dtb-$(CONFIG_ARCH_SPEAR6XX)+= spear600-evb.dtb
|
|
dtb-$(CONFIG_ARCH_SUNXI) += sun4i-a10-cubieboard.dtb \
|
|
sun5i-a13-olinuxino.dtb
|
|
dtb-$(CONFIG_ARCH_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 \
|
|
tegra30-cardhu-a02.dtb \
|
|
tegra30-cardhu-a04.dtb
|
|
dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
|
|
vexpress-v2p-ca9.dtb \
|
|
vexpress-v2p-ca15-tc1.dtb \
|
|
vexpress-v2p-ca15_a7.dtb \
|
|
xenvm-4.2.dtb
|
|
dtb-$(CONFIG_ARCH_VT8500) += vt8500-bv07.dtb \
|
|
wm8505-ref.dtb \
|
|
wm8650-mid.dtb
|
|
dtb-$(CONFIG_ARCH_ZYNQ) += zynq-zc702.dtb
|
|
|
|
targets += dtbs
|
|
endif
|
|
|
|
# *.dtb used to be generated in the directory above. Clean out the
|
|
# old build results so people don't accidentally use them.
|
|
dtbs: $(addprefix $(obj)/, $(dtb-y))
|
|
$(Q)rm -f $(obj)/../*.dtb
|
|
|
|
clean-files := *.dtb
|