4aa705b18b
Our SoC branch usually contains expanded support for new SoCs and other core platform code. Some highlights from this round: - sunxi: SMP support for A23 SoC - socpga: big-endian support - pxa: conversion to common clock framework - bcm: SMP support for BCM63138 - imx: support new I.MX7D SoC - zte: basic support for ZX296702 SoC Conflicts: arch/arm/mach-socfpga/core.h Trivial remove/remove conflict with our cleanup branch. Resolution: remove both sides -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJVi4RMAAoJEFk3GJrT+8Zl6/kP/1Rv9O++1Kxua6R54Og6AF1J 0miFr2fnUrUWUYg/NVbseRH5bBe6N6ir3SQMfde8W2/QibEjOoEwSwrle+mC/eiq CE0x0gtyRvXMrMU/FWkOvbmmw9uv5oz1z3IHZV6AiecNuSMLUBPfamryikQ8C+d1 O/QZtX543tJQJDOBihO5cuhoVVM37UX0unNmqGsyswlyqTPF8FxcIJAYVNtnxjmj AFaOB0nDJKLKFTiX2Ype2wOxxJX1lrLatNo4W4T+YaaK+i1uCOhgTdSN+n49K7YA KNDFEgZFQqT8VMJyG+eJVeYF+cI7yWQ7lBzIftPUjPk/7+dIHBjWPz2QdjVz3U38 kxncf4S9xGAF5G2rcKe4mFrfT3Y8QLWQpA/jFs06yLwW1O3Hlfq3DzMdGNcF7hth 17LOP8namn9+NepZEp/vAlFzRRypxWWtbkPNBIItkImC6zn0IiGjBy50DE1io27W hmQcnMb7d+0wWl2Y8OmR2lZSB97JiRZkRYMCVHVt+0zGJzp4prLvl9wbjh1VXkPv ERCDJ9nCmZsl7ZVmIXMI7KNXYuPNp7R/QAzCvuSUueswF0qxTAQ0VSSBwRMqvQsQ UUNC6p63VnjUeMUdn2EBsUQZ0Uqw3t2U5TtvooHNt9FkiGsSpwjWrvVD+LItaPoJ GPeeJrJaYQsDvTrO8wjU =ZtPK -----END PGP SIGNATURE----- Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC platform support updates from Kevin Hilman: "Our SoC branch usually contains expanded support for new SoCs and other core platform code. Some highlights from this round: - sunxi: SMP support for A23 SoC - socpga: big-endian support - pxa: conversion to common clock framework - bcm: SMP support for BCM63138 - imx: support new I.MX7D SoC - zte: basic support for ZX296702 SoC" * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (134 commits) ARM: zx: Add basic defconfig support for ZX296702 ARM: dts: zx: add an initial zx296702 dts and doc clk: zx: add clock support to zx296702 dt-bindings: Add #defines for ZTE ZX296702 clocks ARM: socfpga: fix build error due to secondary_startup MAINTAINERS: ARM64: EXYNOS: Extend entry for ARM64 DTS ARM: ep93xx: simone: support for SPI-based MMC/SD cards MAINTAINERS: update Shawn's email to use kernel.org one ARM: socfpga: support suspend to ram ARM: socfpga: add CPU_METHOD_OF_DECLARE for Arria 10 ARM: socfpga: use CPU_METHOD_OF_DECLARE for socfpga_cyclone5 ARM: EXYNOS: register power domain driver from core_initcall ARM: EXYNOS: use PS_HOLD based poweroff for all supported SoCs ARM: SAMSUNG: Constify platform_device_id ARM: EXYNOS: Constify irq_domain_ops ARM: EXYNOS: add coupled cpuidle support for Exynos3250 ARM: EXYNOS: add exynos_get_boot_addr() helper ARM: EXYNOS: add exynos_set_boot_addr() helper ARM: EXYNOS: make exynos_core_restart() less verbose ARM: EXYNOS: fix exynos_boot_secondary() return value on timeout ...
104 lines
3.3 KiB
Makefile
104 lines
3.3 KiB
Makefile
obj-y := cpu.o system.o irq-common.o
|
|
|
|
obj-$(CONFIG_SOC_IMX1) += mm-imx1.o
|
|
obj-$(CONFIG_SOC_IMX21) += mm-imx21.o
|
|
|
|
obj-$(CONFIG_SOC_IMX25) += cpu-imx25.o mach-imx25.o
|
|
|
|
obj-$(CONFIG_SOC_IMX27) += cpu-imx27.o pm-imx27.o
|
|
obj-$(CONFIG_SOC_IMX27) += mm-imx27.o ehci-imx27.o
|
|
|
|
obj-$(CONFIG_SOC_IMX31) += mm-imx3.o cpu-imx31.o iomux-imx31.o ehci-imx31.o pm-imx3.o
|
|
obj-$(CONFIG_SOC_IMX35) += mm-imx3.o cpu-imx35.o ehci-imx35.o pm-imx3.o
|
|
|
|
imx5-pm-$(CONFIG_PM) += pm-imx5.o
|
|
obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o $(imx5-pm-y)
|
|
|
|
obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
|
|
obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
|
|
|
|
obj-$(CONFIG_MXC_TZIC) += tzic.o
|
|
obj-$(CONFIG_MXC_AVIC) += avic.o
|
|
|
|
obj-$(CONFIG_MXC_USE_EPIT) += epit.o
|
|
obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
|
|
|
|
ifeq ($(CONFIG_CPU_IDLE),y)
|
|
obj-$(CONFIG_SOC_IMX5) += cpuidle-imx5.o
|
|
obj-$(CONFIG_SOC_IMX6Q) += cpuidle-imx6q.o
|
|
obj-$(CONFIG_SOC_IMX6SL) += cpuidle-imx6sl.o
|
|
obj-$(CONFIG_SOC_IMX6SX) += cpuidle-imx6sx.o
|
|
endif
|
|
|
|
ifdef CONFIG_SND_IMX_SOC
|
|
obj-y += ssi-fiq.o
|
|
obj-y += ssi-fiq-ksym.o
|
|
endif
|
|
|
|
# i.MX1 based machines
|
|
obj-$(CONFIG_MACH_SCB9328) += mach-scb9328.o
|
|
obj-$(CONFIG_MACH_APF9328) += mach-apf9328.o
|
|
obj-$(CONFIG_MACH_IMX1_DT) += imx1-dt.o
|
|
|
|
# i.MX21 based machines
|
|
obj-$(CONFIG_MACH_MX21ADS) += mach-mx21ads.o
|
|
|
|
# i.MX27 based machines
|
|
obj-$(CONFIG_MACH_MX27ADS) += mach-mx27ads.o
|
|
obj-$(CONFIG_MACH_MX27_3DS) += mach-mx27_3ds.o
|
|
obj-$(CONFIG_MACH_IMX27_VISSTRIM_M10) += mach-imx27_visstrim_m10.o
|
|
obj-$(CONFIG_MACH_PCA100) += mach-pca100.o
|
|
obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
|
|
|
|
# i.MX31 based machines
|
|
obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
|
|
obj-$(CONFIG_MACH_MX31LILLY) += mach-mx31lilly.o mx31lilly-db.o
|
|
obj-$(CONFIG_MACH_MX31LITE) += mach-mx31lite.o mx31lite-db.o
|
|
obj-$(CONFIG_MACH_PCM037) += mach-pcm037.o
|
|
obj-$(CONFIG_MACH_PCM037_EET) += mach-pcm037_eet.o
|
|
obj-$(CONFIG_MACH_MX31_3DS) += mach-mx31_3ds.o
|
|
obj-$(CONFIG_MACH_MX31MOBOARD) += mach-mx31moboard.o mx31moboard-devboard.o \
|
|
mx31moboard-marxbot.o mx31moboard-smartbot.o
|
|
obj-$(CONFIG_MACH_QONG) += mach-qong.o
|
|
obj-$(CONFIG_MACH_ARMADILLO5X0) += mach-armadillo5x0.o
|
|
obj-$(CONFIG_MACH_KZM_ARM11_01) += mach-kzm_arm11_01.o
|
|
obj-$(CONFIG_MACH_BUG) += mach-bug.o
|
|
obj-$(CONFIG_MACH_IMX31_DT) += imx31-dt.o
|
|
|
|
# i.MX35 based machines
|
|
obj-$(CONFIG_MACH_PCM043) += mach-pcm043.o
|
|
obj-$(CONFIG_MACH_MX35_3DS) += mach-mx35_3ds.o
|
|
obj-$(CONFIG_MACH_VPR200) += mach-vpr200.o
|
|
obj-$(CONFIG_MACH_IMX35_DT) += imx35-dt.o
|
|
|
|
obj-$(CONFIG_HAVE_IMX_ANATOP) += anatop.o
|
|
obj-$(CONFIG_HAVE_IMX_GPC) += gpc.o
|
|
obj-$(CONFIG_HAVE_IMX_MMDC) += mmdc.o
|
|
obj-$(CONFIG_HAVE_IMX_SRC) += src.o
|
|
ifneq ($(CONFIG_SOC_IMX6)$(CONFIG_SOC_LS1021A),)
|
|
AFLAGS_headsmp.o :=-Wa,-march=armv7-a
|
|
obj-$(CONFIG_SMP) += headsmp.o platsmp.o
|
|
obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
|
|
endif
|
|
obj-$(CONFIG_SOC_IMX6Q) += mach-imx6q.o
|
|
obj-$(CONFIG_SOC_IMX6SL) += mach-imx6sl.o
|
|
obj-$(CONFIG_SOC_IMX6SX) += mach-imx6sx.o
|
|
obj-$(CONFIG_SOC_IMX7D) += mach-imx7d.o
|
|
|
|
ifeq ($(CONFIG_SUSPEND),y)
|
|
AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a
|
|
obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o
|
|
obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o
|
|
endif
|
|
obj-$(CONFIG_SOC_IMX6) += pm-imx6.o
|
|
|
|
obj-$(CONFIG_SOC_IMX50) += mach-imx50.o
|
|
obj-$(CONFIG_SOC_IMX51) += mach-imx51.o
|
|
obj-$(CONFIG_SOC_IMX53) += mach-imx53.o
|
|
|
|
obj-$(CONFIG_SOC_VF610) += mach-vf610.o
|
|
|
|
obj-$(CONFIG_SOC_LS1021A) += mach-ls1021a.o
|
|
|
|
obj-y += devices/
|