summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-vexpress/Makefile
diff options
context:
space:
mode:
authorPawel Moll <pawel.moll@arm.com>2012-10-09 12:56:36 +0100
committerPawel Moll <pawel.moll@arm.com>2012-11-05 17:09:51 +0000
commit38669e045dbf8f62a008898a7fb1e93975b3817c (patch)
treeb989816e1a4625729189c08eb08367bc73b268ff /arch/arm/mach-vexpress/Makefile
parent842839a37a9a9ac12d88930b6605c620fc09bc1d (diff)
ARM: vexpress: Start using new Versatile Express infrastructure
This patch starts using all the configuration infrastructure. - generic GPIO library is forced now - sysreg GPIOs are used as MMC CD and WP information sources; thanks to this MMCI auxiliary data is not longer necessary - DVI muxer and mode control is removed from non-DT V2P-CA9 code as this is now handled by the vexpress-dvi driver - clock generators control is removed as is being handled by the common clock driver now - the sysreg and sysctl control is now delegated to the appropriate drivers and all related code was removed - NOR Flash set_vpp function has been removed as the control bit used does _not_ control its VPP line, but the #WP signal instead (which is de facto unusable in case of Linux MTD drivers); this also allowed the remove its DT auxiliary data The non-DT code defines only minimal required number of the config devices. Device Trees are updated to make use of all new features. Signed-off-by: Pawel Moll <pawel.moll@arm.com>
Diffstat (limited to 'arch/arm/mach-vexpress/Makefile')
-rw-r--r--arch/arm/mach-vexpress/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/Makefile b/arch/arm/mach-vexpress/Makefile
index 42703e8b4d3..80b64971fbd 100644
--- a/arch/arm/mach-vexpress/Makefile
+++ b/arch/arm/mach-vexpress/Makefile
@@ -4,7 +4,7 @@
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
-I$(srctree)/arch/arm/plat-versatile/include
-obj-y := v2m.o
+obj-y := v2m.o reset.o
obj-$(CONFIG_ARCH_VEXPRESS_CA9X4) += ct-ca9x4.o
obj-$(CONFIG_SMP) += platsmp.o
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o