diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-09 13:05:00 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-09 13:05:15 -0700 |
| commit | 5497e7b8967118ee45f8ef2d301fce919a35d660 (patch) | |
| tree | ef4633712579d9a06fce69c0748580fe05ca19ab /arch/arm/mach-omap2/Makefile | |
| parent | 8cbc95ee748741939222c3d38584a40c92bedcdd (diff) | |
| parent | eb16d33273532533400cb95189aa50d6b734db57 (diff) | |
| download | blackbird-op-linux-5497e7b8967118ee45f8ef2d301fce919a35d660.tar.gz blackbird-op-linux-5497e7b8967118ee45f8ef2d301fce919a35d660.zip | |
Merge branch 'late/fixes' into fixes
* late/fixes:
ARM: OMAP2+: Fix unmet direct dependencies for SERIAL_OMAP
ARM: ux500: always select ABX500_CORE
ARM: SIRF: select SMP_ON_UP only on SMP builds
ARM: SPEAr: conditionalize l2x0 support
ARM: imx: build CPU suspend code only when needed
ARM: OMAP: build SMP code only for OMAP4/5
ARM: tegra: Tegra114 needs CPU_FREQ_TABLE
ARM: default machine descriptor for multiplatform
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 62bb352c2d37..55a9d6777683 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -32,12 +32,12 @@ obj-$(CONFIG_SOC_HAS_OMAP2_SDRC) += sdrc.o # SMP support ONLY available for OMAP4 -obj-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o -obj-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o +smp-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o +smp-$(CONFIG_HOTPLUG_CPU) += omap-hotplug.o omap-4-5-common = omap4-common.o omap-wakeupgen.o \ sleep44xx.o -obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-common) -obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-common) +obj-$(CONFIG_ARCH_OMAP4) += $(omap-4-5-common) $(smp-y) +obj-$(CONFIG_SOC_OMAP5) += $(omap-4-5-common) $(smp-y) plus_sec := $(call as-instr,.arch_extension sec,+sec) AFLAGS_omap-headsmp.o :=-Wa,-march=armv7-a$(plus_sec) |
