diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-18 17:01:58 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-18 17:03:59 +0100 |
| commit | 3f93c644c92db1abb6149da712713132e0b37cfc (patch) | |
| tree | f12359be218bf9d6a84a5078ac71d5e515064b0d /arch/arm/mach-realview | |
| parent | Merge tag 'realview-multiplatform-tag' of git://git.kernel.org/pub/scm/linux/... (diff) | |
| download | linux-3f93c644c92db1abb6149da712713132e0b37cfc.tar.xz linux-3f93c644c92db1abb6149da712713132e0b37cfc.zip | |
ARM: realview: build realview-dt SMP support only when used
The platsmp-dt.c file does not build when CONFIG_SMP is disabled:
platsmp-dt.c:84:2: error: unknown field 'smp_prepare_cpus' specified in initializer
This changes the Makefile to build it conditionally on CONFIG_SMP.
The legacy platsmp.c file is only used for ATAGS based builds, so
we can move it into the CONFIG_ATAGS conditional.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-realview')
| -rw-r--r-- | arch/arm/mach-realview/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-realview/Makefile b/arch/arm/mach-realview/Makefile index a4392f545a31..8be6632407d8 100644 --- a/arch/arm/mach-realview/Makefile +++ b/arch/arm/mach-realview/Makefile @@ -5,14 +5,16 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ -I$(srctree)/arch/arm/plat-versatile/include -obj-$(CONFIG_REALVIEW_DT) += realview-dt.o platsmp-dt.o +obj-$(CONFIG_REALVIEW_DT) += realview-dt.o +obj-$(CONFIG_SMP) += platsmp-dt.o obj-y := core.o + ifdef CONFIG_ATAGS obj-$(CONFIG_MACH_REALVIEW_EB) += realview_eb.o obj-$(CONFIG_MACH_REALVIEW_PB11MP) += realview_pb11mp.o obj-$(CONFIG_MACH_REALVIEW_PB1176) += realview_pb1176.o obj-$(CONFIG_MACH_REALVIEW_PBA8) += realview_pba8.o obj-$(CONFIG_MACH_REALVIEW_PBX) += realview_pbx.o -endif obj-$(CONFIG_SMP) += platsmp.o +endif obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o |