mirror of
https://github.com/torvalds/linux.git
synced 2026-04-29 20:12:38 -04:00
6cd94d5e57
Pull ARM SoC platform changes from Arnd Bergmann:
"New and updated SoC support, notable changes include:
- bcm:
brcmstb SMP support
initial iproc/cygnus support
- exynos:
Exynos4415 SoC support
PMU and suspend support for Exynos5420
PMU support for Exynos3250
pm related maintenance
- imx:
new LS1021A SoC support
vybrid 610 global timer support
- integrator:
convert to using multiplatform configuration
- mediatek:
earlyprintk support for mt8127/mt8135
- meson:
meson8 soc and l2 cache controller support
- mvebu:
Armada 38x CPU hotplug support
drop support for prerelease Armada 375 Z1 stepping
extended suspend support, now works on Armada 370/XP
- omap:
hwmod related maintenance
prcm cleanup
- pxa:
initial pxa27x DT handling
- rockchip:
SMP support for rk3288
add cpu frequency scaling support
- shmobile:
r8a7740 power domain support
various small restart, timer, pci apmu changes
- sunxi:
Allwinner A80 (sun9i) earlyprintk support
- ux500:
power domain support
Overall, a significant chunk of changes, coming mostly from the usual
suspects: omap, shmobile, samsung and mvebu, all of which already
contain a lot of platform specific code in arch/arm"
* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (187 commits)
ARM: mvebu: use the cpufreq-dt platform_data for independent clocks
soc: integrator: Add terminating entry for integrator_cm_match
ARM: mvebu: add SDRAM controller description for Armada XP
ARM: mvebu: adjust mbus controller description on Armada 370/XP
ARM: mvebu: add suspend/resume DT information for Armada XP GP
ARM: mvebu: synchronize secondary CPU clocks on resume
ARM: mvebu: make sure MMU is disabled in armada_370_xp_cpu_resume
ARM: mvebu: Armada XP GP specific suspend/resume code
ARM: mvebu: reserve the first 10 KB of each memory bank for suspend/resume
ARM: mvebu: implement suspend/resume support for Armada XP
clk: mvebu: add suspend/resume for gatable clocks
bus: mvebu-mbus: provide a mechanism to save SDRAM window configuration
bus: mvebu-mbus: suspend/resume support
clocksource: time-armada-370-xp: add suspend/resume support
irqchip: armada-370-xp: Add suspend/resume support
ARM: add lolevel debug support for asm9260
ARM: add mach-asm9260
ARM: EXYNOS: use u8 for val[] in struct exynos_pmu_conf
power: reset: imx-snvs-poweroff: add power off driver for i.mx6
ARM: imx: temporarily remove CONFIG_SOC_FSL from LS1021A
...
77 lines
2.6 KiB
Makefile
77 lines
2.6 KiB
Makefile
#
|
|
# Makefile for the linux kernel.
|
|
#
|
|
|
|
# Common objects
|
|
obj-y := timer.o console.o
|
|
|
|
# CPU objects
|
|
obj-$(CONFIG_ARCH_SH7372) += setup-sh7372.o intc-sh7372.o pm-sh7372.o
|
|
obj-$(CONFIG_ARCH_SH73A0) += setup-sh73a0.o intc-sh73a0.o pm-sh73a0.o
|
|
obj-$(CONFIG_ARCH_R8A73A4) += setup-r8a73a4.o
|
|
obj-$(CONFIG_ARCH_R8A7740) += setup-r8a7740.o pm-r8a7740.o
|
|
obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o
|
|
obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o pm-r8a7779.o
|
|
obj-$(CONFIG_ARCH_R8A7790) += setup-r8a7790.o pm-r8a7790.o
|
|
obj-$(CONFIG_ARCH_R8A7791) += setup-r8a7791.o pm-r8a7791.o
|
|
obj-$(CONFIG_ARCH_R8A7794) += setup-r8a7794.o
|
|
obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o
|
|
obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o
|
|
|
|
# Clock objects
|
|
ifndef CONFIG_COMMON_CLK
|
|
obj-y += clock.o
|
|
obj-$(CONFIG_ARCH_SH7372) += clock-sh7372.o
|
|
obj-$(CONFIG_ARCH_SH73A0) += clock-sh73a0.o
|
|
obj-$(CONFIG_ARCH_R8A73A4) += clock-r8a73a4.o
|
|
obj-$(CONFIG_ARCH_R8A7740) += clock-r8a7740.o
|
|
obj-$(CONFIG_ARCH_R8A7778) += clock-r8a7778.o
|
|
obj-$(CONFIG_ARCH_R8A7779) += clock-r8a7779.o
|
|
obj-$(CONFIG_ARCH_R8A7790) += clock-r8a7790.o
|
|
endif
|
|
|
|
# CPU reset vector handling objects
|
|
cpu-y := platsmp.o headsmp.o
|
|
|
|
# Shared SoC family objects
|
|
obj-$(CONFIG_ARCH_RCAR_GEN2) += setup-rcar-gen2.o platsmp-apmu.o $(cpu-y)
|
|
CFLAGS_setup-rcar-gen2.o += -march=armv7-a
|
|
|
|
# SMP objects
|
|
smp-y := $(cpu-y)
|
|
smp-$(CONFIG_ARCH_SH73A0) += smp-sh73a0.o headsmp-scu.o platsmp-scu.o
|
|
smp-$(CONFIG_ARCH_R8A7779) += smp-r8a7779.o headsmp-scu.o platsmp-scu.o
|
|
smp-$(CONFIG_ARCH_R8A7790) += smp-r8a7790.o
|
|
smp-$(CONFIG_ARCH_R8A7791) += smp-r8a7791.o
|
|
smp-$(CONFIG_ARCH_EMEV2) += smp-emev2.o headsmp-scu.o platsmp-scu.o
|
|
|
|
# PM objects
|
|
obj-$(CONFIG_SUSPEND) += suspend.o
|
|
obj-$(CONFIG_CPU_IDLE) += cpuidle.o
|
|
obj-$(CONFIG_CPU_FREQ) += cpufreq.o
|
|
obj-$(CONFIG_PM_RCAR) += pm-rcar.o
|
|
obj-$(CONFIG_PM_RMOBILE) += pm-rmobile.o
|
|
|
|
# special sh7372 handling for IRQ objects and low level sleep code
|
|
obj-$(CONFIG_ARCH_SH7372) += entry-intc.o sleep-sh7372.o
|
|
|
|
# Board objects
|
|
ifdef CONFIG_ARCH_SHMOBILE_MULTI
|
|
obj-$(CONFIG_MACH_LAGER) += board-lager-reference.o
|
|
obj-$(CONFIG_MACH_MARZEN) += board-marzen-reference.o
|
|
else
|
|
obj-$(CONFIG_MACH_APE6EVM) += board-ape6evm.o
|
|
obj-$(CONFIG_MACH_APE6EVM_REFERENCE) += board-ape6evm-reference.o
|
|
obj-$(CONFIG_MACH_MACKEREL) += board-mackerel.o
|
|
obj-$(CONFIG_MACH_BOCKW) += board-bockw.o
|
|
obj-$(CONFIG_MACH_BOCKW_REFERENCE) += board-bockw-reference.o
|
|
obj-$(CONFIG_MACH_MARZEN) += board-marzen.o
|
|
obj-$(CONFIG_MACH_LAGER) += board-lager.o
|
|
obj-$(CONFIG_MACH_ARMADILLO800EVA) += board-armadillo800eva.o
|
|
obj-$(CONFIG_MACH_KZM9G) += board-kzm9g.o
|
|
obj-$(CONFIG_MACH_KZM9G_REFERENCE) += board-kzm9g-reference.o
|
|
endif
|
|
|
|
# Framework support
|
|
obj-$(CONFIG_SMP) += $(smp-y)
|